JBoss Rich Faces SVN: r21613 - trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-10 11:27:08 -0500 (Thu, 10 Feb 2011)
New Revision: 21613
Modified:
trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js
Log:
https://issues.jboss.org/browse/RF-10473
Modified: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js
===================================================================
--- trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js 2011-02-10 16:21:02 UTC (rev 21612)
+++ trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js 2011-02-10 16:27:08 UTC (rev 21613)
@@ -65,6 +65,9 @@
}
}
}
+
+ //TODO - hotfix for jQuery-Atmosphere not resetting requestCount until message is pushed from client to server - review
+ jQuery.atmosphere.request.requestCount = 0;
};
var connect = function() {
15 years, 2 months
JBoss Rich Faces SVN: r21612 - trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-02-10 11:21:02 -0500 (Thu, 10 Feb 2011)
New Revision: 21612
Modified:
trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
Log:
changing label
Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-02-10 15:48:26 UTC (rev 21611)
+++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-02-10 16:21:02 UTC (rev 21612)
@@ -621,9 +621,9 @@
</demos>
</group>
<group>
- <name>Misc Components/Features</name>
+ <name>Miscellaneous</name>
<demos>
- <demo>
+ <demo>
<id>standardSkinning</id>
<name>Standard elements skinning</name>
<samples>
15 years, 2 months
JBoss Rich Faces SVN: r21611 - in trunk: ui/core/ui/src/main/resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-10 10:48:26 -0500 (Thu, 10 Feb 2011)
New Revision: 21611
Modified:
trunk/examples/core-demo/src/main/webapp/status.xhtml
trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js
Log:
https://jira.jboss.org/browse/RF-10405
Modified: trunk/examples/core-demo/src/main/webapp/status.xhtml
===================================================================
--- trunk/examples/core-demo/src/main/webapp/status.xhtml 2011-02-10 15:12:42 UTC (rev 21610)
+++ trunk/examples/core-demo/src/main/webapp/status.xhtml 2011-02-10 15:48:26 UTC (rev 21611)
@@ -15,7 +15,7 @@
}
</script>
- <a4j:status name="ilStatus" startText="...named status request start..." />
+ <a4j:status id="myStatus" name="ilStatus" startText="...named status request start..." />
<br />
<a4j:status startStyle="color: green" errorStyle="color: red" onstart="selectEventSource(event.source, '3px dotted navy')"
Modified: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js
===================================================================
--- trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js 2011-02-10 15:12:42 UTC (rev 21610)
+++ trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/status.js 2011-02-10 15:48:26 UTC (rev 21611)
@@ -137,25 +137,22 @@
},
stop: function() {
- if (this.options.onstop) {
- this.options.onstop.apply(this, arguments);
- }
+ this.__stop();
+ return this.__showHide('.rich-status-stop');
},
success: function() {
if (this.options.onsuccess) {
this.options.onsuccess.apply(this, arguments);
}
- this.stop();
-
- return this.__showHide('.rich-status-stop');
+ return this.stop();
},
error: function() {
if (this.options.onerror) {
this.options.onerror.apply(this, arguments);
}
- this.stop();
+ this.__stop();
return this.__showHide(':not(.rich-status-error) + .rich-status-stop, .rich-status-error');
},
@@ -172,6 +169,12 @@
return true;
}
return false;
+ },
+
+ __stop: function () {
+ if (this.options.onstop) {
+ this.options.onstop.apply(this, arguments);
+ }
}
});
}(window.RichFaces, jQuery));
15 years, 2 months
JBoss Rich Faces SVN: r21610 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-10 10:12:42 -0500 (Thu, 10 Feb 2011)
New Revision: 21610
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
Log:
https://jira.jboss.org/browse/RF-10119
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-10 15:12:07 UTC (rev 21609)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-10 15:12:42 UTC (rev 21610)
@@ -2,6 +2,11 @@
border : 1px solid;
border-color: '#{richSkin.panelBorderColor}';
}
+
+.rf-cal-popup{
+ cursor:default;
+}
+
.rf-cal-btn{
cursor : pointer;
}
15 years, 2 months
JBoss Rich Faces SVN: r21609 - in trunk/ui/output/ui/src: test/resources/org/richfaces/renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2011-02-10 10:12:07 -0500 (Thu, 10 Feb 2011)
New Revision: 21609
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml
Log:
RF-10485 Panel Menu Group - @style missing
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-02-10 14:53:59 UTC (rev 21608)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-02-10 15:12:07 UTC (rev 21609)
@@ -269,8 +269,6 @@
public abstract String getRightIconClass();
- public abstract String getStyle();
-
@Attribute(hidden = true)
public abstract String getLeftIcon();
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml 2011-02-10 14:53:59 UTC (rev 21608)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml 2011-02-10 15:12:07 UTC (rev 21609)
@@ -39,7 +39,7 @@
<h:form id="f" style="border:blue solid thin;">
<pn:panelMenu>
<pn:panelMenuGroup>
- <pn:panelMenuGroup id="panelMenuGroup">
+ <pn:panelMenuGroup id="panelMenuGroup" style="border:blue solid thin;">
<!-- TODO -->
</pn:panelMenuGroup>
</pn:panelMenuGroup>
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml 2011-02-10 14:53:59 UTC (rev 21608)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml 2011-02-10 15:12:07 UTC (rev 21609)
@@ -1,4 +1,4 @@
-<div id="f:panelMenuGroup" class="rf-pm-gr">
+<div id="f:panelMenuGroup" class="rf-pm-gr" style="border:blue solid thin;">
<input id="f:panelMenuGroup:expanded" name="f:panelMenuGroup:expanded" type="hidden" value="false"/>
<div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps">
<table class="rf-pm-gr-gr">
15 years, 2 months
JBoss Rich Faces SVN: r21608 - in trunk/core/impl/src/main/java/org/richfaces/application/push/impl: jms and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-10 09:53:59 -0500 (Thu, 10 Feb 2011)
New Revision: 21608
Modified:
trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AtmospherePushHandler.java
trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java
trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java
trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java
trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java
Log:
https://issues.jboss.org/browse/RF-10487
Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AtmospherePushHandler.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AtmospherePushHandler.java 2011-02-10 14:52:12 UTC (rev 21607)
+++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AtmospherePushHandler.java 2011-02-10 14:53:59 UTC (rev 21608)
@@ -25,7 +25,6 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
@@ -37,25 +36,25 @@
import org.richfaces.application.push.Request;
import org.richfaces.application.push.Session;
import org.richfaces.application.push.SessionManager;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
/**
* @author Nick Belaevski
*
*/
public abstract class AtmospherePushHandler implements AtmosphereHandler<HttpServletRequest, HttpServletResponse> {
- private static final ThreadFactory DAEMON_THREADS_FACTORY = new ThreadFactory() {
+ private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger();
+
+ private static final ThreadFactory BROADCASTER_THREADS_FACTORY = new ThreadFactoryBuilder().
+ setDaemon(true).setNameFormat("rf-push-worker-thread-%1$s").build();
- private final AtomicInteger threadsCounter = new AtomicInteger();
+ private static final ThreadFactory SESSION_MANAGER_THREADS_FACTORY = new ThreadFactoryBuilder().
+ setDaemon(true).setNameFormat("rf-push-session-manager-thread-%1$s").build();
- public Thread newThread(Runnable r) {
- Thread t = new Thread(r, "rf-push-worker-thread-" + threadsCounter.getAndIncrement());
- t.setDaemon(true);
-
- return t;
- }
- };
-
private static final String PUSH_SESSION_ID_PARAM = "pushSessionId";
private SessionManager sessionManager;
@@ -65,8 +64,8 @@
public AtmospherePushHandler() {
super();
- sessionManager = new SessionManagerImpl(DAEMON_THREADS_FACTORY);
- worker = Executors.newCachedThreadPool(DAEMON_THREADS_FACTORY);
+ sessionManager = new SessionManagerImpl(SESSION_MANAGER_THREADS_FACTORY);
+ worker = Executors.newCachedThreadPool(BROADCASTER_THREADS_FACTORY);
}
public SessionManager getSessionManager() {
@@ -119,7 +118,17 @@
}
public void destroy() throws Exception {
- sessionManager.destroy();
+ try {
+ worker.shutdown();
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage(), e);
+ }
+
+ try {
+ sessionManager.destroy();
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage(), e);
+ }
}
}
Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java 2011-02-10 14:52:12 UTC (rev 21607)
+++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java 2011-02-10 14:53:59 UTC (rev 21608)
@@ -21,8 +21,9 @@
*/
package org.richfaces.application.push.impl;
-import java.util.Iterator;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import org.richfaces.application.push.Session;
@@ -47,28 +48,34 @@
}
private final class SessionsExpirationRunnable implements Runnable {
+
public void run() {
- while (true) {
- try {
- Session session = sessionQueue.take();
- sessionMap.remove(session.getId());
- if (session instanceof DestroyableSession) {
- ((DestroyableSession) session).destroy();
- }
- } catch (InterruptedException e) {
- LOGGER.error(e.getMessage(), e);
+ try {
+ Session session = sessionQueue.take();
+
+ if (session instanceof DestroyableSession) {
+ ((DestroyableSession) session).destroy();
}
+
+ sessionMap.remove(session.getId());
+
+ executorService.submit(this);
+ } catch (InterruptedException e) {
+ LOGGER.debug(e.getMessage(), e);
}
+ }
- }
}
private ConcurrentMap<String, Session> sessionMap = new MapMaker().makeMap();
private SessionQueue sessionQueue = new SessionQueue();
-
+
+ private ExecutorService executorService;
+
public SessionManagerImpl(ThreadFactory threadFactory) {
- threadFactory.newThread(new SessionsExpirationRunnable()).start();
+ executorService = Executors.newSingleThreadExecutor(threadFactory);
+ executorService.submit(new SessionsExpirationRunnable());
}
public Session getPushSession(String id) {
@@ -76,16 +83,12 @@
}
public void destroy() {
- //TODO notify all session
- sessionQueue.clear();
+ executorService.shutdown();
+ sessionQueue.shutdown();
- while (!sessionMap.isEmpty()) {
- for (Iterator<Session> sessionsItr = sessionMap.values().iterator(); sessionsItr.hasNext(); ) {
- Session session = sessionsItr.next();
-
- if (session instanceof DestroyableSession) {
- ((DestroyableSession) session).destroy();
- }
+ for (Session session: sessionMap.values()) {
+ if (session instanceof DestroyableSession) {
+ ((DestroyableSession) session).destroy();
}
}
Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java 2011-02-10 14:52:12 UTC (rev 21607)
+++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java 2011-02-10 14:53:59 UTC (rev 21608)
@@ -56,6 +56,8 @@
private final Condition available = lock.newCondition();
+ private boolean active = true;
+
private static long getExpirationTime(Session session) {
long lastAccessedTime = session.getLastAccessedTime();
if (lastAccessedTime < 0) {
@@ -78,7 +80,7 @@
final ReentrantLock lock = this.lock;
lock.lockInterruptibly();
try {
- while (true) {
+ while (active) {
Session first = queue.peek();
if (first == null) {
available.await();
@@ -96,15 +98,19 @@
}
}
}
+
+ throw new InterruptedException("Session queue is stopping");
} finally {
lock.unlock();
}
-
}
public void remove(Session session) {
final ReentrantLock lock = this.lock;
lock.lock();
+
+ checkActiveState();
+
try {
queue.remove(session);
} finally {
@@ -115,6 +121,9 @@
public void requeue(Session session, boolean addIfNotExists) {
final ReentrantLock lock = this.lock;
lock.lock();
+
+ checkActiveState();
+
try {
boolean exists = queue.remove(session);
@@ -130,14 +139,23 @@
lock.unlock();
}
}
+
+ private void checkActiveState() {
+ if (!active) {
+ throw new IllegalStateException("Queue is not active");
+ }
+ }
- public void clear() {
+ public void shutdown() {
final ReentrantLock lock = this.lock;
lock.lock();
try {
queue.clear();
+ active = false;
+ available.signalAll();
} finally {
lock.unlock();
}
}
+
}
Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java 2011-02-10 14:52:12 UTC (rev 21607)
+++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java 2011-02-10 14:53:59 UTC (rev 21608)
@@ -118,12 +118,7 @@
connection.start();
}
- public void stop() throws Exception {
- connection.close();
- connection = null;
- }
-
- public Connection getConnection() {
+ protected Connection getConnection() {
if (connection == null) {
throw new IllegalStateException("connection is absent");
}
@@ -131,6 +126,13 @@
return connection;
}
+ public void stop() throws Exception {
+ if (connection != null) {
+ connection.close();
+ connection = null;
+ }
+ }
+
public Topic lookup(TopicKey topicKey) throws NamingException {
Name topicName = appendToName(topicsNamespace, topicKey.getTopicName());
@@ -138,7 +140,7 @@
}
public javax.jms.Session createSession() throws JMSException {
- return connection.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
+ return getConnection().createSession(false, javax.jms.Session.CLIENT_ACKNOWLEDGE);
}
public String getSubscriptionClientId(Session session, TopicKey topicKey) {
Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java 2011-02-10 14:52:12 UTC (rev 21607)
+++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushContextImpl.java 2011-02-10 14:53:59 UTC (rev 21608)
@@ -105,17 +105,17 @@
}
public void destroy() {
- if (messagingContext != null) {
+ if (pushHandlerImpl != null) {
try {
- messagingContext.stop();
+ pushHandlerImpl.destroy();
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
}
- if (pushHandlerImpl != null) {
+ if (messagingContext != null) {
try {
- pushHandlerImpl.destroy();
+ messagingContext.stop();
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
15 years, 2 months
JBoss Rich Faces SVN: r21607 - in trunk: ui/output/ui/src/main/java/org/richfaces/renderkit/html and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2011-02-10 09:52:12 -0500 (Thu, 10 Feb 2011)
New Revision: 21607
Modified:
trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js
Log:
RF-10438 Panel Menu Group - @action, @actionListenr does not work
Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-02-10 14:51:51 UTC (rev 21606)
+++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-02-10 14:52:12 UTC (rev 21607)
@@ -66,22 +66,22 @@
execute="date-p" render="date-p"
>
- <pn:panelMenuGroup label="Group 1" selectable="true" execute="date-g1" render="date-g1" mode="server">
+ <pn:panelMenuGroup label="Group 1" selectable="true" execute="date-g1" render="date-g1" mode="ajax" action="#{modalPanel.action}">
<f:param name="alexParam01" value="alexValue01" />
<f:param name="alexParam02" value="alexValue02" />
<f:param name="alexParam03" value="alexValue03" />
<f:param name="alexParam04" value="alexValue04" />
- <pn:panelMenuItem execute="date-i" render="date-i" mode="server">
+ <pn:panelMenuItem execute="date-i" render="date-i" mode="server" action="#{modalPanel.action}">
<f:param name="alexParam11" value="alexValue11"/>
<f:param name="alexParam12" value="alexValue12"/>
<f:param name="alexParam13" value="alexValue13"/>
<f:param name="alexParam14" value="alexValue14"/>
Item 1.1
</pn:panelMenuItem>
- <pn:panelMenuItem execute="date-i" render="date-i">Item 1.2</pn:panelMenuItem>
- <pn:panelMenuItem execute="date-i" render="date-i">Item 1.3</pn:panelMenuItem>
+ <pn:panelMenuItem execute="date-i" render="date-i" mode="server" action="#{modalPanel.action}">Item 1.2</pn:panelMenuItem>
+ <pn:panelMenuItem execute="date-i" render="date-i" mode="server" action="#{modalPanel.action}">Item 1.3</pn:panelMenuItem>
</pn:panelMenuGroup>
<pn:panelMenuGroup
label="Group 2"
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-02-10 14:51:51 UTC (rev 21606)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-02-10 14:52:12 UTC (rev 21607)
@@ -36,6 +36,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -83,6 +84,8 @@
String clientId = component.getClientId(context);
if (requestMap.get(clientId) != null) {
+ new ActionEvent(component).queue();
+
context.getPartialViewContext().getRenderIds().add(clientId);
//TODO nick - this should be done on encode, not on decode
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-02-10 14:51:51 UTC (rev 21606)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-02-10 14:52:12 UTC (rev 21607)
@@ -66,16 +66,15 @@
String compClientId = component.getClientId(context);
if (requestMap.get(compClientId) != null) {
- AbstractPanelMenuItem panelItem = (AbstractPanelMenuItem) component;
- new ActionEvent(panelItem).queue();
+ new ActionEvent(component).queue();
if (context.getPartialViewContext().isPartialRequest()) {
//TODO nick - why render item by default?
- context.getPartialViewContext().getRenderIds().add(panelItem.getClientId(context));
+ context.getPartialViewContext().getRenderIds().add(component.getClientId(context));
//TODO nick - this should be done on encode, not on decode
- addOnCompleteParam(context, panelItem.getClientId(context));
+ addOnCompleteParam(context, component.getClientId(context));
}
}
}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-10 14:51:51 UTC (rev 21606)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-10 14:52:12 UTC (rev 21607)
@@ -63,7 +63,9 @@
//TODO nick - 'target' attribute?
var params = {};
- params[item.__panelMenu().id] = item.itemName;
+ params[item.__panelMenu().id] = item.itemName; // TODO
+ params[item.id] = item.id;
+
$.extend(params, item.options["ajax"]["parameters"] || {});
rf.submitForm(this.__getParentForm(item), params);
15 years, 2 months
JBoss Rich Faces SVN: r21606 - trunk/examples/push-demo/src/main/java/demo.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-10 09:51:51 -0500 (Thu, 10 Feb 2011)
New Revision: 21606
Modified:
trunk/examples/push-demo/src/main/java/demo/HornetQInitializer.java
Log:
https://issues.jboss.org/browse/RF-10487
Modified: trunk/examples/push-demo/src/main/java/demo/HornetQInitializer.java
===================================================================
--- trunk/examples/push-demo/src/main/java/demo/HornetQInitializer.java 2011-02-10 14:42:35 UTC (rev 21605)
+++ trunk/examples/push-demo/src/main/java/demo/HornetQInitializer.java 2011-02-10 14:51:51 UTC (rev 21606)
@@ -40,7 +40,11 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
import org.hornetq.jms.server.JMSServerManager;
+import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
+import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
import org.hornetq.jms.server.impl.JMSServerManagerImpl;
+import org.richfaces.application.ServiceTracker;
+import org.richfaces.application.push.PushContextFactory;
/**
* @author Nick Belaevski
@@ -58,6 +62,9 @@
throw new AbortProcessingException(e);
}
+ //force push context initialization so that its PreDestroyApplicationevent listener is added before HornetQ stopper
+ ServiceTracker.getService(PushContextFactory.class).getPushContext();
+
Application application = FacesContext.getCurrentInstance().getApplication();
application.subscribeToEvent(PreDestroyApplicationEvent.class, this);
} else {
@@ -101,12 +108,16 @@
serverManager = new JMSServerManagerImpl(server);
//if you want to use JNDI, simple inject a context here or don't call this method and make sure the JNDI parameters are set.
- serverManager.setContext(new InitialContext());
+ InitialContext context = new InitialContext();
+ serverManager.setContext(context);
serverManager.start();
- serverManager.createConnectionFactory("ConnectionFactory", new TransportConfiguration(NettyConnectorFactory.class.getName()),
- "ConnectionFactory");
+ ConnectionFactoryConfiguration connectionFactoryConfiguration = new ConnectionFactoryConfigurationImpl("ConnectionFactory", new TransportConfiguration(NettyConnectorFactory.class.getName()),
+ (String) null);
+ connectionFactoryConfiguration.setUseGlobalPools(false);
+ serverManager.createConnectionFactory(false, connectionFactoryConfiguration, "ConnectionFactory");
+
serverManager.createTopic(false, "chat", "/topic/chat");
serverManager.createTopic(false, "info", "/topic/info");
}
15 years, 2 months
JBoss Rich Faces SVN: r21604 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-10 09:25:16 -0500 (Thu, 10 Feb 2011)
New Revision: 21604
Removed:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/combo_down_button.gif
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
Log:
RF-10455 Select: several problems with images
Deleted: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/combo_down_button.gif
===================================================================
(Binary files differ)
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-10 14:02:04 UTC (rev 21603)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-10 14:25:16 UTC (rev 21604)
@@ -48,7 +48,7 @@
.rf-sel-btn-arrow{
background-position: center;
background-repeat: no-repeat;
- background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})";
+ background-image: "url(#{resource['org.richfaces.images:comboDownButton.png']})";
cursor: pointer;
width: 15px;
height: 16px;
@@ -61,7 +61,7 @@
.rf-sel-btn-dis .rf-sel-btn-arrow {
cursor: default;
- background-image: "url(#{resource['org.richfaces:combo_down_button_dis.gif']})";
+ background-image: "url(#{resource['org.richfaces.images:comboDisabledDownButton.png']})";
}
.rf-sel-lst-cord{
15 years, 2 months