richfaces-svn-commits
October 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 409 discussions
JBoss Rich Faces SVN: r19495 - branches.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-10-07 13:43:46 -0400 (Thu, 07 Oct 2010)
New Revision: 19495
Added:
branches/RF-9315/
Log:
https://jira.jboss.org/browse/RF-9315
Copied: branches/RF-9315 (from rev 19494, trunk)
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19494 - in branches/RF-7817/ui/core/api/src/main/java/org/richfaces: application and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-10-07 13:42:30 -0400 (Thu, 07 Oct 2010)
New Revision: 19494
Added:
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/Message.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageFilter.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageSerializer.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageTransformer.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/PublisherContext.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicKey.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicMode.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueueSettings.java
branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueuesContext.java
Log:
Push API draft committed
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/Message.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/Message.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/Message.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/Message.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,89 @@
+/*
+ * 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.application.push;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class Message {
+
+ private final TopicKey topicKey;
+
+ private Map<String, Object> attributes = null;
+
+ private Object data;
+
+ public Message(TopicKey topicKey) {
+ this.topicKey = topicKey;
+ }
+
+ public Object getData() {
+ return data;
+ }
+
+ public void setData(Object data) {
+ this.data = data;
+ }
+
+ public void addAttribute(String key, Object value) {
+ if (attributes == null) {
+ attributes = new HashMap<String, Object>();
+ }
+
+ attributes.put(key, value);
+ }
+
+ public void removeAttribute(String key) {
+ if (attributes != null) {
+ attributes.remove(key);
+ }
+ }
+
+ public Map<String, Object> getAttributes() {
+ if (attributes == null) {
+ attributes = new HashMap<String, Object>();
+ }
+
+ return attributes;
+ }
+
+ public Object getAttribute(String key) {
+ if (attributes != null) {
+ return attributes.get(key);
+ }
+
+ return null;
+ }
+
+ public boolean hasAttributes() {
+ return attributes != null && !attributes.isEmpty();
+ }
+
+ public TopicKey getTopicKey() {
+ return topicKey;
+ }
+
+}
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageFilter.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/MessageFilter.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageFilter.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageFilter.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,33 @@
+/*
+ * 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.application.push;
+
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public interface MessageFilter {
+
+ public boolean accept(Message message);
+
+}
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageSerializer.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageSerializer.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageSerializer.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageSerializer.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,34 @@
+/*
+ * 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.application.push;
+
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+//TODO - byte message serializer?
+public interface MessageSerializer {
+
+ public String serialize(Message message);
+
+}
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageTransformer.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageTransformer.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageTransformer.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/MessageTransformer.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,33 @@
+/*
+ * 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.application.push;
+
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public interface MessageTransformer {
+
+ public Message transform(Message o);
+
+}
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/PublisherContext.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushPublisherContext.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/PublisherContext.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/PublisherContext.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,41 @@
+/*
+ * 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.application.push;
+
+
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public interface PublisherContext {
+
+ //TODO - return Future?
+ //TODO - use topic key?
+ public void publish(TopicKey topic, Object data);
+
+ //TODO - return Future?
+ //TODO - use topic key?
+ //TODO - priority?
+ public void publish(Message message);
+
+}
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicKey.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/TopicKey.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicKey.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicKey.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,79 @@
+/*
+ * 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.application.push;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class TopicKey {
+
+ private final String topicName;
+
+ public TopicKey(String topicName) {
+ super();
+
+ if (topicName == null) {
+ throw new NullPointerException();
+ }
+
+ this.topicName = topicName;
+ }
+
+ /**
+ * @return the topicName
+ */
+ public String getTopicName() {
+ return topicName;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((topicName == null) ? 0 : topicName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ TopicKey other = (TopicKey) obj;
+ if (topicName == null) {
+ if (other.topicName != null) {
+ return false;
+ }
+ } else if (!topicName.equals(other.topicName)) {
+ return false;
+ }
+ return true;
+ }
+
+}
Copied: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicMode.java (from rev 19481, branches/RF-7817/push-redesign/src/main/java/org/richfaces/DeliveryMode.java)
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicMode.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicMode.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,32 @@
+/*
+ * 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.application.push;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public enum TopicMode {
+
+ flash, persistent, persistentLast
+
+}
Added: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueueSettings.java
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueueSettings.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueueSettings.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,61 @@
+/*
+ * 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.application.push;
+
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public interface TopicQueueSettings {
+
+ public void addMessageTransformer(MessageTransformer transformer);
+
+ public void removeMessageTransformer(MessageTransformer transformer);
+
+ public void setMessageSerializer(MessageSerializer serializer);
+
+ public MessageSerializer getMessageSerializer();
+
+ public void addMessageFilter(MessageFilter filter);
+
+ public void removeMessageFilter(MessageFilter filter);
+
+ public boolean isSessionAware();
+
+ public void setSessionAware(boolean sessionAware);
+
+ public boolean isFacesContextAware();
+
+ public void setFacesContextAware(boolean facesContextAware);
+
+ public TopicMode getDeliveryMode();
+
+ public void setDeliveryMode(TopicMode mode);
+
+ public int getCapacity();
+
+ public void setCapacity(int capacity);
+
+ //TODO - transport settings?
+
+}
Added: branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueuesContext.java
===================================================================
--- branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueuesContext.java (rev 0)
+++ branches/RF-7817/ui/core/api/src/main/java/org/richfaces/application/push/TopicQueuesContext.java 2010-10-07 17:42:30 UTC (rev 19494)
@@ -0,0 +1,35 @@
+/*
+ * 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.application.push;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public interface TopicQueuesContext {
+
+ public TopicQueueSettings getTopicQueueSettings(TopicKey topicKey);
+
+ public TopicQueueSettings getDefaultTopicQueueSettings();
+
+}
+
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19493 - in branches/RF-7817/push-redesign: src/main/java/org/richfaces and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-10-07 13:26:28 -0400 (Thu, 07 Oct 2010)
New Revision: 19493
Removed:
branches/RF-7817/push-redesign/pom.xml
branches/RF-7817/push-redesign/src/main/java/org/richfaces/DeliveryMode.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/Message.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/MessageFilter.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscriberKey.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscribersActivityListener.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/TopicKey.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessagePublisher.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageSerializer.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageTransformer.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushHandler.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushPublisherContext.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/ExpiringMap.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushPublisherContextImpl.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushSubscriberContextImpl.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/SubscriberActivityData.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/PushSubscriberContext.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/Subscription.java
branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/SubscriptionImpl.java
Log:
Deleted code for the first prototype of push
Deleted: branches/RF-7817/push-redesign/pom.xml
===================================================================
--- branches/RF-7817/push-redesign/pom.xml 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/pom.xml 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,58 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.richfaces.sandbox.ui</groupId>
- <artifactId>push-redesign</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>push-redesign</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>3.0-alpha-1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-runtime</artifactId>
- <version>0.6.1</version>
- </dependency>
- </dependencies>
-</project>
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/DeliveryMode.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/DeliveryMode.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/DeliveryMode.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,32 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Nick Belaevski
- *
- */
-//TODO - do we need this?
-public enum DeliveryMode {
-
- nonPersistent, persistent
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/Message.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/Message.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/Message.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,89 +0,0 @@
-/*
- * 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;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class Message {
-
- private TopicKey topicKey;
-
- private Map<String, Object> attributes = null;
-
- private Object data;
-
- public Message(TopicKey topicKey) {
- super();
- this.topicKey = topicKey;
- }
-
- public Object getData() {
- return data;
- }
-
- public void setData(Object data) {
- this.data = data;
- }
-
- public void addAttribute(String key, Object value) {
- if (attributes == null) {
- attributes = new HashMap<String, Object>();
- }
-
- attributes.put(key, value);
- }
-
- public void removeAttribute(String key) {
- if (attributes != null) {
- attributes.remove(key);
- }
- }
-
- public Map<String, Object> getAttributes() {
- if (attributes == null) {
- attributes = new HashMap<String, Object>();
- }
-
- return attributes;
- }
-
- public Object getAttribute(String key) {
- if (attributes != null) {
- return attributes.get(key);
- }
-
- return null;
- }
-
- public boolean hasAttributes() {
- return attributes != null && !attributes.isEmpty();
- }
-
- public TopicKey getTopicKey() {
- return topicKey;
- }
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/MessageFilter.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/MessageFilter.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/MessageFilter.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,32 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface MessageFilter {
-
- public boolean accept(Message message);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscriberKey.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscriberKey.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscriberKey.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,82 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class SubscriberKey {
-
- private String uuid;
-
- /**
- * @param uuid
- */
- public SubscriberKey(String uuid) {
- super();
-
- if (uuid == null) {
- throw new NullPointerException();
- }
-
- this.uuid = uuid;
- }
-
- /**
- * @return the uuid
- */
- public String getUuid() {
- return uuid;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- SubscriberKey other = (SubscriberKey) obj;
- if (uuid == null) {
- if (other.uuid != null) {
- return false;
- }
- } else if (!uuid.equals(other.uuid)) {
- return false;
- }
- return true;
- }
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscribersActivityListener.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscribersActivityListener.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/SubscribersActivityListener.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,35 +0,0 @@
-/*
- * 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;
-
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface SubscribersActivityListener {
-
- public void onRequestStarted(SubscriberKey subscriberKey);
-
- public void onRequestFinished(SubscriberKey subscriberKey);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/TopicKey.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/TopicKey.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/TopicKey.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,79 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class TopicKey {
-
- private String topicName;
-
- public TopicKey(String topicName) {
- super();
-
- if (topicName == null) {
- throw new NullPointerException();
- }
-
- this.topicName = topicName;
- }
-
- /**
- * @return the topicName
- */
- public String getTopicName() {
- return topicName;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((topicName == null) ? 0 : topicName.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- TopicKey other = (TopicKey) obj;
- if (topicName == null) {
- if (other.topicName != null) {
- return false;
- }
- } else if (!topicName.equals(other.topicName)) {
- return false;
- }
- return true;
- }
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessagePublisher.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessagePublisher.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessagePublisher.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,34 +0,0 @@
-/*
- * 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.application;
-
-import org.richfaces.TopicKey;
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface MessagePublisher {
-
- public void publish(TopicKey topicKey, String messageData);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageSerializer.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageSerializer.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageSerializer.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,34 +0,0 @@
-/*
- * 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.application;
-
-import org.richfaces.Message;
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface MessageSerializer {
-
- public String serialize(Message message);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageTransformer.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageTransformer.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/MessageTransformer.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,34 +0,0 @@
-/*
- * 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.application;
-
-import org.richfaces.Message;
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface MessageTransformer {
-
- public Message transform(Message o);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushHandler.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushHandler.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushHandler.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,36 +0,0 @@
-/*
- * 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.application;
-
-
-
-/**
- * @author Nick Belaevski
- *
- */
-public abstract class PushHandler<T> {
-
- public abstract void connect(T request);
-
- public abstract void disconnect(T request);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushPublisherContext.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushPublisherContext.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/PushPublisherContext.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,55 +0,0 @@
-/*
- * 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.application;
-
-import org.richfaces.Message;
-import org.richfaces.TopicKey;
-
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface PushPublisherContext {
-
- public static final String PUBLISHER_ATTRIBUTE_NAME = "__org_richfaces_PushPublisherContext";
-
- public static final String PUBLISHER_EL_EXPRESSION = "#{" + PUBLISHER_ATTRIBUTE_NAME + "}";
-
- //TODO - return Future?
- //TODO - use topic key?
- public void publish(TopicKey topic, Object message);
-
- //TODO - return Future?
- //TODO - use topic key?
- //TODO - priority?
- public void publish(Message message);
-
- public abstract void removeMessageTransformer(MessageTransformer transformer);
-
- public abstract void addMessageTransformer(MessageTransformer transformer);
-
- public abstract MessageSerializer getMessageSerializer();
-
- public abstract void setMessageSerializer(MessageSerializer serializer);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/ExpiringMap.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/ExpiringMap.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/ExpiringMap.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,275 +0,0 @@
-package org.richfaces.application.impl;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.DelayQueue;
-import java.util.concurrent.Delayed;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Created by IntelliJ IDEA.
- * User: nick
- * Date: 16.09.2010
- * Time: 12:17:11
- * To change this template use File | Settings | File Templates.
- */
-public class ExpiringMap<K, V> implements Map<K, V> {
-
- public interface Entry<V> {
-
- public Object getKey();
-
- public V getValue();
-
- public void acquire();
-
- public void release();
- }
-
- private final class EntryImpl implements Entry<V> {
-
- private final AtomicInteger usageCounter = new AtomicInteger();
-
- private final K key;
-
- private volatile V value;
-
- public EntryImpl(K key) {
- super();
- this.key = key;
- }
-
- public V getValue() {
- return value;
- }
-
- public void setValue(V value) {
- if (usageCounter.get() == 0) {
- addToExpiryQueue(key, this);
- }
- this.value = value;
- }
-
- public void acquire() {
- if (usageCounter.getAndIncrement() == 0) {
- removeFromExpiryQueue(key);
- }
- }
-
- public void release() {
- if (usageCounter.decrementAndGet() == 0) {
- addToExpiryQueue(key, this);
- }
- }
-
- public K getKey() {
- return key;
- }
- }
-
- private final class DelayedQueueEntry implements Delayed {
-
- private final long expirationTime;
-
- private final Object entryKey;
-
- private final Object entryValue;
-
- public DelayedQueueEntry(Object entryKey) {
- this(entryKey, null);
- }
-
- public DelayedQueueEntry(Object entryKey, Object entryValue) {
- this(entryKey, entryValue, -1);
- }
-
- public DelayedQueueEntry(Object entryKey, Object entryValue, long expirationTime) {
- super();
- this.entryKey = entryKey;
- this.entryValue = entryValue;
- this.expirationTime = expirationTime;
- }
-
- public long getDelay(TimeUnit unit) {
- return unit.convert(System.currentTimeMillis() - expirationTime, TimeUnit.MILLISECONDS);
- }
-
- public int compareTo(Delayed o) {
- return Long.valueOf(expirationTime).compareTo(o.getDelay(TimeUnit.MILLISECONDS));
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((entryKey == null) ? 0 : entryKey.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- @SuppressWarnings("unchecked") DelayedQueueEntry other = (DelayedQueueEntry) obj;
- if (entryKey == null) {
- if (other.entryKey != null) {
- return false;
- }
- } else if (!entryKey.equals(other.entryKey)) {
- return false;
- }
- return true;
- }
-
- public Object getEntryKey() {
- return entryKey;
- }
-
- public Object getEntryValue() {
- return entryValue;
- }
- }
-
- private ConcurrentMap<K, EntryImpl> backingMap;
-
- private long defaultTTL;
-
- private Queue<DelayedQueueEntry> expiryQueue = new DelayQueue<DelayedQueueEntry>();
-
- private ScheduledExecutorService expiryQueuePurgeExecutorService;
-
- public ExpiringMap(long defaultTTL, ScheduledExecutorService expiryQueuePurgeExecutorService) {
- this.defaultTTL = defaultTTL;
- this.backingMap = new ConcurrentHashMap<K, EntryImpl>();
-
- this.expiryQueuePurgeExecutorService = expiryQueuePurgeExecutorService;
- startPurge();
- }
-
- private void startPurge() {
- expiryQueuePurgeExecutorService.scheduleAtFixedRate(new Runnable() {
-
- public void run() {
- DelayedQueueEntry entry;
-
- while (true) {
- entry = expiryQueue.poll();
-
- if (entry == null) {
- break;
- }
-
- backingMap.remove(entry.getEntryKey(), entry.getEntryValue());
- }
- }
- }, 0, 5, TimeUnit.SECONDS);
- }
-
- protected void addToExpiryQueue(Object key, Object value) {
- expiryQueue.add(new DelayedQueueEntry(key, value, getExpirationTimeForCurrentTime()));
- }
-
- protected void removeFromExpiryQueue(K key) {
- expiryQueue.remove(new DelayedQueueEntry(key));
- }
-
- public void clear() {
- backingMap.clear();
- expiryQueue.clear();
- }
-
- public boolean containsKey(Object key) {
- return backingMap.containsKey(key);
- }
-
- public boolean containsValue(Object value) {
- return backingMap.containsValue(value);
- }
-
- private long getExpirationTimeForCurrentTime() {
- return System.currentTimeMillis() + defaultTTL;
- }
-
- private EntryImpl getOrCreateEntry(K key) {
- EntryImpl entry = backingMap.get(key);
-
- if (entry == null) {
- EntryImpl existingEntry = backingMap.putIfAbsent(key, new EntryImpl(key));
- if (existingEntry != null) {
- entry = existingEntry;
- }
- }
-
- return entry;
- }
-
- public V get(Object key) {
- Entry<V> entry = backingMap.get(key);
-
- if (entry != null) {
- return entry.getValue();
- }
-
- return null;
- }
-
- public V put(K key, V value) {
- EntryImpl entry = getOrCreateEntry(key);
- V oldValue = entry.getValue();
- entry.setValue(value);
- return oldValue;
- }
-
- public Entry<V> getEntry(Object key) {
- return backingMap.get(key);
- }
-
- public boolean isEmpty() {
- return backingMap.isEmpty();
- }
-
- public V remove(Object key) {
- expiryQueue.remove(new DelayedQueueEntry(key));
- Entry<V> removed = backingMap.remove(key);
- if (removed != null) {
- return removed.getValue();
- }
- return null;
- }
-
- public void putAll(Map<? extends K, ? extends V> m) {
- for (java.util.Map.Entry<? extends K, ? extends V> entry: m.entrySet()) {
- put(entry.getKey(), entry.getValue());
- }
- }
-
- public Set<java.util.Map.Entry<K, V>> entrySet() {
- throw new UnsupportedOperationException();
- }
-
- public Set<K> keySet() {
- throw new UnsupportedOperationException();
- }
-
- public Collection<V> values() {
- throw new UnsupportedOperationException();
- }
-
- public int size() {
- return backingMap.size();
- }
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushPublisherContextImpl.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushPublisherContextImpl.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushPublisherContextImpl.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,100 +0,0 @@
-/*
- * 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.application.impl;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.richfaces.Message;
-import org.richfaces.TopicKey;
-import org.richfaces.application.MessagePublisher;
-import org.richfaces.application.MessageSerializer;
-import org.richfaces.application.MessageTransformer;
-import org.richfaces.application.PushPublisherContext;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class PushPublisherContextImpl implements PushPublisherContext {
-
- private final MessagePublisher publisher;
-
- private volatile MessageSerializer serializer = new DefaultMessageSerializer();
-
- private List<MessageTransformer> transformers = new CopyOnWriteArrayList<MessageTransformer>();
-
- public PushPublisherContextImpl(MessagePublisher publisher) {
- super();
- this.publisher = publisher;
- }
-
- public void setMessageSerializer(MessageSerializer serializer) {
- this.serializer = serializer;
- }
-
- public MessageSerializer getMessageSerializer() {
- return serializer;
- }
-
- public void addMessageTransformer(MessageTransformer transformer) {
- if (!transformers.contains(transformer)) {
- transformers.add(transformer);
- }
- }
-
- public void removeMessageTransformer(MessageTransformer transformer) {
- transformers.remove(transformer);
- }
-
- protected Message getTransformedMessage(Message message) {
- Message result = message;
-
- for (MessageTransformer transformer : transformers) {
- result = transformer.transform(result);
- if (result == null) {
- break;
- }
- }
-
- return result;
- }
-
- protected void doPublish(Message message) {
- publisher.publish(message.getTopicKey(), serializer.serialize(message));
- }
-
- public void publish(TopicKey topic, Object message) {
- Message messageObject = new Message(topic);
- messageObject.setData(message);
- publish(messageObject);
- }
-
- public void publish(Message message) {
- Message transformedMessage = getTransformedMessage(message);
-
- if (transformedMessage != null) {
- doPublish(transformedMessage);
- }
- }
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushSubscriberContextImpl.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushSubscriberContextImpl.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/PushSubscriberContextImpl.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,153 +0,0 @@
-/*
- * 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.application.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.richfaces.MessageFilter;
-import org.richfaces.SubscriberKey;
-import org.richfaces.SubscribersActivityListener;
-import org.richfaces.TopicKey;
-import org.richfaces.component.PushSubscriberContext;
-import org.richfaces.component.Subscription;
-import org.richfaces.component.SubscriptionImpl;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class PushSubscriberContextImpl implements PushSubscriberContext, SubscribersActivityListener {
-
- /**
- *
- */
- private static final int EXPIRATION_INTERVAL = 5 * 60 * 1000;
-
- private static final Subscription[] EMPTY_SUBSCRPTION_ARRAY = new Subscription[0];
-
- private Multimap<SubscriberKey, Subscription> subscriptionsMap = Multimaps.synchronizedSetMultimap(
- LinkedHashMultimap.<SubscriberKey, Subscription>create());
-
- private Map<SubscriberKey, SubscriberActivityData> subscribersActivityMap = new MapMaker().makeComputingMap(new Function<SubscriberKey, SubscriberActivityData>() {
-
- public SubscriberActivityData apply(SubscriberKey from) {
- return new SubscriberActivityData();
- }
-
- });
-
- private ScheduledExecutorService activityExpirationService;
-
- public PushSubscriberContextImpl() {
- activityExpirationService = new ScheduledThreadPoolExecutor(1);
- activityExpirationService.scheduleAtFixedRate(new Runnable() {
-
- public void run() {
-
- Iterator<Entry<SubscriberKey, SubscriberActivityData>> entries = subscribersActivityMap.entrySet().iterator();
- while (entries.hasNext()) {
- Entry<SubscriberKey, SubscriberActivityData> entry = entries.next();
-
- long lastAccessTime = entry.getValue().getLastAccessTime();
-
- if (lastAccessTime < 0) {
- continue;
- }
-
- if (System.currentTimeMillis() - lastAccessTime > EXPIRATION_INTERVAL) {
- unsubscribe(entry.getKey());
- }
- }
- }
- }, 0, 1, TimeUnit.SECONDS);
- }
-
- protected void onSubscriptionAdded(SubscriberKey subscriberKey, Subscription subscription) {
- //force activity data creation
- subscribersActivityMap.get(subscriberKey);
- }
-
- protected void onSubscriptionRemoved(SubscriberKey subscriberKey) {
- subscribersActivityMap.remove(subscriberKey);
- }
-
- public void subscribe(SubscriberKey subscriberKey, TopicKey topic) {
- Subscription subscription = new SubscriptionImpl(topic, null, false);
- subscriptionsMap.put(subscriberKey, subscription);
- onSubscriptionAdded(subscriberKey, subscription);
- }
-
- public void subscribe(SubscriberKey subscriberKey, TopicKey topic, MessageFilter filter) {
- SubscriptionImpl subscription = new SubscriptionImpl(topic, filter, false);
- subscriptionsMap.put(subscriberKey, subscription);
- onSubscriptionAdded(subscriberKey, subscription);
- }
-
- public void subscribeDurably(SubscriberKey subscriberKey, TopicKey topic) {
- Subscription subscription = new SubscriptionImpl(topic, null, true);
- subscriptionsMap.put(subscriberKey, subscription);
- onSubscriptionAdded(subscriberKey, subscription);
- }
-
- public void subscribeDurably(SubscriberKey subscriberKey, TopicKey topic, MessageFilter filter) {
- Subscription subscription = new SubscriptionImpl(topic, filter, true);
- subscriptionsMap.put(subscriberKey, subscription);
- onSubscriptionAdded(subscriberKey, subscription);
- }
-
- public Subscription[] getSubscriptions(SubscriberKey subscriberKey) {
- Collection<Subscription> collection = subscriptionsMap.get(subscriberKey);
- if (collection == null) {
- return null;
- }
-
- return collection.toArray(EMPTY_SUBSCRPTION_ARRAY);
- }
-
- public void unsubscribe(SubscriberKey subscriberKey) {
- if (!Iterables.isEmpty(subscriptionsMap.removeAll(subscriberKey))) {
- onSubscriptionRemoved(subscriberKey);
- }
- subscribersActivityMap.remove(subscriberKey);
- }
-
- public void onRequestStarted(SubscriberKey subscriberKey) {
- subscribersActivityMap.get(subscriberKey).onRequestStarted();
- }
-
- public void onRequestFinished(SubscriberKey subscriberKey) {
- subscribersActivityMap.get(subscriberKey).onRequestFinished();
- }
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/SubscriberActivityData.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/SubscriberActivityData.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/application/impl/SubscriberActivityData.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,51 +0,0 @@
-/*
- * 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.application.impl;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author Nick Belaevski
- *
- */
-final class SubscriberActivityData {
-
- private AtomicInteger requestsCount = new AtomicInteger();
-
- private volatile long lastAccessTime = System.currentTimeMillis();
-
- public void onRequestStarted() {
- requestsCount.incrementAndGet();
-
- lastAccessTime = -1;
- }
-
- public void onRequestFinished() {
- if (requestsCount.decrementAndGet() == 0) {
- lastAccessTime = System.currentTimeMillis();
- }
- }
-
- public long getLastAccessTime() {
- return lastAccessTime;
- }
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/PushSubscriberContext.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/PushSubscriberContext.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/PushSubscriberContext.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,53 +0,0 @@
-/*
- * 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.component;
-
-import org.richfaces.MessageFilter;
-import org.richfaces.SubscriberKey;
-import org.richfaces.TopicKey;
-
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface PushSubscriberContext {
-
- public static final String SUBSCRIBER_ATTRIBUTE_NAME = "__org_richfaces_PushSubscriberContext";
-
- public void subscribe(SubscriberKey subscriberKey, TopicKey topic);
-
- public void subscribe(SubscriberKey subscriberKey, TopicKey topic, MessageFilter filter);
-
- public void subscribeDurably(SubscriberKey subscriberKey, TopicKey topic);
-
- public void subscribeDurably(SubscriberKey subscriberKey, TopicKey topic, MessageFilter filter);
-
- public void unsubscribe(SubscriberKey subscriberKey);
-
- public Subscription[] getSubscriptions(SubscriberKey subscriberKey);
-
- public abstract void onRequestFinished(SubscriberKey subscriberKey);
-
- public abstract void onRequestStarted(SubscriberKey subscriberKey);
-
-}
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/Subscription.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/Subscription.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/Subscription.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,39 +0,0 @@
-/*
- * 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.component;
-
-import org.richfaces.MessageFilter;
-import org.richfaces.TopicKey;
-
-/**
- * @author Nick Belaevski
- *
- */
-public interface Subscription {
-
- public abstract TopicKey getTopicKey();
-
- public abstract MessageFilter getMessageFilter();
-
- public abstract boolean isDurable();
-
-}
\ No newline at end of file
Deleted: branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/SubscriptionImpl.java
===================================================================
--- branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/SubscriptionImpl.java 2010-10-07 17:19:30 UTC (rev 19492)
+++ branches/RF-7817/push-redesign/src/main/java/org/richfaces/component/SubscriptionImpl.java 2010-10-07 17:26:28 UTC (rev 19493)
@@ -1,92 +0,0 @@
-/*
- * 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.component;
-
-import org.richfaces.MessageFilter;
-import org.richfaces.TopicKey;
-
-public final class SubscriptionImpl implements Subscription {
-
- private final TopicKey topicKey;
-
- private final MessageFilter messageFilter;
-
- private final boolean durability;
-
- public SubscriptionImpl(TopicKey topicKey, MessageFilter messageFilter, boolean durability) {
- super();
- this.topicKey = topicKey;
- this.messageFilter = messageFilter;
- this.durability = durability;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((topicKey == null) ? 0 : topicKey.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- SubscriptionImpl other = (SubscriptionImpl) obj;
- if (topicKey == null) {
- if (other.topicKey != null) {
- return false;
- }
- } else if (!topicKey.equals(other.topicKey)) {
- return false;
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.component.Subscription#getTopicKey()
- */
- public TopicKey getTopicKey() {
- return topicKey;
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.component.Subscription#getMessageFilter()
- */
- public MessageFilter getMessageFilter() {
- return messageFilter;
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.component.Subscription#isDurable()
- */
- public boolean isDurable() {
- return durability;
- }
-}
\ No newline at end of file
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19492 - sandbox/branches.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-10-07 13:19:30 -0400 (Thu, 07 Oct 2010)
New Revision: 19492
Added:
sandbox/branches/RF-7817/
Log:
Added sandbox branch for RF-7817
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19491 - in trunk: ui/input/ui/src/main/resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-10-07 12:20:20 -0400 (Thu, 07 Oct 2010)
New Revision: 19491
Modified:
trunk/core/impl/src/main/resources/META-INF/resources/richfaces-event.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
Log:
https://jira.jboss.org/browse/RF-9439
Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-10-07 15:35:54 UTC (rev 19490)
+++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-10-07 16:20:20 UTC (rev 19491)
@@ -184,6 +184,25 @@
return $(document.getElementById(id)).unbind(eventType, fn);
},
+ // TODO add jsdocs and qunits
+ bindScrollEventHandlers: function(element, handler, component) {
+ var elements = [];
+ element = richfaces.getDomElement(element).parentNode;
+ while (element && element!=window.document.body)
+ {
+ if (element.offsetWidth!=element.scrollWidth || element.offsetHeight!=element.scrollHeight)
+ {
+ elements.push(element);
+ richfaces.Event.bind(element, "scroll"+component.getNamespace(), handler, component);
+ }
+ element = element.parentNode;
+ }
+ return elements;
+ },
+ unbindScrollEventHandlers: function(elements, component) {
+ richfaces.Event.unbind(elements, "scroll"+component.getNamespace());
+ },
+
/**
* Execute all handlers and behaviors attached to the matched elements for the given event type.
* @function
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2010-10-07 15:35:54 UTC (rev 19490)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2010-10-07 16:20:20 UTC (rev 19491)
@@ -1,24 +1,3 @@
-// TODO: move this extend to RichFaces.Event for exapmle
-$.extend(RichFaces.Event, {
- bindScrollEventHandlers: function(element, handler, component) {
- var elements = [];
- element = RichFaces.getDomElement(element).parentNode;
- while (element && element!=window.document.body)
- {
- if (element.offsetWidth!=element.scrollWidth || element.offsetHeight!=element.scrollHeight)
- {
- elements.push(element);
- RichFaces.Event.bind(element, "scroll"+component.getNamespace(), handler, component);
- }
- element = element.parentNode;
- }
- return elements;
- },
- unbindScrollEventHandlers: function(elements, component) {
- RichFaces.Event.unbind(elements, "scroll"+component.getNamespace());
- }
-});
-
(function (rf) {
rf.KEYS = {
BACKSPACE: 8,
@@ -31,8 +10,8 @@
UP: 38,
RIGHT: 39,
DOWN: 40,
- DEL: 46,
- }
+ DEL: 46
+ };
})(RichFaces);
(function ($, rf) {
@@ -205,7 +184,7 @@
}
break;
}
- }
+ };
/*
* public API functions definition
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19490 - sandbox/trunk/prototypes/csv/validator.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-10-07 11:35:54 -0400 (Thu, 07 Oct 2010)
New Revision: 19490
Modified:
sandbox/trunk/prototypes/csv/validator/length.js
sandbox/trunk/prototypes/csv/validator/test.html
Log:
Modified: sandbox/trunk/prototypes/csv/validator/length.js
===================================================================
--- sandbox/trunk/prototypes/csv/validator/length.js 2010-10-07 14:35:15 UTC (rev 19489)
+++ sandbox/trunk/prototypes/csv/validator/length.js 2010-10-07 15:35:54 UTC (rev 19490)
@@ -11,22 +11,20 @@
$.extend(rf.csv, {
// Messages API
addMessage: function (messagesObject) {
- for (var id in messagesObject) {
- _messages[id] = messagesObject[id].replace(RE_MESSAGE_PATTERN,"\n$1\n").split("\n");
- }
+ $.extend(_messages, messagesObject);
},
- getMessage: function(id, values) {
- var msgObject = _messages[id];
- var result="";
- if (msgObject) {
+ getMessage: function(customMessages, id, values) {
+ var message = (customMessages && customMessages[id]) || _messages[id] || "";
+ if (message) {
+ var msgObject = message.replace(RE_MESSAGE_PATTERN,"\n$1\n").split("\n");
var value;
for (var i=1; i<msgObject.length; i+=2) {
value = values[msgObject[i]];
msgObject[i] = typeof value == "undefined" ? "" : value;
}
- result = msgObject.join('');
+ message = msgObject.join('');
}
- return result;
+ return message;
},
// Validators API
addValidator: function (validatorFunctions) {
@@ -56,7 +54,7 @@
break;
}
}
- !messageComponentsUpdated && alert("");//updateMessageComponents(messageElementIds, "");
+ !messageComponentsUpdated && alert("no message from validators");//updateMessageComponents(messageElementIds, "");
},
addFormValidators: function (formId, callValidatorFunctions) {
@@ -70,9 +68,9 @@
return function (value, params) {
var result = "";
if (value.length<params.min) {
- result = rf.csv.getMessage('LengthValidator.MINIMUM', [params.min,value]);
+ result = rf.csv.getMessage(params.customMessages, 'LengthValidator.MINIMUM', [params.min,value]);
} else if (value.length>params.max){
- result = rf.csv.getMessage('LengthValidator.MAXIMUM', [params.max,value]);
+ result = rf.csv.getMessage(params.customMessages, 'LengthValidator.MAXIMUM', [params.max,value]);
}
return result;
}
Modified: sandbox/trunk/prototypes/csv/validator/test.html
===================================================================
--- sandbox/trunk/prototypes/csv/validator/test.html 2010-10-07 14:35:15 UTC (rev 19489)
+++ sandbox/trunk/prototypes/csv/validator/test.html 2010-10-07 15:35:54 UTC (rev 19490)
@@ -15,11 +15,12 @@
<form id="myForm">
<input id="myInput" type="text" value="aaa"/>
<input type="button" onclick="v();" value="validate length"/>
+<input type="button" onclick="v({'LengthValidator.MINIMUM':'CustomMessage: length of the {1} is smaller then {0} chars', 'LengthValidator.MAXIMUM':'CustomMessage: length of the {1} is bigger then {0} chars'});" value="validate length (custom message)"/>
</form>
<script>
RichFaces.csv.addMessage({'LengthValidator.MINIMUM':'Hello, length of the "{1}" is smaller then {0} chars', 'LengthValidator.MAXIMUM':'Hello, length of the "{1}" is bigger then {0} chars'});
-var v = function () {
- RichFaces.csv.validate(null, 'myInput', {'length':{min:1, max:5}}, null, null);
+var v = function (customMessages) {
+ RichFaces.csv.validate(null, 'myInput', {'length':{min:1, max:5, customMessages:customMessages}}, null, null);
};
</script>
</body>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19489 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richInputNumberSlider and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-07 10:35:15 -0400 (Thu, 07 Oct 2010)
New Revision: 19489
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
Log:
https://jira.jboss.org/browse/RFPL-759
* rich:inputNumberSlider fixed
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-10-07 11:25:44 UTC (rev 19488)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-10-07 14:35:15 UTC (rev 19489)
@@ -64,7 +64,12 @@
attributes.setAttribute("showBoundaryValues", true);
attributes.setAttribute("showInput", true);
attributes.setAttribute("step", 1);
+ attributes.setAttribute("value", 0);
+ attributes.remove("converter");
+ attributes.remove("validator");
+ attributes.remove("valueChangeListener");
+ attributes.remove("valueChangeListeners");
}
public Attributes getAttributes() {
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-10-07 14:35:15 UTC (rev 19489)
@@ -42,7 +42,6 @@
<ui:define name="component">
<rich:inputNumberSlider id="slider"
accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
- converter="#{richInputNumberSliderBean.attributes['converter'].value}"
converterMessage="#{richInputNumberSliderBean.attributes['converterMessage'].value}"
decreaseClass="#{richInputNumberSliderBean.attributes['decreaseClass'].value}"
decreaseSelectedClass="#{richInputNumberSliderBean.attributes['decreaseSelectedClass'].value}"
@@ -77,14 +76,12 @@
toolTipClass="#{richInputNumberSliderBean.attributes['toolTipClass'].value}"
trackClass="#{richInputNumberSliderBean.attributes['trackClass'].value}"
valid="#{richInputNumberSliderBean.attributes['valid'].value}"
- validator="#{richInputNumberSliderBean.attributes['validator'].value}"
validatorMessage="#{richInputNumberSliderBean.attributes['validatorMessage'].value}"
validators="#{richInputNumberSliderBean.attributes['validators'].value}"
value="#{richInputNumberSliderBean.attributes['value'].value}"
- valueChangeListener="#{richInputNumberSliderBean.attributes['valueChangeListener'].value}"
- valueChangeListeners="#{richInputNumberSliderBean.attributes['valueChangeListeners'].value}">
+ >
- <a4j:ajax render="output" execute="@form"/>
+ <a4j:ajax render="output"/>
</rich:inputNumberSlider>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19488 - in modules/tests/metamer/trunk/application/src/main/webapp: components/a4jQueue and 15 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-07 07:25:44 -0400 (Thu, 07 Oct 2010)
New Revision: 19488
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
Log:
* IDs on all pages fixed/added
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -43,7 +43,7 @@
<ui:define name="component">
- <a4j:commandButton value="Parametrized Button" render="output" >
+ <a4j:commandButton id="button" value="Parametrized Button" render="output" >
<a4j:param id="a4jParam"
actionListener="#{a4jParamBean.attributes.actionListener}"
assignTo="#{a4jParamBean.parameter}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -62,7 +62,7 @@
requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1"
timeout="#{a4jQueueBean.attributes['timeout'].value}" />
- <h:form name="queueTestForm">
+ <h:form id="form" name="queueTestForm">
<h:panelGrid columns="2">
<h:outputText value="Type here:" />
<h:inputText id="input1" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); "
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -62,12 +62,12 @@
var="item">
<li>
<h:inputText value="#{item.text}" />
- <h:commandLink value="Link">
+ <h:commandLink id="link" value="Link">
<f:ajax render="@form" execute="@form" />
<f:setPropertyActionListener target="#{a4jRepeatBean.selectedDataItem}" value="#{item}" />
</h:commandLink>
- <a4j:outputPanel styleClass="statuses">
+ <a4j:outputPanel id="statusPanel" styleClass="statuses">
<h:outputText id="statusBegin" value="begin=#{status.begin}, "/>
<h:outputText id="statusEnd" value="end=#{status.end}, "/>
<h:outputText id="statusIndex" value="index=#{status.index}, "/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -39,8 +39,8 @@
</ui:define>
<ui:define name="component">
- <a4j:jsFunction name="statusFunction1" status="status1" action="#{a4jStatusBean.delay}" />
- <a4j:jsFunction name="statusFunction2" status="status2" action="#{a4jStatusBean.delay}" />
+ <a4j:jsFunction id="statusFunction1" name="statusFunction1" status="status1" action="#{a4jStatusBean.delay}" />
+ <a4j:jsFunction id="statusFunction2" name="statusFunction2" status="status2" action="#{a4jStatusBean.delay}" />
<h:panelGrid columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{hDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{hDataTableBean.state}">
<a4j:ajax render="hDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -144,7 +144,7 @@
<h:outputText id="columnHeaderSmokerComponent" value="h:selectBooleanCheckbox" />
</f:facet>
- <h:selectBooleanCheckbox value="#{record.smoker}">
+ <h:selectBooleanCheckbox id="smokerCheckbox" value="#{record.smoker}">
<a4j:ajax id="ajaxSmoker" event="change"/>
</h:selectBooleanCheckbox>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{hDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{hDataTableBean.state}">
<a4j:ajax render="hDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{hDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{hDataTableBean.state}">
<a4j:ajax render="hDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -127,11 +127,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort state">
+ <h:commandButton id="sortStatesButton" value="sort state">
<rich:componentControl event="click" target="hDataTable" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capital">
+ <h:commandButton id="sortCapitalsButton" value="sort capital">
<rich:componentControl event="click" target="hDataTable" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
@@ -142,21 +142,21 @@
<fieldset>
<legend>scroller1</legend>
- <h:commandButton value="<< first">
+ <h:commandButton id="buttonFirst1" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="buttonPrev1" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="buttonNext1" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="buttonLast1" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
@@ -167,21 +167,21 @@
<fieldset>
<legend>scroller2</legend>
- <h:commandButton value="<< first">
+ <h:commandButton id="buttonFirst2" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="buttonPrev2" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="buttonNext2" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="buttonLast2" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{hDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{hDataTableBean.state}">
<a4j:ajax render="hDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataGridBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
<a4j:ajax render="richDataGrid scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataGridBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
<a4j:ajax render="richDataGrid scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataGridBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
<a4j:ajax render="richDataGrid scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -86,7 +86,7 @@
<h:outputText value="#{record.name}" />
<br/>
smoker:
- <h:selectBooleanCheckbox value="#{record.smoker}">
+ <h:selectBooleanCheckbox id="smokerCheckbox" value="#{record.smoker}">
<a4j:ajax event="change" execute="@this"/>
</h:selectBooleanCheckbox>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataGridBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
<a4j:ajax render="richDataGrid scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -100,21 +100,21 @@
<fieldset>
<legend>scroller1</legend>
- <h:commandButton value="<< first">
+ <h:commandButton id="scrollerButtonFirst1" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="scrollerButtonPrev1" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="scrollerButtonNext1" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="scrollerButtonLast1" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
@@ -125,21 +125,21 @@
<fieldset>
<legend>scroller2</legend>
- <h:commandButton value="<< first">
+ <h:commandButton id="scrollerButtonFirst2" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="scrollerButtonPrev2" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="scrollerButtonNext2" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="scrollerButtonLast2" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataGridBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
<a4j:ajax render="richDataGrid"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -41,7 +41,7 @@
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataScrollerBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataScrollerBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -131,25 +131,25 @@
<ui:define name="outOfTemplateAfter">
<fieldset><legend>JavaScript API - scroller1</legend>
- <h:commandButton value="«« first">
+ <h:commandButton id="buttonStpFirst1" value="«« first">
<rich:componentControl event="click" target="scroller1" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="« previous">
+ <h:commandButton id="buttonStpPrev1" value="« previous">
<rich:componentControl event="click" target="scroller1" operation="switchToPage">
<f:param value="fastrewind" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="next »">
+ <h:commandButton id="buttonStpNext1" value="next »">
<rich:componentControl event="click" target="scroller1" operation="switchToPage">
<f:param value="fastforward" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="last »»">
+ <h:commandButton id="buttonStpLast1" value="last »»">
<rich:componentControl event="click" target="scroller1" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
@@ -157,19 +157,19 @@
<br/>
- <h:commandButton value="«« first">
+ <h:commandButton id="buttonFirst1" value="«« first">
<rich:componentControl event="click" target="scroller1" operation="first" />
</h:commandButton>
- <h:commandButton value="« previous">
+ <h:commandButton id="buttonPrev1" value="« previous">
<rich:componentControl event="click" target="scroller1" operation="previous" />
</h:commandButton>
- <h:commandButton value="next »">
+ <h:commandButton id="buttonNext1" value="next »">
<rich:componentControl event="click" target="scroller1" operation="next" />
</h:commandButton>
- <h:commandButton value="last »»">
+ <h:commandButton id="buttonLast1" value="last »»">
<rich:componentControl event="click" target="scroller1" operation="last" />
</h:commandButton>
</fieldset>
@@ -177,25 +177,25 @@
<br/>
<fieldset><legend>JavaScript API - scroller2</legend>
- <h:commandButton value="«« first">
+ <h:commandButton id="buttonStpFirst2" value="«« first">
<rich:componentControl event="click" target="scroller2" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="« previous">
+ <h:commandButton id="buttonStpPrev2" value="« previous">
<rich:componentControl event="click" target="scroller2" operation="switchToPage">
<f:param value="fastrewind" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="next »">
+ <h:commandButton id="buttonStpNext2" value="next »">
<rich:componentControl event="click" target="scroller2" operation="switchToPage">
<f:param value="fastforward" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="last »»">
+ <h:commandButton id="buttonStpLast2" value="last »»">
<rich:componentControl event="click" target="scroller2" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
@@ -203,19 +203,19 @@
<br/>
- <h:commandButton value="«« first">
+ <h:commandButton id="buttonFirst2" value="«« first">
<rich:componentControl event="click" target="scroller2" operation="first" />
</h:commandButton>
- <h:commandButton value="« previous">
+ <h:commandButton id="buttonPrev2" value="« previous">
<rich:componentControl event="click" target="scroller2" operation="previous" />
</h:commandButton>
- <h:commandButton value="next »">
+ <h:commandButton id="buttonNext2" value="next »">
<rich:componentControl event="click" target="scroller2" operation="next" />
</h:commandButton>
- <h:commandButton value="last »»">
+ <h:commandButton id="buttonLast2" value="last »»">
<rich:componentControl event="click" target="scroller2" operation="last" />
</h:commandButton>
</fieldset>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -41,7 +41,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -115,11 +115,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort state">
+ <h:commandButton id="sortStatesButton" value="sort state">
<rich:componentControl event="click" target="richDataTable" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capital">
+ <h:commandButton id="sortCapitalsButton" value="sort capital">
<rich:componentControl event="click" target="richDataTable" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
@@ -130,21 +130,21 @@
<fieldset>
<legend>scroller1</legend>
- <h:commandButton value="<< first">
+ <h:commandButton id="buttonFirst1" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="buttonPrev1" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="buttonNext1" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="buttonLast1" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
@@ -155,21 +155,21 @@
<fieldset>
<legend>scroller2</legend>
- <h:commandButton value="<< first">
+ <h:commandButton id="buttonFirst2" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="buttonPrev2" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="buttonNext2" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="buttonLast2" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -110,11 +110,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort states">
+ <h:commandButton id="sortStatesButton" value="sort states">
<rich:componentControl event="click" target="richDataTable" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capitals">
+ <h:commandButton id="sortCapitalsButton" value="sort capitals">
<rich:componentControl event="click" target="richDataTable" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -107,11 +107,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort state">
+ <h:commandButton id="sortStatesButton" value="sort state">
<rich:componentControl event="click" target="richDataTable" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capital">
+ <h:commandButton id="sortCapitalsButton" value="sort capital">
<rich:componentControl event="click" target="richDataTable" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}">
<a4j:ajax render="richEDT scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}">
<a4j:ajax render="richEDT scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -41,7 +41,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}">
<a4j:ajax render="richEDT scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -115,11 +115,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort state">
+ <h:commandButton id="sortStatesButton" value="sort state">
<rich:componentControl event="click" target="richEDT" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capital">
+ <h:commandButton id="sortCapitalsButton" value="sort capital">
<rich:componentControl event="click" target="richEDT" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
@@ -128,21 +128,21 @@
<br/>
scroller1:
- <h:commandButton value="<< first">
+ <h:commandButton id="buttonFirst1" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="buttonPrev1" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="buttonNext1" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="buttonLast1" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
@@ -151,21 +151,21 @@
<br/>
scroller2:
- <h:commandButton value="<< first">
+ <h:commandButton id="buttonFirst2" value="<< first">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="first" />
</rich:componentControl>
</h:commandButton>
- <h:commandButton value="< previous">
+ <h:commandButton id="buttonPrev2" value="< previous">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" />
</h:commandButton>
- <h:commandButton value="next >">
+ <h:commandButton id="buttonNext2" value="next >">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" />
</h:commandButton>
- <h:commandButton value="last >>">
+ <h:commandButton id="buttonLast2" value="last >>">
<rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage">
<f:param value="last" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}">
<a4j:ajax render="richEDT scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -114,11 +114,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort states">
+ <h:commandButton id="sortStatesButton" value="sort states">
<rich:componentControl event="click" target="richEDT" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capitals">
+ <h:commandButton id="sortCapitalsButton" value="sort capitals">
<rich:componentControl event="click" target="richEDT" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richExtendedDataTableBean.state}">
<a4j:ajax render="richDataTable scroller1"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -107,11 +107,11 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <h:commandButton value="sort state">
+ <h:commandButton id="sortStatesButton" value="sort state">
<rich:componentControl event="click" target="table" operation="sort"/>
</h:commandButton>
- <h:commandButton value="sort capital">
+ <h:commandButton id="sortCapitalsButton" value="sort capital">
<rich:componentControl event="click" target="table" operation="sort">
<f:param value="columnCapital" />
</rich:componentControl>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -84,7 +84,7 @@
#{item.name}
</rich:list>
- <rich:dataScroller for="richList" />
+ <rich:dataScroller id="dataScroller" for="richList" />
</ui:define>
<ui:define name="outOfTemplateAfter">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -42,7 +42,7 @@
</ui:define>
<ui:define name="component">
- <h:commandButton value="Call the popup">
+ <h:commandButton id="openPanelButton" value="Call the popup">
<rich:componentControl target="popupPanel" operation="show" />
</h:commandButton>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -40,7 +40,7 @@
</ui:define>
<ui:define name="component">
- <h:commandButton value="Call the popup">
+ <h:commandButton id="openPanelButton" value="Call the popup">
<rich:componentControl target="popupPanel" operation="show" />
</h:commandButton>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -42,46 +42,46 @@
<ui:define name="component">
- <rich:dataTable value="#{richSubTableBean.lists}" var="list">
+ <rich:dataTable id="dataTable" value="#{richSubTableBean.lists}" var="list">
<f:facet name="header">
<rich:columnGroup>
- <rich:column colspan="6">
- <h:outputText id="columnHeaderEmployees" value="Employees" />
+ <rich:column id="columnHeaderEmployees" colspan="6">
+ <h:outputText id="columnHeaderEmployeesText" value="Employees" />
</rich:column>
- <rich:column breakRowBefore="true">
- <h:outputText id="columnHeaderSex" value="Sex" />
+ <rich:column id="columnHeaderSex" breakRowBefore="true">
+ <h:outputText id="columnHeaderSexText" value="Sex" />
<br/>
<h:outputText id="columnHeaderSexComponent" value="h:graphicImage" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderName" value="Name" />
+ <rich:column id="columnHeaderName">
+ <h:outputText id="columnHeaderNameText" value="Name" />
<br/>
<h:outputText id="columnHeaderNameComponent" value="h:outputText" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderTitle" value="Title" />
+ <rich:column id="columnHeaderTitle">
+ <h:outputText id="columnHeaderTitleText" value="Title" />
<br/>
<h:outputText id="columnHeaderTitleComponent" value="rich:inplaceSelect" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderSmoker" value="Smoker" />
+ <rich:column id="columnHeaderSmoker">
+ <h:outputText id="columnHeaderSmokerText" value="Smoker" />
<br/>
<h:outputText id="columnHeaderSmokerComponent" value="h:selectBooleanCheckbox" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderFavoriteColor" value="Favorite Color" />
+ <rich:column id="columnHeaderFavoriteColor">
+ <h:outputText id="columnHeaderFavoriteColorText" value="Favorite Color" />
<br/>
<h:outputText id="columnHeaderFavoriteColorComponent" value="rich:colorPicker" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" />
+ <rich:column id="columnHeaderNumberOfKids">
+ <h:outputText id="columnHeaderNumberOfKidsText" value="Number of Kids" />
<br/>
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSpinner" />
</rich:column>
</rich:columnGroup>
</f:facet>
- <rich:column colspan="6">
- <rich:subTableToggleControl for="richSubTable"/>
+ <rich:column id="columnTC" colspan="6">
+ <rich:subTableToggleControl id="subTableTC" for="richSubTable"/>
<h:outputText value="#{list[0].sex == 'MALE' ? 'Men' : 'Women'}" />
</rich:column>
<rich:subTable id="richSubTable"
@@ -115,24 +115,24 @@
toggleListeners="#{richSubTableBean.attributes['toggleListeners'].value}"
value="#{list}"
var="item">
- <rich:column>
+ <rich:column id="columnSex">
<h:graphicImage id="sex" library="images" name="#{item.sex == 'MALE' ? 'male.png' : 'female.png'}" />
</rich:column>
- <rich:column>
- <h:outputText value="#{item.name}" />
+ <rich:column id="columnName">
+ <h:outputText id="name" value="#{item.name}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnTitle">
<h:outputText value="#{item.title}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnSmoker">
<h:selectBooleanCheckbox id="smokerCheckbox" value="#{item.smoker}">
<a4j:ajax event="change"/>
</h:selectBooleanCheckbox>
</rich:column>
- <rich:column>
+ <rich:column id="columnFavoriteColor">
<h:outputText value="#{item.favoriteColor}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnNumberOfKids">
<rich:inputNumberSpinner id="spinner" value="#{item.numberOfKids}" maxValue="5">
<a4j:ajax/>
</rich:inputNumberSpinner>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -37,51 +37,50 @@
</ui:define>
<ui:define name="outOfTemplateBefore">
- <br/>
</ui:define>
<ui:define name="component">
- <rich:dataTable value="#{richSubTableBean.lists}" var="list">
+ <rich:dataTable id="dataTable" value="#{richSubTableBean.lists}" var="list">
<f:facet name="header">
<rich:columnGroup>
- <rich:column colspan="6">
- <h:outputText id="columnHeaderEmployees" value="Employees" />
+ <rich:column id="columnHeaderEmployees" colspan="6">
+ <h:outputText id="columnHeaderEmployeesText" value="Employees" />
</rich:column>
- <rich:column breakRowBefore="true">
- <h:outputText id="columnHeaderSex" value="Sex" />
+ <rich:column id="columnHeaderSex" breakRowBefore="true">
+ <h:outputText id="columnHeaderSexText" value="Sex" />
<br/>
<h:outputText id="columnHeaderSexComponent" value="rich:paint2D" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderName" value="Name" />
+ <rich:column id="columnHeaderName">
+ <h:outputText id="columnHeaderNameText" value="Name" />
<br/>
<h:outputText id="columnHeaderNameComponent" value="rich:inplaceInput" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderTitle" value="Title" />
+ <rich:column id="columnHeaderTitle">
+ <h:outputText id="columnHeaderTitleText" value="Title" />
<br/>
<h:outputText id="columnHeaderTitleComponent" value="rich:comboBox" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderBirthdate" value="Birthdate" />
+ <rich:column id="columnHeaderBirthdate">
+ <h:outputText id="columnHeaderBirthdateText" value="Birthdate" />
<br/>
<h:outputText id="columnHeaderBirthdateComponent" value="rich:calendar" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderCompanies" value="Companies" />
+ <rich:column id="columnHeaderCompanies">
+ <h:outputText id="columnHeaderCompaniesText" value="Companies" />
<br/>
<h:outputText id="columnHeaderCompaniesComponent" value="a4j:repeat" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" />
+ <rich:column id="columnHeaderNumberOfKids">
+ <h:outputText id="columnHeaderNumberOfKidsText" value="Number of Kids" />
<br/>
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSlider" />
</rich:column>
</rich:columnGroup>
</f:facet>
- <rich:column colspan="6">
- <rich:subTableToggleControl for="richSubTable"/>
+ <rich:column id="columnTC" colspan="6">
+ <rich:subTableToggleControl id="subTableTC" for="richSubTable"/>
<h:outputText value="#{list[0].sex == 'MALE' ? 'Men' : 'Women'}" />
</rich:column>
<rich:subTable id="richSubTable"
@@ -115,28 +114,28 @@
toggleListeners="#{richSubTableBean.attributes['toggleListeners'].value}"
value="#{list}"
var="item">
- <rich:column>
+ <rich:column id="columnSex">
<h:outputText value="#{item.sex}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnName">
<rich:inplaceInput id="nameInput" value="#{item.name}" defaultLabel="Click here to edit">
<a4j:ajax event="change"/>
</rich:inplaceInput>
</rich:column>
- <rich:column>
+ <rich:column id="columnTitle">
<h:outputText value="#{item.title}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnBirthdate">
<h:outputText value="#{item.birthdate}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnCompanies">
<ul>
<a4j:repeat value="#{item.companies}" var="company">
<li>#{company.name}</li>
</a4j:repeat>
</ul>
</rich:column>
- <rich:column>
+ <rich:column id="columnNumberOfKids">
<rich:inputNumberSlider id="numOfKidsSlider" value="#{item.numberOfKids}" maxValue="5"/>
</rich:column>
<f:facet name="footer">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -39,7 +39,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richSubTableBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richSubTableBean.state}">
<a4j:ajax render="richDataTable"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -49,24 +49,24 @@
<rich:dataTable id="richDataTable" value="#{richSubTableBean.lists}" var="list">
<f:facet name="header">
- <rich:columnGroup>
- <rich:column colspan="3">
- <h:outputText id="columnHeaderEmployees" value="Employees" />
+ <rich:columnGroup id="columnGroup">
+ <rich:column id="columnHeaderEmployees" colspan="3">
+ <h:outputText id="columnHeaderEmployeesText" value="Employees" />
</rich:column>
- <rich:column breakRowBefore="true">
- <h:outputText id="columnHeaderName" value="Name" />
+ <rich:column id="columnHeaderName" breakRowBefore="true">
+ <h:outputText id="columnHeaderNameText" value="Name" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderTitle" value="Title" />
+ <rich:column id="columnHeaderTitle">
+ <h:outputText id="columnHeaderTitleText" value="Title" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderBirthdate" value="Birthdate" />
+ <rich:column id="columnHeaderBirthdate">
+ <h:outputText id="columnHeaderBirthdateText" value="Birthdate" />
</rich:column>
</rich:columnGroup>
</f:facet>
- <rich:column colspan="3">
- <rich:subTableToggleControl for="richSubTable"/>
+ <rich:column id="columnSubTable" colspan="3">
+ <rich:subTableToggleControl id="subTableTC" for="richSubTable"/>
<h:outputText value="#{list[0].sex == 'MALE' ? 'Men' : 'Women'}" />
</rich:column>
@@ -110,14 +110,14 @@
no data facet
</f:facet>
- <rich:column>
- <h:outputText value="#{item.name}" />
+ <rich:column id="columnName">
+ <h:outputText id="name" value="#{item.name}" />
</rich:column>
- <rich:column>
- <h:outputText value="#{item.title}" />
+ <rich:column id="columnTitle">
+ <h:outputText id="title" value="#{item.title}" />
</rich:column>
- <rich:column>
- <h:outputText value="#{item.birthdate}">
+ <rich:column id="columnBirthdate">
+ <h:outputText id="birthdate" value="#{item.birthdate}">
<f:convertDateTime pattern="d MMM yyyy"/>
</h:outputText>
</rich:column>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -39,7 +39,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox value="#{richSubTableToggleControlBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richSubTableToggleControlBean.state}">
<a4j:ajax render="richDataTable"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -50,22 +50,22 @@
<rich:dataTable id="richDataTable" value="#{richSubTableToggleControlBean.lists}" var="list">
<f:facet name="header">
<rich:columnGroup>
- <rich:column colspan="3">
- <h:outputText id="columnHeaderEmployees" value="Employees" />
+ <rich:column id="columnHeaderEmployees" colspan="3">
+ <h:outputText id="columnHeaderEmployeesText" value="Employees" />
</rich:column>
- <rich:column breakRowBefore="true">
- <h:outputText id="columnHeaderName" value="Name" />
+ <rich:column id="columnHeaderName" breakRowBefore="true">
+ <h:outputText id="columnHeaderNameText" value="Name" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderTitle" value="Title" />
+ <rich:column id="columnHeaderTitle">
+ <h:outputText id="columnHeaderTitleText" value="Title" />
</rich:column>
- <rich:column>
- <h:outputText id="columnHeaderBirthdate" value="Birthdate" />
+ <rich:column id="columnHeaderBirthdate">
+ <h:outputText id="columnHeaderBirthdateText" value="Birthdate" />
</rich:column>
</rich:columnGroup>
</f:facet>
- <rich:column colspan="3">
+ <rich:column id="columnTC" colspan="3">
<rich:subTableToggleControl id="richSTTControl"
collapseIcon="#{richSubTableToggleControlBean.attributes['collapseIcon'].value}"
collapseLable="#{richSubTableToggleControlBean.attributes['collapseLabel'].value}"
@@ -81,7 +81,6 @@
expandMode="client"
expanded="true"
rows="5"
-
value="#{richSubTableToggleControlBean.state ? list : null}"
var="item">
@@ -93,13 +92,13 @@
no data facet
</f:facet>
- <rich:column>
+ <rich:column id="columnName">
<h:outputText value="#{item.name}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnTitle">
<h:outputText value="#{item.title}" />
</rich:column>
- <rich:column>
+ <rich:column id="columnBirthdate">
<h:outputText value="#{item.birthdate}">
<f:convertDateTime pattern="d MMM yyyy"/>
</h:outputText>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -90,19 +90,19 @@
value="#{richTabPanelBean.attributes['value'].value}"
>
- <rich:tab name="tab1" header="tab1 header">
+ <rich:tab id="tab1" name="tab1" header="tab1 header">
content of tab 1
</rich:tab>
- <rich:tab name="tab2" header="tab2 header">
+ <rich:tab id="tab2" name="tab2" header="tab2 header">
content of tab 2
</rich:tab>
- <rich:tab name="tab3" header="tab3 header">
+ <rich:tab id="tab3" name="tab3" header="tab3 header">
content of tab 3
</rich:tab>
- <rich:tab name="tab4" header="tab4 header" disabled="true">
+ <rich:tab id="tab4" name="tab4" header="tab4 header" disabled="true">
content of tab 4
</rich:tab>
- <rich:tab name="tab5" header="tab5 header">
+ <rich:tab id="tab5" name="tab5" header="tab5 header">
content of tab 5
</rich:tab>
</rich:tabPanel>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -58,12 +58,12 @@
>
<li>
<h:inputText value="#{item.text}" />
- <h:commandLink value="Link">
+ <h:commandLink id="link" value="Link">
<f:ajax render="@form" execute="@form" />
<f:setPropertyActionListener target="#{uiRepeatBean.selectedDataItem}" value="#{item}" />
</h:commandLink>
- <a4j:outputPanel styleClass="statuses">
+ <a4j:outputPanel id="statusPanel" styleClass="statuses">
<h:outputText id="statusIndex" value="index=#{status.index}, "/>
<h:outputText id="statusCount" value="count=#{status.count}, "/>
<h:outputText id="statusFirst" value="first=#{status.first}, "/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -15,9 +15,9 @@
<composite:implementation>
- <h:outputStylesheet library="metamer/css" name="attributes.ecss" />
+ <h:outputStylesheet library="metamer/css" name="attributes.ecss" target="head" />
- <a4j:jsFunction name="submitAjax" execute="#{cc.attrs.execute}" render="#{cc.attrs.render}" />
+ <a4j:jsFunction id="submitAjaxFunction" name="submitAjax" execute="#{cc.attrs.execute}" render="#{cc.attrs.render}" />
<h:panelGrid id="#{cc.attrs.id}" columns="#{cc.attrs.columns * 2}" styleClass="attributes"
columnClasses="attributes-first-column, attributes-second-column, attributes-first-column, attributes-second-column">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2010-10-07 06:22:36 UTC (rev 19487)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2010-10-07 11:25:44 UTC (rev 19488)
@@ -51,7 +51,7 @@
<h:selectBooleanCheckbox id="a4jLogCheckbox" value="false" onchange="showOrHideLog()" />
<h:outputText id="a4jStatusLabel" value="Status" />
- <a4j:outputPanel ajaxRendered="true">
+ <a4j:outputPanel id="a4jStatusPanel" ajaxRendered="true">
<a4j:status id="a4jStatus" onstop="updateLog('#{phasesBean.phases}')">
<f:facet name="start">
<h:outputText value="WORKING" style="color: red;" />
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19487 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-10-07 02:22:36 -0400 (Thu, 07 Oct 2010)
New Revision: 19487
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
Log:
Updated tab and tabPanel based on tech review
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2010-10-07 05:47:33 UTC (rev 19486)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2010-10-07 06:22:36 UTC (rev 19487)
@@ -641,11 +641,47 @@
<section id="sect-Component_Reference-richtab-Basic_usage">
<title>Basic usage</title>
<para>
- Basic usage of the <sgmltag><rich:tab></sgmltag> component requires the <varname>header</varname> attribute, which provides the text on the tab header. The content of the tab is then detailed inside the <sgmltag><rich:tab></sgmltag> tags.
+ Basic usage of the <sgmltag><rich:tab></sgmltag> component requires the <varname>name</varname> attribute to uniquely identify the tab within the parent <sgmltag><rich:tabPanel></sgmltag> component. As the tabs are switched, the <varname>name</varname> identifier of the currently selected tab is stored in the <varname>activeItem</varname> attribute of the parent <sgmltag><rich:tabPanel></sgmltag> component.
</para>
+ </section>
+
+ <section id="sect-Component_Reference-richtab-Header_labeling">
+ <title>Header labeling</title>
<para>
- Alternatively the <literal>header</literal> facet could be used in place of the <varname>label</varname> attribute. This would allow for additional styles and custom content to be applied to the tab.
+ In addition to the <varname>name</varname> identifier, the <varname>header</varname> attribute must be defined. The <varname>header</varname> attribute provides the text on the tab header. The content of the tab is then detailed inside the <sgmltag><rich:tab></sgmltag> tags.
</para>
+ <para>
+ Alternatively, the <literal>header</literal> facet could be used in place of the <varname>header</varname> attribute. This would allow for additional styles and custom content to be applied to the tab. The component also supports three facets to customize the appearance depending on the current state of the tab:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>headerActive</literal> facet</term>
+ <listitem>
+ <para>
+ This facet is used when the tab is the currently active tab.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>headerInactive</literal> facet</term>
+ <listitem>
+ <para>
+ This facet is used when the tab is not currently active.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>headerDisabled</literal> facet</term>
+ <listitem>
+ <para>
+ This facet is used when the tab is disabled.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ The <literal>header</literal> facet is used in place of any state-based facet that has not been defined.
+ </para>
</section>
<section id="sect-Component_Reference-richtab-Switching_tabs">
@@ -657,8 +693,6 @@
An individual tab can be disabled by setting <code><varname>disabled</varname>="true"</code>. Disabled tabs cannot be activated or switched to.
</para>
</section>
-
- <!-- FIXME details on header facets -->
<section id="sect-Component_Reference-richtab-richtab_client-side_events">
<title><sgmltag><rich:tab></sgmltag> client-side events</title>
@@ -743,6 +777,9 @@
<section id="sect-Component_Reference-richtabPanel-Switching_tabs">
<title>Switching panels</title>
<para>
+ The <code>activeItem</code> attribute holds the active tab name. This name is a reference to the <varname>name</varname> identifier of the active child <sgmltag><rich:tab></sgmltag> component.
+ </para>
+ <para>
The switching mode for performing submissions is determined by the <code>switchType</code> attribute, which can have one of the following three values:
</para>
<variablelist>
@@ -771,9 +808,6 @@
</listitem>
</varlistentry>
</variablelist>
- <para>
- The <code>activeItem</code> attribute holds the active tab name.
- </para>
</section>
<!-- FIXME details on name attribute -->
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-10-07 05:47:33 UTC (rev 19486)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-10-07 06:22:36 UTC (rev 19487)
@@ -407,8 +407,6 @@
-->
</para>
</section>
-
- <!-- FIXME default label functionality -->
<!-- TODO not in M3
<section id="sect-Component_Reference-richinplaceInput-richinplaceInput_events">
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19486 - in modules/docs/trunk/Component_Reference/src/main/docbook/en-US: extras and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-10-07 01:47:33 -0400 (Thu, 07 Oct 2010)
New Revision: 19486
Added:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richinplaceInput-Default_label_and_value.xml_sample
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml
Log:
Updated inplaceInput based on tech review
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-10-07 01:54:46 UTC (rev 19485)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-10-07 05:47:33 UTC (rev 19486)
@@ -390,11 +390,13 @@
<section id="sect-Component_Reference-richinplaceInput-Interactivity_options">
<title>Interactivity options</title>
- <!--
<para>
- When in the initial "view" state, the starting label can be set using the <varname>defaultLabel</varname> attribute, such as <code><varname>defaultLabel</varname>="click to edit"</code>.
+ When in the initial "view" state, the starting label can be set using the <varname>defaultLabel</varname> attribute. Once the user has entered text, the label is stored in the model specified by the <varname>value</varname> attribute. The use of the default label and value is shown in <xref linkend="exam-Component_Reference-richinplaceInput-Default_label_and_value" />.
</para>
- -->
+ <example id="exam-Component_Reference-richinplaceInput-Default_label_and_value">
+ <title>Default label and value</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richinplaceInput-Default_label_and_value.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ </example>
<para>
By default, the event to switch the component to the "edit" state is a single mouse click. This can be changed using the <varname>editEvent</varname> attribute to specify a different event.
</para>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2010-10-07 01:54:46 UTC (rev 19485)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2010-10-07 05:47:33 UTC (rev 19486)
@@ -1003,13 +1003,6 @@
<para>
The list is presented as a series of data definitions. Part of the data model, specified as the term, is listed prominently. The other associated data is listed after each term.
</para>
- <para>
- The term is marked using the <literal>term</literal> facet. The facet is required for all definition lists. Use of the facet is shown in <xref linkend="exam-Component_Reference-richlist-Data_definition_list" />.
- </para>
- <example id="exam-Component_Reference-richlist-Data_definition_list">
- <title>Data definition list</title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richlist-Data_definition_list.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- </example>
<figure id="figu-Component_Reference-richlist-Data_definition_list">
<title>Data definition list</title>
<mediaobject>
@@ -1023,6 +1016,13 @@
</textobject>
</mediaobject>
</figure>
+ <para>
+ The term is marked using the <literal>term</literal> facet. The facet is required for all definition lists. Use of the facet is shown in <xref linkend="exam-Component_Reference-richlist-Data_definition_list" />.
+ </para>
+ <example id="exam-Component_Reference-richlist-Data_definition_list">
+ <title>Data definition list</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richlist-Data_definition_list.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ </example>
</listitem>
</varlistentry>
</variablelist>
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richinplaceInput-Default_label_and_value.xml_sample
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richinplaceInput-Default_label_and_value.xml_sample (rev 0)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richinplaceInput-Default_label_and_value.xml_sample 2010-10-07 05:47:33 UTC (rev 19486)
@@ -0,0 +1 @@
+<rich:inplaceInput value="#{bean.value}" defaultLabel="click to edit"/>
13 years, 11 months
- 1
- 0