JBoss Portal SVN: r11785 - branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-02 10:13:15 -0400 (Tue, 02 Sep 2008)
New Revision: 11785
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java
Log:
- Tagging for JBPORTAL-2148
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java 2008-09-02 14:12:51 UTC (rev 11784)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java 2008-09-02 14:13:15 UTC (rev 11785)
@@ -28,6 +28,7 @@
import java.util.ResourceBundle;
/**
+ * todo: JSF COMMON
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
* @since 2.6
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-02 14:12:51 UTC (rev 11784)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-02 14:13:15 UTC (rev 11785)
@@ -334,6 +334,7 @@
private void setConsumerIdInSession(boolean remove)
{
+ // todo: JSF COMMON extract this behavior into common class
Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
String consumerBeanName = "consumer"; // must match ConsumerBean name in faces-config.xml
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java 2008-09-02 14:12:51 UTC (rev 11784)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java 2008-09-02 14:13:15 UTC (rev 11785)
@@ -27,6 +27,7 @@
/**
+ * todo: JSF COMMON
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
* @since 2.6
17 years, 8 months
JBoss Portal SVN: r11784 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-02 10:12:51 -0400 (Tue, 02 Sep 2008)
New Revision: 11784
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
Log:
- Reset the managers when a new page is requested so that we don't see artifacts from other pages.
Finer grained conversations would solve this issue...
- Tagging for JBPORTAL-2148
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-02 10:36:05 UTC (rev 11783)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-02 14:12:51 UTC (rev 11784)
@@ -54,6 +54,15 @@
private String aliasName;
private String originalQName;
+ public AliasBindingManagerBean()
+ {
+ }
+
+ public AliasBindingManagerBean(CoordinationManagerBean managerBean)
+ {
+ super(managerBean);
+ }
+
public String getAliasName()
{
return aliasName;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-02 10:36:05 UTC (rev 11783)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-02 14:12:51 UTC (rev 11784)
@@ -22,6 +22,7 @@
package org.jboss.portal.core.admin.ui.coordination;
+import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
@@ -41,6 +42,7 @@
import javax.faces.event.ActionEvent;
import java.util.Collection;
import java.util.Locale;
+import java.util.Map;
import java.util.ResourceBundle;
/**
@@ -100,6 +102,7 @@
return aliasManagerHolder.get();
}};
abstract String localizationKey();
+
abstract CoordinationBean bean();
}
@@ -107,6 +110,15 @@
{
protected CoordinationManagerBean managerBean;
+ protected CoordinationBean()
+ {
+ }
+
+ protected CoordinationBean(CoordinationManagerBean managerBean)
+ {
+ this.managerBean = managerBean;
+ }
+
public CoordinationManagerBean getManagerBean()
{
return managerBean;
@@ -288,6 +300,12 @@
{
// make sure we use the proper selected page
selectedObjectId = pomb.getSelectedPortalObjectId();
+
+ // reset the different managers as they are in session scope but need to be re-initialized each time a new
+ // page is reloaded
+ aliasManager = replaceInSession("aliasManager", new AliasBindingManagerBean(this));
+ eventManager = replaceInSession("eventManager", new EventWiringManagerBean(this));
+ parameterManager = replaceInSession("parameterManager", new ParameterBindingManagerBean(this));
// Extract metadata only on window children and only if needed
if (isExplicitEventsUsed() || isExplicitParametersUsed())
@@ -332,11 +350,73 @@
// JSF helper methods
/**
- * Retrieves the value of the parameter which name is given.
+ * Purges a session bean from the session so that it will be recreated by JSF when needed.
+ * todo: JSF COMMON
*
- * @param name
+ * @param beanName name of the bean to be purged, must match an entry in <code>faces-config.xml</code>
+ * @param otherNames additional names of beans to be purged
+ */
+ void purgeFromSession(String beanName, String... otherNames)
+ {
+ Map<String, Object> sessionMap = getFacesSessionMap();
+ sessionMap.remove(beanName);
+ if (otherNames != null)
+ {
+ for (String name : otherNames)
+ {
+ sessionMap.remove(name);
+ }
+ }
+ }
+
+ /**
+ * Retrieves the JSF session map.
+ * todo: JSF COMMON
+ *
+ * @return the JSF session map
+ */
+ Map<String, Object> getFacesSessionMap()
+ {
+ return FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+ }
+
+ /**
+ *
+ * @param beanName
+ * @param newBean
+ * @param <T>
* @return
*/
+ <T> T replaceInSession(String beanName, T newBean)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(beanName, "bean Name", "replaceInSession");
+ Map<String, Object> sessionMap = getFacesSessionMap();
+
+ // if we passed null, use the remove semantics
+ if(newBean == null)
+ {
+ sessionMap.remove(beanName);
+ return null;
+ }
+
+ Object current = sessionMap.get(beanName);
+ // check that the new bean is compatible with the previously assigned
+ if (current != null && !newBean.getClass().isAssignableFrom(current.getClass()))
+ {
+ throw new IllegalArgumentException("Provided bean: " + newBean + " is not compatible with previously assigned '"
+ + beanName + "' bean: " + current);
+ }
+ sessionMap.put(beanName, newBean);
+ return newBean;
+ }
+
+ /**
+ * Retrieves the value of the parameter which name is given from the JSF request.
+ * todo: JSF COMMON
+ *
+ * @param name name of the parameter which value we want to retrieve
+ * @return
+ */
public String getFacesParam(String name)
{
return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(name);
@@ -380,7 +460,7 @@
public String deleteSelected(ActionEvent actionEvent)
{
- if(selectedType != null)
+ if (selectedType != null)
{
try
{
@@ -411,7 +491,7 @@
public String renameSelected() throws IllegalCoordinationException
{
- if(selectedType != null)
+ if (selectedType != null)
{
selectedType.bean().rename(selectedName, newName);
editCoordination();
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-02 10:36:05 UTC (rev 11783)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-02 14:12:51 UTC (rev 11784)
@@ -59,6 +59,15 @@
private List<String> selectedDestinationWindows;
private EventWiringInfoCreator currentWiring;
+ public EventWiringManagerBean()
+ {
+ }
+
+ public EventWiringManagerBean(CoordinationManagerBean managerBean)
+ {
+ super(managerBean);
+ }
+
public void loadInfoFrom(Page page)
{
Collection<EventWiringInfo> wiringInfos = managerBean.getCoordinationService().getEventWirings(page);
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-02 10:36:05 UTC (rev 11783)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-02 14:12:51 UTC (rev 11784)
@@ -52,6 +52,15 @@
private List<String> selectedParameterWindowPairs;
private String windowBindingName;
+ public ParameterBindingManagerBean()
+ {
+ }
+
+ public ParameterBindingManagerBean(CoordinationManagerBean managerBean)
+ {
+ super(managerBean);
+ }
+
public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
{
return availableParameterWindowPairs;
17 years, 8 months
JBoss Portal SVN: r11783 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF/classes and 1 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-02 06:36:05 -0400 (Tue, 02 Sep 2008)
New Revision: 11783
Removed:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Removed WindowBindingManagerBean as it wasn't removed in the previous commit...
- Use list in ui:repeat for better legibility
- Fixed issue with incorrect key in localization
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-01 20:03:05 UTC (rev 11782)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-02 10:36:05 UTC (rev 11783)
@@ -1,285 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* 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.jboss.portal.core.admin.ui.coordination;
-
-import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
-import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.portlet.info.NavigationInfo;
-import org.jboss.portal.portlet.info.ParameterInfo;
-import org.jboss.portal.portlet.info.PortletInfo;
-
-import javax.faces.model.SelectItem;
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-public class WindowBindingManagerBean extends CoordinationManagerBean.CoordinationBean
-{
- private Map<String, DisplayParameterBinding> displayParameterBindings;
- private List<ParameterWindowSelectItem> availableParameterWindowPairs;
- private List<String> selectedParameterWindowPairs;
- private String windowBindingName;
-
- public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
- {
- return availableParameterWindowPairs;
- }
-
- public List<String> getSelectedParameterWindowPairs()
- {
- return selectedParameterWindowPairs;
- }
-
- public void setSelectedParameterWindowPairs(List<String> selectedParameterWindowPairs)
- {
- this.selectedParameterWindowPairs = selectedParameterWindowPairs;
- }
-
- public String getWindowBindingName()
- {
- return windowBindingName;
- }
-
- public void setWindowBindingName(String windowBindingName)
- {
- this.windowBindingName = windowBindingName;
- }
-
- public void extractInfoFrom(Window window, PortletInfo info)
- {
- // retrieve metadata on public render parameters
- NavigationInfo navInfo = info.getNavigation();
- for (ParameterInfo pInfo : navInfo.getPublicParameters())
- {
- availableParameterWindowPairs.add(new ParameterWindowSelectItem(pInfo, window));
- }
- }
-
- public Collection<DisplayParameterBinding> getDisplayParameterBindings()
- {
- if (displayParameterBindings == null)
- {
- return Collections.emptyList();
- }
-
- List<DisplayParameterBinding> result = new LinkedList<DisplayParameterBinding>(displayParameterBindings.values());
- Collections.sort(result);
-
- return result;
- }
-
- public void initKnowing(Collection<PortalObject> children)
- {
- availableParameterWindowPairs = new LinkedList<ParameterWindowSelectItem>();
- }
-
- public void loadInfoFrom(Page page)
- {
- Collection<? extends WindowBindingInfo> windowBindingInfos = managerBean.getCoordinationService().getWindowBindings(page);
- if (windowBindingInfos != null && !windowBindingInfos.isEmpty())
- {
- displayParameterBindings = new HashMap<String, DisplayParameterBinding>(windowBindingInfos.size());
- for (WindowBindingInfo wbInfo : windowBindingInfos)
- {
- displayParameterBindings.put(wbInfo.getName(), new DisplayParameterBinding(wbInfo));
- }
- }
- else
- {
- displayParameterBindings = Collections.emptyMap();
- }
- }
-
- public String create() throws IllegalCoordinationException
- {
- if (windowBindingName != null)
- {
- Map<Window, QName> windowBinding = new HashMap<Window, QName>();
- for (String pairAsString : selectedParameterWindowPairs)
- {
- // get ParameterWindowPair from String
- String[] names = ParameterWindowPair.resolveFrom(pairAsString);
-
- Window window = (Window)managerBean.getSelectedPage().getChild(names[ParameterWindowPair.WINDOW_NAME]);
- windowBinding.put(window, QName.valueOf(names[ParameterWindowPair.PARAM_NAME]));
- }
-
- managerBean.getCoordinationService().setWindowBinding(windowBindingName, windowBinding);
- }
-
- return resetSelection();
- }
-
- public String resetSelection()
- {
- windowBindingName = null;
- selectedParameterWindowPairs = null;
-
- return CoordinationManagerBean.EDIT_COORDINATION;
- }
-
- public String delete(String name) throws IllegalCoordinationException
- {
- DisplayParameterBinding displayParam = displayParameterBindings.get(name);
- if (displayParam != null)
- {
- WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
- managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
- }
- return CoordinationManagerBean.EDIT_COORDINATION;
- }
-
- public String rename(String name, String newName) throws IllegalCoordinationException
- {
- DisplayParameterBinding displayParam = displayParameterBindings.get(name);
- if (displayParam != null)
- {
- WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
- managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
- }
- return CoordinationManagerBean.EDIT_COORDINATION;
- }
-
- public static class DisplayParameterBinding implements Comparable
- {
- private List<ParameterWindowPair> parameterWindowPairs;
- private WindowBindingInfo bindingInfo;
-
- public DisplayParameterBinding(WindowBindingInfo bindingInfo)
- {
- this.bindingInfo = bindingInfo;
- Set<Map.Entry<Window,QName>> entries = bindingInfo.getWindows().entrySet();
- parameterWindowPairs = new LinkedList<ParameterWindowPair>();
- for (Map.Entry<Window, QName> entry : entries)
- {
- parameterWindowPairs.add(new ParameterWindowPair(entry.getValue(), entry.getKey()));
- }
- }
-
- public String getName()
- {
- return bindingInfo.getName();
- }
-
- public WindowBindingInfo getBindingInfo()
- {
- return bindingInfo;
- }
-
- public List<ParameterWindowPair> getParameterWindowPairs()
- {
- return parameterWindowPairs;
- }
-
- public int compareTo(Object o)
- {
- DisplayParameterBinding other = (DisplayParameterBinding)o;
- return getName().compareTo(other.getName());
- }
- }
-
- public static class ParameterWindowSelectItem extends SelectItem implements Comparable
- {
- public ParameterWindowSelectItem(ParameterInfo parameterInfo, Window window)
- {
- super(new ParameterWindowPair(parameterInfo, window), ParameterWindowPair.asString(parameterInfo.getName(), window));
- }
-
- public int compareTo(Object o)
- {
- ParameterWindowSelectItem pair = (ParameterWindowSelectItem)o;
- return toString().compareTo(pair.toString());
- }
-
- private ParameterWindowPair getPair()
- {
- return (ParameterWindowPair)getValue();
- }
- }
-
- public static class ParameterWindowPair
- {
- private Window window;
- private QName name;
- public static final int PARAM_NAME = 0;
- public static final int WINDOW_NAME = 1;
-
- public ParameterWindowPair(ParameterInfo info, Window window)
- {
- this(info.getName(), window);
- }
-
- public ParameterWindowPair(QName name, Window window)
- {
- this.window = window;
- this.name = name;
- }
-
- public QName getName()
- {
- return name;
- }
-
- public Window getWindow()
- {
- return window;
- }
-
- public String getSeparator()
- {
- return ":";
- }
-
- @Override
- public String toString()
- {
- return ParameterWindowPair.asString(name, window);
- }
-
- static String asString(QName qname, Window window)
- {
- return qname + ":" + window.getName();
- }
-
- public static String[] resolveFrom(String pairAsString)
- {
- int separatorIndex = pairAsString.indexOf(':');
- String name = pairAsString.substring(0, separatorIndex);
- String windowName = pairAsString.substring(separatorIndex + 1);
-
- return new String[] {name, windowName};
- }
- }
-}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-01 20:03:05 UTC (rev 11782)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-02 10:36:05 UTC (rev 11783)
@@ -307,7 +307,7 @@
COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows
COORDINATION_EVENT_EXISTING_ACTIONS=Actions
COORDINATION_EVENT_CREATE=Create new event wiring:
-COORDINATION_EVENT_CREATE_NO_EVENT=No available events. Cannot create new event wirings.
+COORDINATION_EVENT_CREATE_NO_EVENTS=No available events. Cannot create new event wirings.
COORDINATION_EVENT_CREATE_STEP1=1. Select source event:
COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event ''{0}'':
COORDINATION_EVENT_CREATE_STEP3=3. Select destination event:
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 20:03:05 UTC (rev 11782)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-02 10:36:05 UTC (rev 11783)
@@ -54,9 +54,11 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ORIGINAL}</f:facet>
- <ui:repeat var="qname" value="#{binding.names}">
- #{qname}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="qname" value="#{binding.names}">
+ <li>#{qname}</li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet>
@@ -240,42 +242,54 @@
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/>
</f:facet>
- <ui:repeat var="window" value="#{wiring.sourceWindows}">
- <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
- <f:param name="id" value="#{window.id}"/>
- #{window.name}
- </h:commandLink>
- </ui:repeat>
+ <ul>
+ <ui:repeat var="window" value="#{wiring.sourceWindows}">
+ <li>
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
+ <f:param name="id" value="#{window.id}"/>
+ #{window.name}
+ </h:commandLink>
+ </li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/>
</f:facet>
- <ui:repeat var="event" value="#{wiring.sourceEvents}">
- #{event}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="event" value="#{wiring.sourceEvents}">
+ <li>#{event}</li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/>
</f:facet>
- <ui:repeat var="event" value="#{wiring.destinationEvents}">
- #{event}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="event" value="#{wiring.destinationEvents}">
+ <li>#{event}</li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/>
</f:facet>
- <ui:repeat var="window" value="#{wiring.destinationWindows}">
- <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
- <f:param name="id" value="#{window.id}"/>
- #{window.name}
- </h:commandLink>
- </ui:repeat>
+ <ul>
+ <ui:repeat var="window" value="#{wiring.destinationWindows}">
+ <li>
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
+ <f:param name="id" value="#{window.id}"/>
+ #{window.name}
+ </h:commandLink>
+ </li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
17 years, 8 months
JBoss Portal SVN: r11782 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF and 1 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-01 16:03:05 -0400 (Mon, 01 Sep 2008)
New Revision: 11782
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Renamed WindowBindingManagerBean to ParameterBindingManagerBean to follow documentation convention.
Might want to rename WindowBindingInfo accordingly...
- Renamed *Coordination beans to *Manager.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-01 19:46:59 UTC (rev 11781)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-01 20:03:05 UTC (rev 11782)
@@ -57,7 +57,7 @@
private AliasBindingManagerBean aliasManager;
private EventWiringManagerBean eventManager;
- private WindowBindingManagerBean windowManager;
+ private ParameterBindingManagerBean parameterManager;
// Handle selections for deletion and renaming
private static final String RESOURCE_NAME = "Resource";
@@ -66,7 +66,7 @@
private String selectedName;
private CoordinationType selectedType;
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
- private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>();
+ private static ThreadLocal<ParameterBindingManagerBean> windowManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>();
private String newName;
static final String EDIT_COORDINATION = "editCoordination";
@@ -212,15 +212,15 @@
this.eventManager.setManagerBean(this);
}
- public WindowBindingManagerBean getWindowManager()
+ public ParameterBindingManagerBean getParameterManager()
{
- return windowManager;
+ return parameterManager;
}
- public void setWindowManager(WindowBindingManagerBean windowManager)
+ public void setParameterManager(ParameterBindingManagerBean parameterManager)
{
- this.windowManager = windowManager;
- this.windowManager.setManagerBean(this);
+ this.parameterManager = parameterManager;
+ this.parameterManager.setManagerBean(this);
}
public AliasBindingManagerBean getAliasManager()
@@ -294,13 +294,13 @@
{
eventManager.loadInfoFrom(selectedPage);
- windowManager.loadInfoFrom(selectedPage);
+ parameterManager.loadInfoFrom(selectedPage);
aliasManager.loadInfoFrom(selectedPage);
Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
if (!children.isEmpty())
{
- windowManager.initKnowing(children);
+ parameterManager.initKnowing(children);
aliasManager.initKnowing(children);
for (PortalObject po : children)
@@ -312,7 +312,7 @@
Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef());
PortletInfo info = instance.getPortlet().getInfo();
- windowManager.extractInfoFrom(window, info);
+ parameterManager.extractInfoFrom(window, info);
eventManager.extractInfoFrom(window, info);
aliasManager.extractInfoFrom(window, info);
}
@@ -362,7 +362,7 @@
// make manager accessible to CoordinationType
eventManagerHolder.set(eventManager);
- windowManagerHolder.set(windowManager);
+ windowManagerHolder.set(parameterManager);
aliasManagerHolder.set(aliasManager);
}
Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java (from rev 11781, branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-01 20:03:05 UTC (rev 11782)
@@ -0,0 +1,285 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* 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.jboss.portal.core.admin.ui.coordination;
+
+import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
+import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.portlet.info.NavigationInfo;
+import org.jboss.portal.portlet.info.ParameterInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
+
+import javax.faces.model.SelectItem;
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class ParameterBindingManagerBean extends CoordinationManagerBean.CoordinationBean
+{
+ private Map<String, DisplayParameterBinding> displayParameterBindings;
+ private List<ParameterWindowSelectItem> availableParameterWindowPairs;
+ private List<String> selectedParameterWindowPairs;
+ private String windowBindingName;
+
+ public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
+ {
+ return availableParameterWindowPairs;
+ }
+
+ public List<String> getSelectedParameterWindowPairs()
+ {
+ return selectedParameterWindowPairs;
+ }
+
+ public void setSelectedParameterWindowPairs(List<String> selectedParameterWindowPairs)
+ {
+ this.selectedParameterWindowPairs = selectedParameterWindowPairs;
+ }
+
+ public String getWindowBindingName()
+ {
+ return windowBindingName;
+ }
+
+ public void setWindowBindingName(String windowBindingName)
+ {
+ this.windowBindingName = windowBindingName;
+ }
+
+ public void extractInfoFrom(Window window, PortletInfo info)
+ {
+ // retrieve metadata on public render parameters
+ NavigationInfo navInfo = info.getNavigation();
+ for (ParameterInfo pInfo : navInfo.getPublicParameters())
+ {
+ availableParameterWindowPairs.add(new ParameterWindowSelectItem(pInfo, window));
+ }
+ }
+
+ public Collection<DisplayParameterBinding> getDisplayParameterBindings()
+ {
+ if (displayParameterBindings == null)
+ {
+ return Collections.emptyList();
+ }
+
+ List<DisplayParameterBinding> result = new LinkedList<DisplayParameterBinding>(displayParameterBindings.values());
+ Collections.sort(result);
+
+ return result;
+ }
+
+ public void initKnowing(Collection<PortalObject> children)
+ {
+ availableParameterWindowPairs = new LinkedList<ParameterWindowSelectItem>();
+ }
+
+ public void loadInfoFrom(Page page)
+ {
+ Collection<? extends WindowBindingInfo> windowBindingInfos = managerBean.getCoordinationService().getWindowBindings(page);
+ if (windowBindingInfos != null && !windowBindingInfos.isEmpty())
+ {
+ displayParameterBindings = new HashMap<String, DisplayParameterBinding>(windowBindingInfos.size());
+ for (WindowBindingInfo wbInfo : windowBindingInfos)
+ {
+ displayParameterBindings.put(wbInfo.getName(), new DisplayParameterBinding(wbInfo));
+ }
+ }
+ else
+ {
+ displayParameterBindings = Collections.emptyMap();
+ }
+ }
+
+ public String create() throws IllegalCoordinationException
+ {
+ if (windowBindingName != null)
+ {
+ Map<Window, QName> windowBinding = new HashMap<Window, QName>();
+ for (String pairAsString : selectedParameterWindowPairs)
+ {
+ // get ParameterWindowPair from String
+ String[] names = ParameterWindowPair.resolveFrom(pairAsString);
+
+ Window window = (Window)managerBean.getSelectedPage().getChild(names[ParameterWindowPair.WINDOW_NAME]);
+ windowBinding.put(window, QName.valueOf(names[ParameterWindowPair.PARAM_NAME]));
+ }
+
+ managerBean.getCoordinationService().setWindowBinding(windowBindingName, windowBinding);
+ }
+
+ return resetSelection();
+ }
+
+ public String resetSelection()
+ {
+ windowBindingName = null;
+ selectedParameterWindowPairs = null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String delete(String name) throws IllegalCoordinationException
+ {
+ DisplayParameterBinding displayParam = displayParameterBindings.get(name);
+ if (displayParam != null)
+ {
+ WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
+ managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String rename(String name, String newName) throws IllegalCoordinationException
+ {
+ DisplayParameterBinding displayParam = displayParameterBindings.get(name);
+ if (displayParam != null)
+ {
+ WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
+ managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public static class DisplayParameterBinding implements Comparable
+ {
+ private List<ParameterWindowPair> parameterWindowPairs;
+ private WindowBindingInfo bindingInfo;
+
+ public DisplayParameterBinding(WindowBindingInfo bindingInfo)
+ {
+ this.bindingInfo = bindingInfo;
+ Set<Map.Entry<Window,QName>> entries = bindingInfo.getWindows().entrySet();
+ parameterWindowPairs = new LinkedList<ParameterWindowPair>();
+ for (Map.Entry<Window, QName> entry : entries)
+ {
+ parameterWindowPairs.add(new ParameterWindowPair(entry.getValue(), entry.getKey()));
+ }
+ }
+
+ public String getName()
+ {
+ return bindingInfo.getName();
+ }
+
+ public WindowBindingInfo getBindingInfo()
+ {
+ return bindingInfo;
+ }
+
+ public List<ParameterWindowPair> getParameterWindowPairs()
+ {
+ return parameterWindowPairs;
+ }
+
+ public int compareTo(Object o)
+ {
+ DisplayParameterBinding other = (DisplayParameterBinding)o;
+ return getName().compareTo(other.getName());
+ }
+ }
+
+ public static class ParameterWindowSelectItem extends SelectItem implements Comparable
+ {
+ public ParameterWindowSelectItem(ParameterInfo parameterInfo, Window window)
+ {
+ super(new ParameterWindowPair(parameterInfo, window), ParameterWindowPair.asString(parameterInfo.getName(), window));
+ }
+
+ public int compareTo(Object o)
+ {
+ ParameterWindowSelectItem pair = (ParameterWindowSelectItem)o;
+ return toString().compareTo(pair.toString());
+ }
+
+ private ParameterWindowPair getPair()
+ {
+ return (ParameterWindowPair)getValue();
+ }
+ }
+
+ public static class ParameterWindowPair
+ {
+ private Window window;
+ private QName name;
+ public static final int PARAM_NAME = 0;
+ public static final int WINDOW_NAME = 1;
+
+ public ParameterWindowPair(ParameterInfo info, Window window)
+ {
+ this(info.getName(), window);
+ }
+
+ public ParameterWindowPair(QName name, Window window)
+ {
+ this.window = window;
+ this.name = name;
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public Window getWindow()
+ {
+ return window;
+ }
+
+ public String getSeparator()
+ {
+ return ":";
+ }
+
+ @Override
+ public String toString()
+ {
+ return ParameterWindowPair.asString(name, window);
+ }
+
+ static String asString(QName qname, Window window)
+ {
+ return qname + ":" + window.getName();
+ }
+
+ public static String[] resolveFrom(String pairAsString)
+ {
+ int separatorIndex = pairAsString.indexOf(':');
+ String name = pairAsString.substring(0, separatorIndex);
+ String windowName = pairAsString.substring(separatorIndex + 1);
+
+ return new String[] {name, windowName};
+ }
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-09-01 19:46:59 UTC (rev 11781)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-09-01 20:03:05 UTC (rev 11782)
@@ -353,15 +353,15 @@
</managed-property>
<managed-property>
<property-name>eventManager</property-name>
- <value>#{eventCoordination}</value>
+ <value>#{eventManager}</value>
</managed-property>
<managed-property>
- <property-name>windowManager</property-name>
- <value>#{windowCoordination}</value>
+ <property-name>parameterManager</property-name>
+ <value>#{parameterManager}</value>
</managed-property>
<managed-property>
<property-name>aliasManager</property-name>
- <value>#{aliasCoordination}</value>
+ <value>#{aliasManager}</value>
</managed-property>
</managed-bean>
@@ -421,17 +421,17 @@
</managed-property>
</managed-bean>
<managed-bean>
- <managed-bean-name>eventCoordination</managed-bean-name>
+ <managed-bean-name>eventManager</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.EventWiringManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>windowCoordination</managed-bean-name>
- <managed-bean-class>org.jboss.portal.core.admin.ui.coordination.WindowBindingManagerBean</managed-bean-class>
+ <managed-bean-name>parameterManager</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.core.admin.ui.coordination.ParameterBindingManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>aliasCoordination</managed-bean-name>
+ <managed-bean-name>aliasManager</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.AliasBindingManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 19:46:59 UTC (rev 11781)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 20:03:05 UTC (rev 11782)
@@ -14,23 +14,23 @@
<!-- Create alias binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
- <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasCoordination.availableRenderParameters}"/>
- <h:form rendered="#{!empty aliasCoordination.availableRenderParameters}">
+ <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/>
+ <h:form rendered="#{!empty aliasManager.availableRenderParameters}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP1}
- <h:selectOneListbox id="alias" size="5" value="#{aliasCoordination.originalQName}"
+ <h:selectOneListbox id="alias" size="5" value="#{aliasManager.originalQName}"
immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{aliasCoordination.availableRenderParameters}"/>
+ <f:selectItems value="#{aliasManager.availableRenderParameters}"/>
</h:selectOneListbox>
</div>
- <h:panelGroup rendered="#{!empty aliasCoordination.originalQName}">
+ <h:panelGroup rendered="#{!empty aliasManager.originalQName}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP2}
- <h:inputText id="aliasName" value="#{aliasCoordination.aliasName}"/>
+ <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/>
<h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}"
- action="#{aliasCoordination.create}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancel}"
+ action="#{aliasManager.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -40,10 +40,10 @@
<!-- Manage existing alias bindings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_MANAGE_EXISTING}</h3>
- <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" rendered="#{empty aliasCoordination.displayAliasBindings}"/>
- <h:form rendered="#{!empty aliasCoordination.displayAliasBindings}">
+ <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" rendered="#{empty aliasManager.displayAliasBindings}"/>
+ <h:form rendered="#{!empty aliasManager.displayAliasBindings}">
<div class="float-left full-width">
- <h:dataTable var="binding" value="#{aliasCoordination.displayAliasBindings}"
+ <h:dataTable var="binding" value="#{aliasManager.displayAliasBindings}"
rendered="true" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn"
@@ -91,23 +91,23 @@
<!-- Create parameter binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3>
- <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty windowCoordination.availableParameterWindowPairs}"/>
- <h:form rendered="#{!empty windowCoordination.availableParameterWindowPairs}">
+ <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/>
+ <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}
- <h:selectManyListbox id="parameterWindowPair" size="5" value="#{windowCoordination.selectedParameterWindowPairs}"
+ <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}"
immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{windowCoordination.availableParameterWindowPairs}"/>
+ <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/>
</h:selectManyListbox>
</div>
- <h:panelGroup rendered="#{!empty windowCoordination.selectedParameterWindowPairs}">
+ <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}
- <h:inputText id="bindingName" value="#{windowCoordination.windowBindingName}"/>
+ <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/>
<h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
- action="#{windowCoordination.create}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{windowCoordination.cancel}"
+ action="#{parameterManager.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -118,9 +118,9 @@
<!-- Manage existing parameter bindings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3>
<div class="float-left full-width">
- <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty windowCoordination.displayParameterBindings}"/>
- <h:form rendered="#{!empty windowCoordination.displayParameterBindings}">
- <h:dataTable var="binding" value="#{windowCoordination.displayParameterBindings}"
+ <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/>
+ <h:form rendered="#{!empty parameterManager.displayParameterBindings}">
+ <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}"
rendered="true" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn"
@@ -175,46 +175,46 @@
<hr/>
<!-- Create new event wiring -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3>
- <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventCoordination.sourceEvents}"/>
- <h:form rendered="#{!empty eventCoordination.sourceEvents}">
+ <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/>
+ <h:form rendered="#{!empty eventManager.sourceEvents}">
<h:panelGroup>
#{bundle.COORDINATION_EVENT_CREATE_STEP1}
- <h:selectOneListbox id="sourceEvent" size="5" value="#{eventCoordination.selectedSourceEvent}" immediate="true"
- valueChangeListener="#{eventCoordination.selectSourceEvent}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.sourceEvents}"/>
+ <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true"
+ valueChangeListener="#{eventManager.selectSourceEvent}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.sourceEvents}"/>
</h:selectOneListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedSourceEvent}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedSourceEvent}">
#{bundle.COORDINATION_EVENT_CREATE_STEP2}
- <h:selectManyListbox id="sourceWindows" size="5" value="#{eventCoordination.selectedSourceWindows}" immediate="true"
- valueChangeListener="#{eventCoordination.selectSourceWindows}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.sourceWindows}"/>
+ <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true"
+ valueChangeListener="#{eventManager.selectSourceWindows}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.sourceWindows}"/>
</h:selectManyListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedSourceWindows}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedSourceWindows}">
#{bundle.COORDINATION_EVENT_CREATE_STEP3}
- <h:selectOneListbox id="destEvent" size="5" value="#{eventCoordination.selectedDestinationEvent}" immediate="true"
- valueChangeListener="#{eventCoordination.selectDestinationEvent}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.destinationEvents}"/>
+ <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true"
+ valueChangeListener="#{eventManager.selectDestinationEvent}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.destinationEvents}"/>
</h:selectOneListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedDestinationEvent}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedDestinationEvent}">
#{bundle.COORDINATION_EVENT_CREATE_STEP4}
- <h:selectManyListbox id="destWindows" size="5" value="#{eventCoordination.selectedDestinationWindows}" immediate="true"
- valueChangeListener="#{eventCoordination.selectDestinationWindows}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.destinationWindows}"/>
+ <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true"
+ valueChangeListener="#{eventManager.selectDestinationWindows}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.destinationWindows}"/>
</h:selectManyListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedDestinationWindows}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedDestinationWindows}">
#{bundle.COORDINATION_EVENT_CREATE_STEP5}
- <h:inputText id="wiringName" value="#{eventCoordination.wiringName}"/>
- <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventCoordination.create}"
+ <h:inputText id="wiringName" value="#{eventManager.wiringName}"/>
+ <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}"
styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventCoordination.cancel}"
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}"
styleClass="portlet-form-button"/>
</h:panelGroup>
</h:form>
@@ -222,9 +222,9 @@
<!-- Manage existing wirings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3>
- <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventCoordination.displayEventWirings}"/>
- <h:form rendered="#{!empty eventCoordination.displayEventWirings}">
- <h:dataTable var="wiring" value="#{eventCoordination.displayEventWirings}"
+ <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/>
+ <h:form rendered="#{!empty eventManager.displayEventWirings}">
+ <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}"
styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn, objectActionColumn"
17 years, 8 months
JBoss Portal SVN: r11781 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-01 15:46:59 -0400 (Mon, 01 Sep 2008)
New Revision: 11781
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
Log:
- Removed windows as it's not used anymore.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-01 19:45:57 UTC (rev 11780)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-01 19:46:59 UTC (rev 11781)
@@ -26,7 +26,6 @@
import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
@@ -37,7 +36,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -49,23 +47,11 @@
*/
public class WindowBindingManagerBean extends CoordinationManagerBean.CoordinationBean
{
- private Map<String, String> windows;
private Map<String, DisplayParameterBinding> displayParameterBindings;
-
private List<ParameterWindowSelectItem> availableParameterWindowPairs;
private List<String> selectedParameterWindowPairs;
private String windowBindingName;
- public Map<String, String> getWindows()
- {
- return windows;
- }
-
- public void setWindows(Map<String, String> windows)
- {
- this.windows = windows;
- }
-
public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
{
return availableParameterWindowPairs;
@@ -99,9 +85,6 @@
{
availableParameterWindowPairs.add(new ParameterWindowSelectItem(pInfo, window));
}
-
- // record window information
- this.windows.put(window.getName(), window.getId().toString(PortalObjectPath.LEGACY_BASE64_FORMAT));
}
public Collection<DisplayParameterBinding> getDisplayParameterBindings()
@@ -120,7 +103,6 @@
public void initKnowing(Collection<PortalObject> children)
{
availableParameterWindowPairs = new LinkedList<ParameterWindowSelectItem>();
- this.windows = new LinkedHashMap<String, String>(children.size());
}
public void loadInfoFrom(Page page)
17 years, 8 months
JBoss Portal SVN: r11780 - modules/cms/trunk/cms-jackrabbit.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-01 15:45:57 -0400 (Mon, 01 Sep 2008)
New Revision: 11780
Modified:
modules/cms/trunk/cms-jackrabbit/pom.xml
Log:
build cleanup
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-01 19:44:59 UTC (rev 11779)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-01 19:45:57 UTC (rev 11780)
@@ -266,6 +266,42 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>testSuiteCleanupBeforeCompile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="repotest"/>
+ <delete dir="repotest-hsqldb"/>
+ <delete file="test.properties"/>
+ <delete file="test.script"/>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>testCleanupAfterTest</id>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="repotest"/>
+ <delete dir="repotest-hsqldb"/>
+ <delete file="test.properties"/>
+ <delete file="test.script"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -273,15 +309,14 @@
<skip>false</skip>
<excludes>
<exclude>**/TestFileCreateFailed$1TestCommand.java</exclude>
- </excludes>
-
- <!--
+ </excludes>
+ <!--
<includes>
<include>**/TestSearch.java</include>
- </includes>
- -->
+ </includes>
+ -->
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
17 years, 8 months
JBoss Portal SVN: r11779 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF/classes and 1 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-01 15:44:59 -0400 (Mon, 01 Sep 2008)
New Revision: 11779
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Alias and parameters bindings redone. I'm not too happy with the parameter binding creation interaction though...
- More generification of managers with create/cancel actions.
- Extracted QNameSelectItem as it's used by several classes now.
- Do not display tables or prevent creations when there are nothing to use.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-01 16:03:43 UTC (rev 11778)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-01 19:44:59 UTC (rev 11779)
@@ -25,7 +25,10 @@
import org.jboss.portal.core.controller.coordination.AliasBindingInfo;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.portlet.info.NavigationInfo;
+import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
import javax.xml.namespace.QName;
@@ -37,6 +40,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -45,6 +49,7 @@
public class AliasBindingManagerBean extends CoordinationManagerBean.CoordinationBean
{
private Map<String, DisplayAliasBinding> displayAliasBindings;
+ private Set<QNameSelectItem> availableRenderParameters;
private String aliasName;
private String originalQName;
@@ -99,8 +104,21 @@
return result;
}
- public String createBinding()
+ public List<QNameSelectItem> getAvailableRenderParameters()
{
+ if(availableRenderParameters == null)
+ {
+ return Collections.emptyList();
+ }
+
+ List<QNameSelectItem> result = new LinkedList<QNameSelectItem>(availableRenderParameters);
+ Collections.sort(result);
+
+ return result;
+ }
+
+ public String create()
+ {
if (aliasName != null)
{
try
@@ -114,10 +132,10 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
- public String cancelBinding()
+ public String resetSelection()
{
aliasName = null;
originalQName = null;
@@ -149,8 +167,19 @@
public void extractInfoFrom(Window window, PortletInfo info)
{
- // nothing to do here as alias bindings don't have any window specific info
+ // retrieve metadata on public render parameters
+ NavigationInfo navInfo = info.getNavigation();
+ for (ParameterInfo pInfo : navInfo.getPublicParameters())
+ {
+ availableRenderParameters.add(new QNameSelectItem(pInfo.getName()));
+ }
}
+
+ public void initKnowing(Collection<PortalObject> children)
+ {
+ availableRenderParameters = new HashSet<QNameSelectItem>();
+ }
+
public static class DisplayAliasBinding implements Comparable
{
private AliasBindingInfo alias;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-01 16:03:43 UTC (rev 11778)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-01 19:44:59 UTC (rev 11779)
@@ -124,6 +124,15 @@
public abstract String rename(String oldName, String newName) throws IllegalCoordinationException;
public abstract void extractInfoFrom(Window window, PortletInfo info);
+
+ public abstract String create() throws IllegalCoordinationException;
+
+ public abstract String resetSelection();
+
+ public String cancel()
+ {
+ return resetSelection();
+ }
}
public PortalObjectId getSelectedObjectId()
@@ -292,6 +301,7 @@
if (!children.isEmpty())
{
windowManager.initKnowing(children);
+ aliasManager.initKnowing(children);
for (PortalObject po : children)
{
@@ -302,9 +312,9 @@
Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef());
PortletInfo info = instance.getPortlet().getInfo();
- // get window specific info (aliasManager doesn't need that)
windowManager.extractInfoFrom(window, info);
eventManager.extractInfoFrom(window, info);
+ aliasManager.extractInfoFrom(window, info);
}
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-01 16:03:43 UTC (rev 11778)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-01 19:44:59 UTC (rev 11779)
@@ -292,7 +292,7 @@
}
}
- public String createWiring()
+ public String create()
{
if (currentWiring != null)
{
@@ -305,10 +305,10 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
- return null;
+ return resetSelection();
}
- public String cancelWiring()
+ public String resetSelection()
{
currentWiring = null;
selectedSourceEvent = null;
@@ -438,42 +438,6 @@
}
}
- public static class QNameSelectItem extends SelectItem implements Comparable
- {
- public QNameSelectItem(QName qName)
- {
- super(qName, qName.toString());
- }
-
- public QName getQName()
- {
- return (QName)getValue();
- }
-
- public int compareTo(Object o)
- {
- QNameSelectItem other = (QNameSelectItem)o;
- return getQName().toString().compareTo(other.getQName().toString());
- }
-
- @Override
- public int hashCode()
- {
- return getQName().hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (!(obj instanceof QNameSelectItem))
- {
- return false;
- }
- QNameSelectItem item = (QNameSelectItem)obj;
- return getQName().equals(item.getQName());
- }
- }
-
private static class EventWiringInfoCreator implements EventWiringInfo
{
private String name;
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java 2008-09-01 19:44:59 UTC (rev 11779)
@@ -0,0 +1,66 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* 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.jboss.portal.core.admin.ui.coordination;
+
+import javax.faces.model.SelectItem;
+import javax.xml.namespace.QName;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+* @version $Revision$
+*/
+public class QNameSelectItem extends SelectItem implements Comparable
+{
+ public QNameSelectItem(QName qName)
+ {
+ super(qName, qName.toString());
+ }
+
+ public QName getQName()
+ {
+ return (QName)getValue();
+ }
+
+ public int compareTo(Object o)
+ {
+ QNameSelectItem other = (QNameSelectItem)o;
+ return getQName().toString().compareTo(other.getQName().toString());
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return getQName().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof QNameSelectItem))
+ {
+ return false;
+ }
+ QNameSelectItem item = (QNameSelectItem)obj;
+ return getQName().equals(item.getQName());
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-01 16:03:43 UTC (rev 11778)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-01 19:44:59 UTC (rev 11779)
@@ -22,7 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import org.jboss.portal.core.controller.coordination.AliasBindingInfo;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
import org.jboss.portal.core.model.portal.Page;
@@ -33,8 +32,8 @@
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
+import javax.faces.model.SelectItem;
import javax.xml.namespace.QName;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -42,6 +41,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -50,15 +50,12 @@
public class WindowBindingManagerBean extends CoordinationManagerBean.CoordinationBean
{
private Map<String, String> windows;
- private List<String> selectedWindows;
- private Map<String, String> aliasBindings;
- private Map<String, Map<String, String>> windowBindings;
- private String selectedRenderParameter;
- private Map<String, String> availableRenderParameters;
- private String windowBindingName;
-
private Map<String, DisplayParameterBinding> displayParameterBindings;
+ private List<ParameterWindowSelectItem> availableParameterWindowPairs;
+ private List<String> selectedParameterWindowPairs;
+ private String windowBindingName;
+
public Map<String, String> getWindows()
{
return windows;
@@ -69,60 +66,21 @@
this.windows = windows;
}
- public List<String> getSelectedWindows()
+ public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
{
- return selectedWindows;
+ return availableParameterWindowPairs;
}
- public void setSelectedWindows(List<String> selectedWindows)
+ public List<String> getSelectedParameterWindowPairs()
{
- this.selectedWindows = selectedWindows;
+ return selectedParameterWindowPairs;
}
- public Map<String, String> getAliasBindings()
+ public void setSelectedParameterWindowPairs(List<String> selectedParameterWindowPairs)
{
- if (aliasBindings == null)
- {
- aliasBindings = new HashMap<String, String>();
- }
- return aliasBindings;
+ this.selectedParameterWindowPairs = selectedParameterWindowPairs;
}
- public void setAliasBindings(Map<String, String> aliasBindings)
- {
- this.aliasBindings = aliasBindings;
- }
-
- public Map<String, String> getAvailableRenderParameters()
- {
- return availableRenderParameters;
- }
-
- public void setAvailableRenderParameters(Map<String, String> availableRenderParameters)
- {
- this.availableRenderParameters = availableRenderParameters;
- }
-
- public Map<String, Map<String, String>> getWindowBindings()
- {
- return windowBindings;
- }
-
- public void setWindowBindings(Map<String, Map<String, String>> windowBindings)
- {
- this.windowBindings = windowBindings;
- }
-
- public String getSelectedRenderParameter()
- {
- return selectedRenderParameter;
- }
-
- public void setSelectedRenderParameter(String selectedRenderParameter)
- {
- this.selectedRenderParameter = selectedRenderParameter;
- }
-
public String getWindowBindingName()
{
return windowBindingName;
@@ -139,71 +97,13 @@
NavigationInfo navInfo = info.getNavigation();
for (ParameterInfo pInfo : navInfo.getPublicParameters())
{
- availableRenderParameters.put(pInfo.getName().toString(), pInfo.getName().toString());
+ availableParameterWindowPairs.add(new ParameterWindowSelectItem(pInfo, window));
}
// record window information
this.windows.put(window.getName(), window.getId().toString(PortalObjectPath.LEGACY_BASE64_FORMAT));
}
- public static class DisplayParameterBinding implements Comparable
- {
- private String id;
- private QName name;
- private List<Window> windows;
- private WindowBindingInfo bindingInfo;
-
- public DisplayParameterBinding(WindowBindingInfo bindingInfo)
- {
- this.bindingInfo = bindingInfo;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public QName getName()
- {
- return name;
- }
-
- public void setName(QName name)
- {
- this.name = name;
- }
-
- public List<Window> getWindows()
- {
- if (windows == null)
- {
- windows = new ArrayList<Window>();
- }
- return windows;
- }
-
- public void setWindows(List<Window> windows)
- {
- this.windows = windows;
- }
-
- public WindowBindingInfo getBindingInfo()
- {
- return bindingInfo;
- }
-
- public int compareTo(Object o)
- {
- DisplayParameterBinding other = (DisplayParameterBinding)o;
- return id.compareTo(other.getId());
- }
- }
-
public Collection<DisplayParameterBinding> getDisplayParameterBindings()
{
if (displayParameterBindings == null)
@@ -219,41 +119,19 @@
public void initKnowing(Collection<PortalObject> children)
{
- availableRenderParameters = new LinkedHashMap<String, String>();
+ availableParameterWindowPairs = new LinkedList<ParameterWindowSelectItem>();
this.windows = new LinkedHashMap<String, String>(children.size());
}
public void loadInfoFrom(Page page)
{
- //aliasbindings prep for ui
- for (AliasBindingInfo abInfo : managerBean.getCoordinationService().getAliasBindings(page))
- {
- for (QName name : abInfo.getNames())
- {
- getAliasBindings().put(name.getNamespaceURI(), name.getNamespaceURI());
- }
- }
-
Collection<? extends WindowBindingInfo> windowBindingInfos = managerBean.getCoordinationService().getWindowBindings(page);
if (windowBindingInfos != null && !windowBindingInfos.isEmpty())
{
displayParameterBindings = new HashMap<String, DisplayParameterBinding>(windowBindingInfos.size());
for (WindowBindingInfo wbInfo : windowBindingInfos)
{
- DisplayParameterBinding dpb = new DisplayParameterBinding(wbInfo);
- for (Map.Entry<Window, QName> entry : wbInfo.getWindows().entrySet())
- {
- Window paramName = entry.getKey();
- QName paramValue = entry.getValue();
- //quick filter for duplicate binding ids
- dpb.getWindows().add(paramName);
- if (dpb.getWindows().size() < 2)
- {
- dpb.setId(wbInfo.getName());
- dpb.setName(paramValue);
- }
- }
- displayParameterBindings.put(dpb.getId(), dpb);
+ displayParameterBindings.put(wbInfo.getName(), new DisplayParameterBinding(wbInfo));
}
}
else
@@ -262,38 +140,32 @@
}
}
- public String createBinding() throws IllegalCoordinationException
+ public String create() throws IllegalCoordinationException
{
if (windowBindingName != null)
{
Map<Window, QName> windowBinding = new HashMap<Window, QName>();
- for (String window : selectedWindows)
+ for (String pairAsString : selectedParameterWindowPairs)
{
- PortalObject portalObject = managerBean.getPortalObjectContainer().getObject(managerBean.parsePortalObjectId(window));
+ // get ParameterWindowPair from String
+ String[] names = ParameterWindowPair.resolveFrom(pairAsString);
- if (portalObject.getType() == PortalObject.TYPE_WINDOW)
- {
- windowBinding.put((Window)portalObject, QName.valueOf(selectedRenderParameter));
- managerBean.getCoordinationService().setWindowBinding(windowBindingName, windowBinding);
- }
+ Window window = (Window)managerBean.getSelectedPage().getChild(names[ParameterWindowPair.WINDOW_NAME]);
+ windowBinding.put(window, QName.valueOf(names[ParameterWindowPair.PARAM_NAME]));
}
+
+ managerBean.getCoordinationService().setWindowBinding(windowBindingName, windowBinding);
}
- // reset selection
- windowBindingName = null;
- selectedWindows = null;
- selectedRenderParameter = null;
-
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
- public String cancelBinding()
+ public String resetSelection()
{
- selectedWindows = null;
windowBindingName = null;
- selectedRenderParameter = null;
+ selectedParameterWindowPairs = null;
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String delete(String name) throws IllegalCoordinationException
@@ -317,4 +189,115 @@
}
return CoordinationManagerBean.EDIT_COORDINATION;
}
+
+ public static class DisplayParameterBinding implements Comparable
+ {
+ private List<ParameterWindowPair> parameterWindowPairs;
+ private WindowBindingInfo bindingInfo;
+
+ public DisplayParameterBinding(WindowBindingInfo bindingInfo)
+ {
+ this.bindingInfo = bindingInfo;
+ Set<Map.Entry<Window,QName>> entries = bindingInfo.getWindows().entrySet();
+ parameterWindowPairs = new LinkedList<ParameterWindowPair>();
+ for (Map.Entry<Window, QName> entry : entries)
+ {
+ parameterWindowPairs.add(new ParameterWindowPair(entry.getValue(), entry.getKey()));
+ }
+ }
+
+ public String getName()
+ {
+ return bindingInfo.getName();
+ }
+
+ public WindowBindingInfo getBindingInfo()
+ {
+ return bindingInfo;
+ }
+
+ public List<ParameterWindowPair> getParameterWindowPairs()
+ {
+ return parameterWindowPairs;
+ }
+
+ public int compareTo(Object o)
+ {
+ DisplayParameterBinding other = (DisplayParameterBinding)o;
+ return getName().compareTo(other.getName());
+ }
+ }
+
+ public static class ParameterWindowSelectItem extends SelectItem implements Comparable
+ {
+ public ParameterWindowSelectItem(ParameterInfo parameterInfo, Window window)
+ {
+ super(new ParameterWindowPair(parameterInfo, window), ParameterWindowPair.asString(parameterInfo.getName(), window));
+ }
+
+ public int compareTo(Object o)
+ {
+ ParameterWindowSelectItem pair = (ParameterWindowSelectItem)o;
+ return toString().compareTo(pair.toString());
+ }
+
+ private ParameterWindowPair getPair()
+ {
+ return (ParameterWindowPair)getValue();
+ }
+ }
+
+ public static class ParameterWindowPair
+ {
+ private Window window;
+ private QName name;
+ public static final int PARAM_NAME = 0;
+ public static final int WINDOW_NAME = 1;
+
+ public ParameterWindowPair(ParameterInfo info, Window window)
+ {
+ this(info.getName(), window);
+ }
+
+ public ParameterWindowPair(QName name, Window window)
+ {
+ this.window = window;
+ this.name = name;
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public Window getWindow()
+ {
+ return window;
+ }
+
+ public String getSeparator()
+ {
+ return ":";
+ }
+
+ @Override
+ public String toString()
+ {
+ return ParameterWindowPair.asString(name, window);
+ }
+
+ static String asString(QName qname, Window window)
+ {
+ return qname + ":" + window.getName();
+ }
+
+ public static String[] resolveFrom(String pairAsString)
+ {
+ int separatorIndex = pairAsString.indexOf(':');
+ String name = pairAsString.substring(0, separatorIndex);
+ String windowName = pairAsString.substring(separatorIndex + 1);
+
+ return new String[] {name, windowName};
+ }
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-01 16:03:43 UTC (rev 11778)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-01 19:44:59 UTC (rev 11779)
@@ -272,22 +272,26 @@
COORDINATION_PARAMETER_BINDINGS=Parameter bindings
COORDINATION_PARAMETER_EXPLICIT_MODE=Use explicit parameter binding
COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings:
+COORDINATION_PARAMETER_EXISTING_NONE=No existing parameter bindings.
COORDINATION_PARAMETER_EXISTING_NAME=Name
+COORDINATION_PARAMETER_EXISTING_PAIRS=Parameter:window pairs
COORDINATION_PARAMETER_EXISTING_ACTIONS=Actions
COORDINATION_PARAMETER_CREATE=Create new parameter binding:
-COORDINATION_PARAMETER_CREATE_STEP1=1. Select public render parameter:
-COORDINATION_PARAMETER_CREATE_STEP2=2. Select windows for parameter ''{0}'':
-COORDINATION_PARAMETER_CREATE_STEP3=3. Name binding:
+COORDINATION_PARAMETER_CREATE_NO_PAIRS=No available public render parameters. Cannot create new parameter bindings.
+COORDINATION_PARAMETER_CREATE_STEP1=1. Select public parameter / window pairs:
+COORDINATION_PARAMETER_CREATE_STEP2=2. Name parameter binding:
COORDINATION_PARAMETER_CREATE_CREATE=Create binding
COORDINATION_WINDOWS=Windows
COORDINATION_ALIAS_BINDINGS=Alias bindings
COORDINATION_ALIAS_MANAGE_EXISTING=Manage existing alias bindings:
+COORDINATION_ALIAS_EXISTING_NONE=No existing alias bindings.
COORDINATION_ALIAS_EXISTING_NAME=Name
COORDINATION_ALIAS_EXISTING_ORIGINAL=Original QName
COORDINATION_ALIAS_EXISTING_ACTIONS=Actions
COORDINATION_ALIAS_CREATE=Create new alias binding:
+COORDINATION_ALIAS_CREATE_NO_PARAMS=No available public render parameters. Cannot create new alias bindings.
COORDINATION_ALIAS_CREATE_STEP1=1. Select public render parameter:
COORDINATION_ALIAS_CREATE_STEP2=2. Name alias binding:
COORDINATION_ALIAS_CREATE_CREATE=Create alias
@@ -295,6 +299,7 @@
COORDINATION_EVENT_WIRINGS=Event wirings
COORDINATION_EVENT_EXPLICIT_MODE=Use explicit event wiring
COORDINATION_EVENT_MANAGE_EXISTING=Manage existing event wirings:
+COORDINATION_EVENT_EXISTING_NONE=No existing event wirings.
COORDINATION_EVENT_EXISTING_NAME=Name
COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=Source windows
COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=Source events
@@ -302,6 +307,7 @@
COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows
COORDINATION_EVENT_EXISTING_ACTIONS=Actions
COORDINATION_EVENT_CREATE=Create new event wiring:
+COORDINATION_EVENT_CREATE_NO_EVENT=No available events. Cannot create new event wirings.
COORDINATION_EVENT_CREATE_STEP1=1. Select source event:
COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event ''{0}'':
COORDINATION_EVENT_CREATE_STEP3=3. Select destination event:
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 16:03:43 UTC (rev 11778)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 19:44:59 UTC (rev 11779)
@@ -14,12 +14,13 @@
<!-- Create alias binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
- <h:form>
+ <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasCoordination.availableRenderParameters}"/>
+ <h:form rendered="#{!empty aliasCoordination.availableRenderParameters}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP1}
<h:selectOneListbox id="alias" size="5" value="#{aliasCoordination.originalQName}"
immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{windowCoordination.availableRenderParameters}"/>
+ <f:selectItems value="#{aliasCoordination.availableRenderParameters}"/>
</h:selectOneListbox>
</div>
@@ -28,8 +29,8 @@
#{bundle.COORDINATION_ALIAS_CREATE_STEP2}
<h:inputText id="aliasName" value="#{aliasCoordination.aliasName}"/>
<h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}"
- action="#{aliasCoordination.createBinding}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancelBinding}"
+ action="#{aliasCoordination.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancel}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -39,8 +40,9 @@
<!-- Manage existing alias bindings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_MANAGE_EXISTING}</h3>
- <div class="float-left full-width">
- <h:form>
+ <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" rendered="#{empty aliasCoordination.displayAliasBindings}"/>
+ <h:form rendered="#{!empty aliasCoordination.displayAliasBindings}">
+ <div class="float-left full-width">
<h:dataTable var="binding" value="#{aliasCoordination.displayAliasBindings}"
rendered="true" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
@@ -55,9 +57,9 @@
<ui:repeat var="qname" value="#{binding.names}">
#{qname}
</ui:repeat>
- </h:column>
+ </h:column>
<h:column>
- <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}"</f:facet>
+ <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet>
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{binding.name}"/>
@@ -70,16 +72,16 @@
</h:commandLink>
</h:column>
</h:dataTable>
- </h:form>
- </div>
- <br class="clear"/>
+ </div>
+ <br class="clear"/>
+ </h:form>
</div>
<div class="tenpx-top-bottom">
<h2 class="portlet-area-header">#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2>
<h:form>
- <h:selectBooleanCheckbox id="useImplicitBinding" value="#{coordinationManager.explicitParametersUsed}"
+ <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}"
onchange="this.form.submit()" immediate="true"/>
#{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE}
</h:form>
@@ -89,32 +91,23 @@
<!-- Create parameter binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3>
- <h:form>
+ <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty windowCoordination.availableParameterWindowPairs}"/>
+ <h:form rendered="#{!empty windowCoordination.availableParameterWindowPairs}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}
- <h:selectOneListbox id="parameter" size="5" value="#{windowCoordination.selectedRenderParameter}"
+ <h:selectManyListbox id="parameterWindowPair" size="5" value="#{windowCoordination.selectedParameterWindowPairs}"
immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{windowCoordination.availableRenderParameters}"/>
- </h:selectOneListbox>
+ <f:selectItems value="#{windowCoordination.availableParameterWindowPairs}"/>
+ </h:selectManyListbox>
</div>
- <h:panelGroup rendered="#{!empty windowCoordination.selectedRenderParameter}">
- <div class="float-left quarter-width">
- #{bundle.COORDINATION_PARAMETER_CREATE_STEP2}
- <h:selectManyListbox id="windows" size="5" value="#{windowCoordination.selectedWindows}"
- immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{windowCoordination.windows}"/>
- </h:selectManyListbox>
- </div>
- </h:panelGroup>
-
- <h:panelGroup rendered="#{!empty windowCoordination.selectedWindows}">
+ <h:panelGroup rendered="#{!empty windowCoordination.selectedParameterWindowPairs}">
<div class="float-left quarter-width">
- #{bundle.COORDINATION_PARAMETER_CREATE_STEP3}
+ #{bundle.COORDINATION_PARAMETER_CREATE_STEP2}
<h:inputText id="bindingName" value="#{windowCoordination.windowBindingName}"/>
<h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
- action="#{windowCoordination.createBinding}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancelBinding}"
+ action="#{windowCoordination.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{windowCoordination.cancel}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -125,7 +118,8 @@
<!-- Manage existing parameter bindings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3>
<div class="float-left full-width">
- <h:form>
+ <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty windowCoordination.displayParameterBindings}"/>
+ <h:form rendered="#{!empty windowCoordination.displayParameterBindings}">
<h:dataTable var="binding" value="#{windowCoordination.displayParameterBindings}"
rendered="true" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
@@ -133,31 +127,32 @@
headerClass="portlet-section-header">
<h:column>
<f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet>
- #{binding.id}
- </h:column>
- <h:column>
- <f:facet name="header">Original QName</f:facet>
#{binding.name}
</h:column>
<h:column>
- <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet>
- <ui:repeat var="window" value="#{binding.windows}">
- <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
- <f:param name="id" value="#{window.id}"/>
- #{window.name}
- </h:commandLink>
- </ui:repeat>
+ <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet>
+ <ul>
+ <ui:repeat var="pair" value="#{binding.parameterWindowPairs}">
+ <li>
+ #{pair.name}#{pair.separator}
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
+ <f:param name="id" value="#{pair.window.id}"/>
+ #{pair.window.name}
+ </h:commandLink>
+ </li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet>
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
- <f:param name="name" value="#{binding.id}"/>
+ <f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="parameter"/>
</h:commandLink> |
<h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
- <f:param name="name" value="#{binding.id}"/>
+ <f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="parameter"/>
</h:commandLink>
</h:column>
@@ -180,7 +175,8 @@
<hr/>
<!-- Create new event wiring -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3>
- <h:form>
+ <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventCoordination.sourceEvents}"/>
+ <h:form rendered="#{!empty eventCoordination.sourceEvents}">
<h:panelGroup>
#{bundle.COORDINATION_EVENT_CREATE_STEP1}
<h:selectOneListbox id="sourceEvent" size="5" value="#{eventCoordination.selectedSourceEvent}" immediate="true"
@@ -216,9 +212,9 @@
<h:panelGroup rendered="#{!empty eventCoordination.selectedDestinationWindows}">
#{bundle.COORDINATION_EVENT_CREATE_STEP5}
<h:inputText id="wiringName" value="#{eventCoordination.wiringName}"/>
- <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventCoordination.createWiring}"
+ <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventCoordination.create}"
styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventCoordination.cancelWiring}"
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventCoordination.cancel}"
styleClass="portlet-form-button"/>
</h:panelGroup>
</h:form>
@@ -226,9 +222,9 @@
<!-- Manage existing wirings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3>
- <h:form>
+ <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventCoordination.displayEventWirings}"/>
+ <h:form rendered="#{!empty eventCoordination.displayEventWirings}">
<h:dataTable var="wiring" value="#{eventCoordination.displayEventWirings}"
- rendered="true"
styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn, objectActionColumn"
17 years, 8 months
JBoss Portal SVN: r11778 - in modules/cms/trunk/cms-jackrabbit: src/test/java/org/jboss/portal/cms/test/commands and 2 other directories.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-01 12:03:43 -0400 (Mon, 01 Sep 2008)
New Revision: 11778
Modified:
modules/cms/trunk/cms-jackrabbit/pom.xml
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java
modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml
modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml
Log:
fixing Search testcases. Test Suite passes 100% now with JackRabbit upgraded to 1.4
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-01 16:03:43 UTC (rev 11778)
@@ -272,15 +272,13 @@
<configuration>
<skip>false</skip>
<excludes>
- <exclude>**/TestFileCreateFailed$1TestCommand.java</exclude>
- <exclude>**/TestSearch.java</exclude>
- </excludes>
- <!--
+ <exclude>**/TestFileCreateFailed$1TestCommand.java</exclude>
+ </excludes>
+
+ <!--
<includes>
- <include>**/TestReadAccess.java</include>
- <include>**/TestWriteAccess.java</include>
- <include>**/TestManageAccess.java</include>
- </includes>
+ <include>**/TestSearch.java</include>
+ </includes>
-->
</configuration>
</plugin>
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java 2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java 2008-09-01 16:03:43 UTC (rev 11778)
@@ -32,7 +32,6 @@
import org.jboss.portal.search.QueryConversionException;
import java.util.List;
-import java.util.Locale;
/** @author <a href="mailto:theute@jboss.org">Thomas Heute</a> */
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml 2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml 2008-09-01 16:03:43 UTC (rev 11778)
@@ -5,7 +5,7 @@
<properties>
<property>
<name>hibernate.show_sql</name>
- <value>true</value>
+ <value>false</value>
</property>
<property>
<name>hibernate.auto_close_session</name>
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml 2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml 2008-09-01 16:03:43 UTC (rev 11778)
@@ -49,22 +49,20 @@
<param name="schemaObjectPrefix" value="WSP"/>
<param name="JNDIName" value="java:/SessionFactory"/>
<param name="externalBLOBs" value="false"/>
- </PersistenceManager>
- <!--
+ </PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${wsp.home}/index"/>
- <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/>
- <param name="useCompoundFile" value="true"/>
- <param name="minMergeDocs" value="100"/>
- <param name="volatileIdleTime" value="3"/>
- <param name="maxMergeDocs" value="100000"/>
- <param name="mergeFactor" value="10"/>
- <param name="bufferSize" value="10"/>
- <param name="cacheSize" value="1000"/>
- <param name="forceConsistencyCheck" value="false"/>
- <param name="autoRepair" value="true"/>
- </SearchIndex>
- -->
+ <param name="path" value="${wsp.home}/index"/>
+ <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.HTMLTextExtractor"/>
+ <param name="useCompoundFile" value="true"/>
+ <param name="minMergeDocs" value="100"/>
+ <param name="volatileIdleTime" value="3"/>
+ <param name="maxMergeDocs" value="100000"/>
+ <param name="mergeFactor" value="10"/>
+ <param name="bufferSize" value="10"/>
+ <param name="cacheSize" value="1000"/>
+ <param name="forceConsistencyCheck" value="false"/>
+ <param name="autoRepair" value="true"/>
+ </SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/versions">
<FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
17 years, 8 months
JBoss Portal SVN: r11777 - in branches/JBoss_Portal_Branch_2_7: core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/coordination and 3 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-01 06:47:26 -0400 (Mon, 01 Sep 2008)
New Revision: 11777
Added:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/coordination/
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/coordination/index.html
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/MapPortlet.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/WeatherPortlet.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml
Log:
Added some explanations on coordination samples
Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/coordination/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/coordination/index.html (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/coordination/index.html 2008-09-01 10:47:26 UTC (rev 11777)
@@ -0,0 +1,40 @@
+<div class="portlet-font">
+The coordination samples show how events can be wired and how public parameters can be bound.<br>
+To understand the samples of any of a subpage you will need to have a look at the corresponding
+portlet.xml and the default-object.xml for this sample application.<br>
+On this page you can see one usage of shared parameters aliasing. Say you bought a portlet that displays the weather forecast
+for a location, and found on the web another portlet that displays the map for a zipcode.<br>
+Here we supposed that the two portlets are installed on the server without any change to their code or descriptors.
+The first portlet could define a public render parameter like:
+<pre>
+ <public-render-parameter>
+ <identifier>your_zipcode</identifier>
+ <name>zipcode</name>
+ </public-render-parameter>
+</pre>
+The second portlet could have defined it like that:
+<pre>
+ <public-render-parameter>
+ <identifier>my_zipcode</identifier>
+ <qname xmlns:coor="urn:jboss:portal:samples:coor">coor:zipcode</qname>
+ </public-render-parameter>
+</pre>
+
+We would like to alias those render parameters to a page parameter, so that without any change to the code we can pass a URL parameter by adding "?zip=20878" to define the
+zipcode to use for both portlets.<br>
+
+To do so we can either use the admin portlet or in our default-object.xml descriptor add the following:
+<pre>
+ <coordination>
+ <bindings>
+ <alias-binding>
+ <id>zip</id>
+ <qname>zipcode</qname>
+ <qname>{urn:jboss:portal:samples:coor}zipcode</qname>
+ </alias-binding>
+ </bindings>
+ </coordination>
+</pre>
+
+Now try to add "?zip=20878" to your URL to see it in action. Alternatively, you can also fill-in the form on the other portlet to define the page parameter.
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java 2008-09-01 10:11:05 UTC (rev 11776)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java 2008-09-01 10:47:26 UTC (rev 11777)
@@ -73,6 +73,11 @@
}
//
+ writer.println("<div class=\"portlet-font\">Page parameters can be bound to coordination aliases. Out of the box, the request parameters" +
+ " are themselves bound to page parameters. Setting a value below, will modify the URL by adding a request parameter.<br/>" +
+ "This can be particulary intersting to use URL request parameters to set values usable by a portlet.</div>");
+
+ //
writer.println("<form action=\"" + resp.createActionURL() + "\" method=\"POST\"><table>");
writer.println("<tr><td>Page parameter name:</td><td><input type=\"text\" name=\"name\" width=\"36\" value=\"\"/></td></tr>");
writer.println("<tr><td>Page parameter value:</td><td><input type=\"text\" name=\"value\" width=\"36\" value=\"\"/></td></tr>");
Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/MapPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/MapPortlet.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/MapPortlet.java 2008-09-01 10:47:26 UTC (rev 11777)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated 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.jboss.portal.core.samples.basic.coordination;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class MapPortlet extends GenericPortlet
+{
+ public void doView(RenderRequest request, RenderResponse response) throws IOException
+ {
+ PrintWriter writer = response.getWriter();
+ writer.write("Map for (your_zipcode):" + request.getParameter("your_zipcode"));
+ writer.close();
+ }
+}
+
Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/WeatherPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/WeatherPortlet.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/coordination/WeatherPortlet.java 2008-09-01 10:47:26 UTC (rev 11777)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated 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.jboss.portal.core.samples.basic.coordination;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class WeatherPortlet extends GenericPortlet
+{
+
+ public void doView(RenderRequest request, RenderResponse response) throws IOException
+ {
+ PrintWriter writer = response.getWriter();
+ writer.write("Weather for (my_zipcode):" + request.getParameter("my_zipcode"));
+ writer.close();
+ }
+}
+
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-09-01 10:11:05 UTC (rev 11776)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-09-01 10:47:26 UTC (rev 11777)
@@ -32,9 +32,65 @@
<if-exists>overwrite</if-exists>
<page>
<page-name>Coordination Samples</page-name>
+ <implicit-mode>FALSE</implicit-mode>
+ <window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/coordination/index.html</content-uri>
+ </content>
+ <region>center</region>
+ <height>0</height>
+ <properties>
+ <property>
+ <name>theme.decorationRendererId</name>
+ <value>divRenderer</value>
+ </property>
+ <property>
+ <name>theme.portletRendererId</name>
+ <value>divRenderer</value>
+ </property>
+ <property>
+ <name>theme.windowRendererId</name>
+ <value>divRenderer</value>
+ </property>
+ </properties>
+ </window>
+
+ <window>
+ <window-name>CoordinationWeatherWindow</window-name>
+ <instance-ref>CoordinationWeatherPortletInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+
+ <window>
+ <window-name>CoordinationMapWindow</window-name>
+ <instance-ref>CoordinationMapPortletInstance</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ </window>
+
+ <window>
+ <window-name>PageParameterPortletWindow</window-name>
+ <instance-ref>PageParameterPortletInstance</instance-ref>
+ <region>center</region>
+ <height>3</height>
+ </window>
+
+ <coordination>
+ <bindings>
+ <alias-binding>
+ <id>zip</id>
+ <qname>zipcode</qname>
+ <qname>{urn:jboss:portal:samples:coor}zipcode</qname>
+ </alias-binding>
+ </bindings>
+ </coordination>
+
<page>
- <page-name>Events EXPLICIT</page-name>
+ <page-name>Events - Explicit</page-name>
<window>
<window-name>ShoppingCatalogPortletWindow1</window-name>
@@ -90,7 +146,7 @@
</sources>
<destinations>
<window-coordination>
- <window-name>ShoppingCartPortletWindow2</window-name>
+ <window-name>ShoppingCartPortletWindow1</window-name>
<qname>{urn:jboss:portal:samples:event}CartEvent</qname>
</window-coordination>
<window-coordination>
@@ -109,7 +165,7 @@
</sources>
<destinations>
<window-coordination>
- <window-name>ShoppingCartPortletWindow1</window-name>
+ <window-name>ShoppingCartPortletWindow2</window-name>
<qname>{urn:jboss:portal:samples:event}CartEvent</qname>
</window-coordination>
<window-coordination>
@@ -123,7 +179,7 @@
</page>
<page>
- <page-name>Events FALLBACK</page-name>
+ <page-name>Events - Fallback</page-name>
<window>
<window-name>ShoppingCatalogPortletWindow1</window-name>
@@ -179,7 +235,7 @@
</sources>
<destinations>
<window-coordination>
- <window-name>ShoppingCartPortletWindow2</window-name>
+ <window-name>ShoppingCartPortletWindow1</window-name>
<qname>{urn:jboss:portal:samples:event}CartEvent</qname>
</window-coordination>
<window-coordination>
@@ -193,7 +249,7 @@
</page>
<page>
- <page-name>Events IMPLICIT</page-name>
+ <page-name>Events - Implicit</page-name>
<window>
<window-name>ShoppingCatalogPortletWindow1</window-name>
@@ -253,7 +309,7 @@
| - absense of implicit coordination
-->
- <page-name>Window+!implicit coordination</page-name>
+ <page-name>Parameters - Explicit</page-name>
<window>
<window-name>PublicParametersPortletWindow1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
@@ -340,7 +396,7 @@
| - absense of implicit coordination
-->
- <page-name>Alias+!implicit coordination</page-name>
+ <page-name>Parameters - Alias</page-name>
<window>
<window-name>PublicParametersPortletWindow1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
@@ -405,7 +461,7 @@
| - absense of implicit coordination
-->
- <page-name>Window+alias+!implicit coordination</page-name>
+ <page-name>Parameters - Explicit+Alias</page-name>
<window>
<window-name>PublicParametersPortletWindow1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
@@ -471,7 +527,7 @@
| - no other kind of coordination occurs
-->
- <page-name>Implicit coordination</page-name>
+ <page-name>Parameters - Implicit</page-name>
<window>
<window-name>PublicParametersPortletWindow1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml 2008-09-01 10:11:05 UTC (rev 11776)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml 2008-09-01 10:47:26 UTC (rev 11777)
@@ -59,4 +59,18 @@
<portlet-ref>PageParameterPortlet</portlet-ref>
</instance>
</deployment>
+ <deployment>
+ <instance>
+ <display-name xml:lang="en">Coordination Weather Portlet</display-name>
+ <instance-id>CoordinationWeatherPortletInstance</instance-id>
+ <portlet-ref>CoordinationWeatherPortlet</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
+ <display-name xml:lang="en">Coordination Map Portlet</display-name>
+ <instance-id>CoordinationMapPortletInstance</instance-id>
+ <portlet-ref>CoordinationMapPortlet</portlet-ref>
+ </instance>
+ </deployment>
</deployments>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml 2008-09-01 10:11:05 UTC (rev 11776)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml 2008-09-01 10:47:26 UTC (rev 11777)
@@ -113,6 +113,38 @@
</portlet-info>
</portlet>
+ <portlet>
+ <description>Coordination Weather Portlet</description>
+ <portlet-name>CoordinationWeatherPortlet</portlet-name>
+ <display-name>Coordination Weather Portlet</display-name>
+ <portlet-class>org.jboss.portal.core.samples.basic.coordination.WeatherPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Coordination Weather Portlet</title>
+ <keywords>coordination</keywords>
+ </portlet-info>
+ <supported-public-render-parameter>my_zipcode</supported-public-render-parameter>
+ </portlet>
+
+ <portlet>
+ <description>Coordination Map Portlet</description>
+ <portlet-name>CoordinationMapPortlet</portlet-name>
+ <display-name>Coordination Map Portlet</display-name>
+ <portlet-class>org.jboss.portal.core.samples.basic.coordination.MapPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Coordination Map Portlet</title>
+ <keywords>coordination</keywords>
+ </portlet-info>
+ <supported-public-render-parameter>your_zipcode</supported-public-render-parameter>
+ </portlet>
+
<filter>
<filter-name>JBoss Portlet Filter</filter-name>
<filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
@@ -133,43 +165,53 @@
<!-- Public render parameter definitions -->
<public-render-parameter>
+ <identifier>foo1</identifier>
<name>foo</name>
- <identifier>foo1</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>bar1</identifier>
<name>bar1</name>
- <identifier>bar1</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>juu1</identifier>
<qname xmlns:juu="urn:jboss:portal:samples:juu">juu:juu</qname>
- <identifier>juu1</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>daa1</identifier>
<qname xmlns:daa1="urn:jboss:portal:samples:daa1">daa1:daa1</qname>
- <identifier>daa1</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>foo2</identifier>
<name>foo</name>
- <identifier>foo2</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>bar2</identifier>
<name>bar2</name>
- <identifier>bar2</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>juu2</identifier>
<qname xmlns:juu="urn:jboss:portal:samples:juu">juu:juu</qname>
- <identifier>juu2</identifier>
</public-render-parameter>
<public-render-parameter>
+ <identifier>daa2</identifier>
<qname xmlns:daa2="urn:jboss:portal:samples:daa2">daa2:daa2</qname>
- <identifier>daa2</identifier>
</public-render-parameter>
+ <public-render-parameter>
+ <identifier>your_zipcode</identifier>
+ <name>zipcode</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>my_zipcode</identifier>
+ <qname xmlns:coor="urn:jboss:portal:samples:coor">coor:zipcode</qname>
+ </public-render-parameter>
+
</portlet-app>
17 years, 8 months
JBoss Portal SVN: r11776 - branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-01 06:11:05 -0400 (Mon, 01 Sep 2008)
New Revision: 11776
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java
Log:
NPE when the file couldn't be found
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2008-09-01 07:36:20 UTC (rev 11775)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2008-09-01 10:11:05 UTC (rev 11776)
@@ -236,7 +236,6 @@
//
URLFactory resourceURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext());
- String path = file.getBasePath();
try
{
@@ -245,6 +244,7 @@
resp.setContentType("text/html");
if (file != null)
{
+ String path = file.getBasePath();
if(file.getContent().getMimeType().startsWith("image/"))
{
String imageURI = path;
@@ -319,6 +319,7 @@
PrintWriter writer = resp.getWriter();
String sHTML = "";
ResourceBundle rb = getPortletConfig().getResourceBundle(req.getLocale());
+ String path = file.getBasePath();
if (path == null || path.trim().length() == 0)
{
sHTML = "<h2>" + rb.getString("CMS_ACCESS_DENIED")+ "</h2>" + rb.getString("CMS_ACCESS_DENIED_DESCRIPTION");
17 years, 8 months