JBoss Portal SVN: r11773 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-31 18:12:48 -0400 (Sun, 31 Aug 2008)
New Revision: 11773
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.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/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/WEB-INF/faces-config.xml
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/renameCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml
Log:
- Started re-working alias bindings and parameter bindings as current implementation is wrong.
- Fixed cancel button for parameter creation (was using wrong manager).
- Added cancel buttons on rename actions.
Added: 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 (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773)
@@ -0,0 +1,186 @@
+/*
+* 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.AliasBindingInfo;
+import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.portlet.info.PortletInfo;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class AliasBindingManagerBean extends CoordinationManagerBean.CoordinationBean
+{
+ private Map<String, DisplayAliasBinding> displayAliasBindings;
+
+ private String aliasName;
+ private String originalQName;
+
+ public String getAliasName()
+ {
+ return aliasName;
+ }
+
+ public void setAliasName(String aliasName)
+ {
+ this.aliasName = aliasName;
+ }
+
+ public String getOriginalQName()
+ {
+ return originalQName;
+ }
+
+ public void setOriginalQName(String originalQName)
+ {
+ this.originalQName = originalQName;
+ }
+
+ public void loadInfoFrom(Page page)
+ {
+ Collection<? extends AliasBindingInfo> bindings = managerBean.getCoordinationService().getAliasBindings(page);
+ if (!bindings.isEmpty())
+ {
+ displayAliasBindings = new HashMap<String, DisplayAliasBinding>();
+ for (AliasBindingInfo binding : bindings)
+ {
+ displayAliasBindings.put(binding.getName(), new DisplayAliasBinding(binding));
+ }
+ }
+ else
+ {
+ displayAliasBindings = Collections.emptyMap();
+ }
+ }
+
+ public List<DisplayAliasBinding> getDisplayAliasBindings()
+ {
+ if (displayAliasBindings == null)
+ {
+ return Collections.emptyList();
+ }
+
+ List<DisplayAliasBinding> result = new LinkedList<DisplayAliasBinding>(displayAliasBindings.values());
+ Collections.sort(result);
+
+ return result;
+ }
+
+ public String createBinding()
+ {
+ if (aliasName != null)
+ {
+ try
+ {
+ HashSet<QName> qNames = new HashSet<QName>();
+ qNames.add(QName.valueOf(originalQName));
+ managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames);
+ }
+ catch (IllegalCoordinationException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String cancelBinding()
+ {
+ aliasName = null;
+ originalQName = null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String delete(String name) throws IllegalCoordinationException
+ {
+ DisplayAliasBinding binding = displayAliasBindings.get(name);
+ if (binding != null)
+ {
+ AliasBindingInfo alias = binding.getAlias();
+ managerBean.getCoordinationService().removeAliasBinding(alias);
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String rename(String oldName, String newName) throws IllegalCoordinationException
+ {
+ DisplayAliasBinding binding = displayAliasBindings.get(newName);
+ if (binding != null)
+ {
+ AliasBindingInfo alias = binding.getAlias();
+ managerBean.getCoordinationService().renameAliasBinding(alias, newName);
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public void extractInfoFrom(Window window, PortletInfo info)
+ {
+ // nothing to do here as alias bindings don't have any window specific info
+ }
+ public static class DisplayAliasBinding implements Comparable
+ {
+ private AliasBindingInfo alias;
+ private List<QName> names;
+
+ public DisplayAliasBinding(AliasBindingInfo binding)
+ {
+ alias = binding;
+ names = new ArrayList<QName>(binding.getNames());
+ }
+
+ public List<QName> getNames()
+ {
+ return names;
+ }
+
+ public String getName()
+ {
+ return alias.getName();
+ }
+
+ public AliasBindingInfo getAlias()
+ {
+ return alias;
+ }
+
+ public int compareTo(Object o)
+ {
+ DisplayAliasBinding other = (DisplayAliasBinding) o;
+ return getName().compareTo(other.getName());
+ }
+ }
+}
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-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773)
@@ -55,6 +55,7 @@
private PortalObjectId selectedObjectId;
+ private AliasBindingManagerBean aliasManager;
private EventWiringManagerBean eventManager;
private WindowBindingManagerBean windowManager;
@@ -66,6 +67,7 @@
private CoordinationType selectedType;
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>();
+ private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>();
private String newName;
static final String EDIT_COORDINATION = "editCoordination";
@@ -88,7 +90,15 @@
CoordinationBean bean()
{
return windowManagerHolder.get();
- }};
+ }},
+ alias() {
+ String localizationKey()
+ {
+ return "COORDINATION_ALIAS";
+ }CoordinationBean bean()
+ {
+ return aliasManagerHolder.get();
+ }};
abstract String localizationKey();
abstract CoordinationBean bean();
}
@@ -204,6 +214,17 @@
this.windowManager.setManagerBean(this);
}
+ public AliasBindingManagerBean getAliasManager()
+ {
+ return aliasManager;
+ }
+
+ public void setAliasManager(AliasBindingManagerBean aliasManager)
+ {
+ this.aliasManager = aliasManager;
+ this.aliasManager.setManagerBean(this);
+ }
+
public boolean isExplicitEventsUsed()
{
boolean enabled = false;
@@ -265,6 +286,7 @@
eventManager.loadInfoFrom(selectedPage);
windowManager.loadInfoFrom(selectedPage);
+ aliasManager.loadInfoFrom(selectedPage);
Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
if (!children.isEmpty())
@@ -280,6 +302,7 @@
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);
}
@@ -330,6 +353,7 @@
// make manager accessible to CoordinationType
eventManagerHolder.set(eventManager);
windowManagerHolder.set(windowManager);
+ aliasManagerHolder.set(aliasManager);
}
public String getSelectedName()
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-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773)
@@ -322,12 +322,10 @@
public String delete(String name) throws IllegalCoordinationException
{
DisplayEventWiring displayEvent = displayEventWirings.get(name);
-
if (displayEvent != null)
{
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().removeEventWiring(event);
- displayEventWirings.remove(name);
}
return CoordinationManagerBean.EDIT_COORDINATION;
}
@@ -340,7 +338,6 @@
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().renameEventWiring(event, newName);
}
-
return CoordinationManagerBean.EDIT_COORDINATION;
}
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-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-31 22:12:48 UTC (rev 11773)
@@ -299,14 +299,11 @@
public String delete(String name) throws IllegalCoordinationException
{
DisplayParameterBinding displayParam = displayParameterBindings.get(name);
-
if (displayParam != null)
{
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
- displayParameterBindings.remove(name);
}
-
return CoordinationManagerBean.EDIT_COORDINATION;
}
@@ -318,7 +315,6 @@
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
}
-
return CoordinationManagerBean.EDIT_COORDINATION;
}
}
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-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-08-31 22:12:48 UTC (rev 11773)
@@ -272,6 +272,8 @@
COORDINATION_PARAMETER_BINDINGS=Parameter bindings
COORDINATION_PARAMETER_EXPLICIT_MODE=Use explicit parameter binding
COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings:
+COORDINATION_PARAMETER_EXISTING_NAME=Name
+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}'':
@@ -279,10 +281,18 @@
COORDINATION_PARAMETER_CREATE_CREATE=Create binding
COORDINATION_WINDOWS=Windows
+
COORDINATION_ALIAS_BINDINGS=Alias bindings
-COORDINATION_WINDOW_BINDINGS=Window bindings
+COORDINATION_ALIAS_MANAGE_EXISTING=Manage 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_STEP1=1. Select public render parameter:
+COORDINATION_ALIAS_CREATE_STEP2=2. Name alias binding:
+COORDINATION_ALIAS_CREATE_CREATE=Create alias
-COORDINATION_EVENT_WIRINGS=event wirings
+COORDINATION_EVENT_WIRINGS=Event wirings
COORDINATION_EVENT_EXPLICIT_MODE=Use explicit event wiring
COORDINATION_EVENT_MANAGE_EXISTING=Manage existing event wirings:
COORDINATION_EVENT_EXISTING_NAME=Name
@@ -301,3 +311,4 @@
COORDINATION_WIRING=event wiring
COORDINATION_PARAMETER=parameter binding
+COORDINATION_ALIAS=alias binding
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-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-08-31 22:12:48 UTC (rev 11773)
@@ -359,6 +359,10 @@
<property-name>windowManager</property-name>
<value>#{windowCoordination}</value>
</managed-property>
+ <managed-property>
+ <property-name>aliasManager</property-name>
+ <value>#{aliasCoordination}</value>
+ </managed-property>
</managed-bean>
<managed-bean>
@@ -426,6 +430,11 @@
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.WindowBindingManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>aliasCoordination</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>
<navigation-rule>
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-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 22:12:48 UTC (rev 11773)
@@ -10,9 +10,75 @@
<ui:define name="content">
<div class="tenpx-top-bottom">
- <h2 class="portlet-area-header">#{coordinationManager.selectedPage.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2>
+ <h2 class="portlet-area-header">#{bundle.COORDINATION_ALIAS_BINDINGS}</h2>
+ <!-- Create alias binding -->
+ <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
<h:form>
+ <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}"/>
+ </h:selectOneListbox>
+ </div>
+
+ <h:panelGroup rendered="#{!empty aliasCoordination.originalQName}">
+ <div class="float-left quarter-width">
+ #{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}"
+ styleClass="portlet-form-button"/>
+ </div>
+ </h:panelGroup>
+
+ <br class="clear"/>
+ </h:form>
+
+ <!-- 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:dataTable var="binding" value="#{aliasCoordination.displayAliasBindings}"
+ rendered="true" styleClass="objectList datatable"
+ rowClasses="portlet-section-body,portlet-section-alternate-blue"
+ columnClasses="objectNameColumn"
+ headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet>
+ #{binding.name}
+ </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>
+ </h:column>
+ <h:column>
+ <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}"/>
+ <f:param name="type" value="alias"/>
+ </h:commandLink> |
+ <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}">
+ <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
+ <f:param name="name" value="#{binding.name}"/>
+ <f:param name="type" value="alias"/>
+ </h:commandLink>
+ </h:column>
+ </h:dataTable>
+ </h:form>
+ </div>
+ <br class="clear"/>
+ </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}"
onchange="this.form.submit()" immediate="true"/>
#{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE}
@@ -48,7 +114,7 @@
<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="#{eventCoordination.cancelBinding}"
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancelBinding}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -66,7 +132,7 @@
columnClasses="objectNameColumn"
headerClass="portlet-section-header">
<h:column>
- <f:facet name="header">Binding Name</f:facet>
+ <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet>
#{binding.id}
</h:column>
<h:column>
@@ -74,7 +140,7 @@
#{binding.name}
</h:column>
<h:column>
- <f:facet name="header">Target Windows</f:facet>
+ <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}"/>
@@ -83,7 +149,7 @@
</ui:repeat>
</h:column>
<h:column>
- <f:facet name="header">Actions</f:facet>
+ <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}"/>
@@ -103,7 +169,7 @@
</div>
<!-- Event wirings -->
- <h2 class="portlet-area-header">#{coordinationManager.selectedPage.name} #{bundle.COORDINATION_EVENT_WIRINGS}</h2>
+ <h2 class="portlet-area-header">#{bundle.COORDINATION_EVENT_WIRINGS}</h2>
<h:form>
<h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}"
@@ -218,7 +284,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/>
+ #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"
</f:facet>
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2008-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2008-08-31 22:12:48 UTC (rev 11773)
@@ -14,7 +14,10 @@
<p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span>
#{coordinationManager.selectedType} #{bundle.TO}:
<h:inputText id="newName" value="#{coordinationManager.newName}"/>
- <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
</p>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-08-31 20:32:26 UTC (rev 11772)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-08-31 22:12:48 UTC (rev 11773)
@@ -14,7 +14,10 @@
<p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObjectType} #{bundle.TO}:
<h:inputText id="newName" value="#{renameAction.newName}"/>
- <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
+ <h:commandButton value="#{bundle.CANCEL}" action="objects"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
</p>
</h:form>
</ui:define>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11772 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-31 16:32:26 -0400 (Sun, 31 Aug 2008)
New Revision: 11772
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/jsf/editCoordination.xhtml
Log:
- Fixed improper selection of pages (should have better tested getSelectedPage).
- Really avoid concanetation of events in ui:repeat.
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-08-31 20:20:53 UTC (rev 11771)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31 20:32:26 UTC (rev 11772)
@@ -256,9 +256,13 @@
{
try
{
+ // make sure we use the proper selected page
+ selectedObjectId = pomb.getSelectedPortalObjectId();
+
// Extract metadata only on window children and only if needed
if (isExplicitEventsUsed() || isExplicitParametersUsed())
{
+
eventManager.loadInfoFrom(selectedPage);
windowManager.loadInfoFrom(selectedPage);
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-08-31 20:20:53 UTC (rev 11771)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 20:32:26 UTC (rev 11772)
@@ -190,14 +190,18 @@
<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>
+ <ui:repeat var="event" value="#{wiring.sourceEvents}">
+ #{event}
+ </ui:repeat>
</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>
+ <ui:repeat var="event" value="#{wiring.destinationEvents}">
+ #{event}
+ </ui:repeat>
</h:column>
<h:column>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11771 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-31 16:20:53 -0400 (Sun, 31 Aug 2008)
New Revision: 11771
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Added space so that events are not all concatenated.
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-08-31 20:18:33 UTC (rev 11770)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 20:20:53 UTC (rev 11771)
@@ -190,14 +190,14 @@
<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>
+ <ui:repeat var="event" value="#{wiring.sourceEvents}">#{event} </ui:repeat>
</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>
+ <ui:repeat var="event" value="#{wiring.destinationEvents}">#{event} </ui:repeat>
</h:column>
<h:column>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11770 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: main/org/jboss/portal/core/admin/ui/actions and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-31 16:18:33 -0400 (Sun, 31 Aug 2008)
New Revision: 11770
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.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/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Make reference to windows links to the window page.
- Optimize CoordinationManager.getSelectedPage (and mostly allow for switching to window view without JSF freaking out).
- DisplayEventWiring returns Lists instead of Sets (because ui:repeat doesn't like other collections).
- Added getReadableObjectTypeFor method on PortalObjectManagerBean (thought I was gonna need it).
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-08-31 14:32:15 UTC (rev 11769)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-08-31 20:18:33 UTC (rev 11770)
@@ -22,34 +22,15 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.model.SelectItem;
-import javax.xml.namespace.QName;
-
import org.jboss.portal.api.content.SelectedContent;
import org.jboss.portal.core.CoreConstants;
-import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.admin.ui.actions.AddPageAction;
import org.jboss.portal.core.admin.ui.actions.PropertyAction;
import org.jboss.portal.core.admin.ui.common.PageManagerBean;
import org.jboss.portal.core.admin.ui.portlet.PortletDefinitionInvoker;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.event.PortalEventListenerRegistry;
import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService;
-import org.jboss.portal.core.impl.coordination.CoordinationService;
import org.jboss.portal.core.model.content.Content;
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.spi.ContentProvider;
@@ -76,6 +57,23 @@
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.theme.ThemeService;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+import javax.xml.namespace.QName;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+
/** The portal object manager bean. */
public class PortalObjectManagerBean implements Serializable, AddPageAction.Listener
{
@@ -259,11 +257,13 @@
this.portalObjectContainer = poc;
}
- public CoordinationConfigurator getCoordinationService() {
+ public CoordinationConfigurator getCoordinationService()
+ {
return coordinationService;
}
- public void setCoordinationService(CoordinationConfigurator coordinationService) {
+ public void setCoordinationService(CoordinationConfigurator coordinationService)
+ {
this.coordinationService = coordinationService;
}
@@ -495,7 +495,7 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Success",
- "'" + name + "' " + typeName + " was successfully set as default " + typeName);
+ "'" + name + "' " + typeName + " was successfully set as default " + typeName);
FacesContext.getCurrentInstance().addMessage("status", message);
}
}
@@ -535,11 +535,11 @@
if (content != null)
{
renderParameters = new HashMap<String, String[]>();
-
+
Portlet portlet = instanceContainer.getDefinition(getSelectedContentEditorInstance()).getPortlet();
NavigationInfo navigationInfo = portlet.getInfo().getNavigation();
-
+
ParameterInfo parameterInfo = navigationInfo.getPublicParameter(CoreConstants.JBOSS_PORTAL_CONTENT_URI);
if (parameterInfo != null)
{
@@ -575,7 +575,7 @@
Map<String, String> pmap = getRequestParameterMap();
selectedPlugin = (String)pmap.get("plugin");
}
-
+
public Map<String, String> getRequestParameterMap()
{
return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
@@ -631,7 +631,7 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
-
+
selectedDeletingObject = null;
}
else
@@ -743,12 +743,12 @@
Event portletEvent = eventEvent.getEvent();
QName name = portletEvent.getName();
// only react to content selection events
- if(CONTENT_SELECT.equals(name))
+ if (CONTENT_SELECT.equals(name))
{
if (portletEvent.getPayload() instanceof String)
{
String uri = (String)portletEvent.getPayload();
-
+
PortalObject po = getSelectedObject();
switch (po.getType())
{
@@ -764,9 +764,9 @@
else if (portletEvent.getPayload() instanceof SelectedContent)
{
SelectedContent selectedContent = (SelectedContent)portletEvent.getPayload();
- String uri= selectedContent.getUri();
+ String uri = selectedContent.getUri();
Map<String, String> parameters = selectedContent.getParameters();
-
+
PortalObject po = getSelectedObject();
switch (po.getType())
{
@@ -815,10 +815,10 @@
public SelectItem[] getAvailableActions()
{
return new SelectItem[]{
- new SelectItem("view", "View"),
- new SelectItem("viewrecursive", "View Recursive"),
- new SelectItem("personalize", "Personalize"),
- new SelectItem("personalizerecursive", "Personalize Recursive")
+ new SelectItem("view", "View"),
+ new SelectItem("viewrecursive", "View Recursive"),
+ new SelectItem("personalize", "Personalize"),
+ new SelectItem("personalizerecursive", "Personalize Recursive")
};
}
@@ -891,26 +891,26 @@
public String getSelectedObjectType()
{
PortalObject object = getSelectedObject();
- if (object != null)
+ return object != null ? getReadableObjectTypeFor(object.getType()) : "unknown";
+ }
+
+ public String getReadableObjectTypeFor(int portalObjectType)
+ {
+ switch (portalObjectType)
{
- switch (object.getType())
- {
- case PortalObject.TYPE_CONTEXT:
- return "context";
- case PortalObject.TYPE_PORTAL:
- return "portal";
- case PortalObject.TYPE_PAGE:
- return "page";
- case PortalObject.TYPE_WINDOW:
- return "window";
- }
+ case PortalObject.TYPE_CONTEXT:
+ return "context";
+ case PortalObject.TYPE_PORTAL:
+ return "portal";
+ case PortalObject.TYPE_PAGE:
+ return "page";
+ case PortalObject.TYPE_WINDOW:
+ return "window";
}
- //to make it safe
- return "none";
+ return "unknown";
}
-
public ControlPropertiesBean getControlProperties()
{
return controlProperties;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2008-08-31 14:32:15 UTC (rev 11769)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2008-08-31 20:18:33 UTC (rev 11770)
@@ -23,18 +23,20 @@
package org.jboss.portal.core.admin.ui.actions;
import org.jboss.portal.common.i18n.LocaleFormat;
-import org.jboss.portal.common.i18n.LocaleManager;
import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.common.util.ConversionException;
+import org.jboss.portal.core.admin.ui.DisplayNameBean;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
-import org.jboss.portal.core.admin.ui.DisplayNameBean;
-import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.instance.Instance;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.SortedMap;
/**
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
@@ -179,7 +181,7 @@
}
public String getFacesParam(String param){
- return (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param);
+ return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param);
}
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-08-31 14:32:15 UTC (rev 11769)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31 20:18:33 UTC (rev 11770)
@@ -138,16 +138,22 @@
public Page getSelectedPage()
{
- PortalObject portalObject = pomb.getPortalObjectContainer().getObject(getSelectedObjectId());
- if (portalObject.getType() != PortalObject.TYPE_PAGE)
+ // if we don't already have a selected page or we have selected a different object
+ if (selectedPage == null || !selectedPage.getId().equals(selectedObjectId))
{
- throw new IllegalArgumentException("Coordination can only be dealt with at the page level!");
+ PortalObject portalObject = pomb.getPortalObjectContainer().getObject(getSelectedObjectId());
+ if (portalObject.getType() != PortalObject.TYPE_PAGE)
+ {
+ throw new IllegalArgumentException("Coordination can only be dealt with at the page level!");
+ }
+
+ selectedPage = (Page)portalObject;
+
+ //perform surgery on portalobjectmanager
+ pomb.selectObject(pomb.getPortalObjectContainer().getObject(selectedPage.getId()));
+ return selectedPage;
}
- selectedPage = (Page)portalObject;
-
- //perform surgery on portalobjectmanager
- pomb.selectObject(pomb.getPortalObjectContainer().getObject(selectedPage.getId()));
return selectedPage;
}
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-08-31 14:32:15 UTC (rev 11769)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-31 20:18:33 UTC (rev 11770)
@@ -33,14 +33,13 @@
import javax.faces.event.ValueChangeEvent;
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;
-import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -355,10 +354,10 @@
public static class DisplayEventWiring implements Comparable
{
- private Set<Window> sourceWindows;
- private Set<QName> sourceEvents;
- private Set<Window> destinationWindows;
- private Set<QName> destinationEvents;
+ private List<Window> sourceWindows;
+ private List<QName> sourceEvents;
+ private List<Window> destinationWindows;
+ private List<QName> destinationEvents;
private EventWiringInfo eventInfo;
DisplayEventWiring(EventWiringInfo eventInfo)
@@ -366,12 +365,12 @@
this.eventInfo = eventInfo;
Map<Window, QName> sources = eventInfo.getSources();
- sourceWindows = new HashSet<Window>(sources.keySet());
- sourceEvents = new HashSet<QName>(sources.values());
+ sourceWindows = new ArrayList<Window>(sources.keySet());
+ sourceEvents = new ArrayList<QName>(sources.values());
Map<Window, QName> destinations = eventInfo.getDestinations();
- destinationWindows = new HashSet<Window>(destinations.keySet());
- destinationEvents = new HashSet<QName>(destinations.values());
+ destinationWindows = new ArrayList<Window>(destinations.keySet());
+ destinationEvents = new ArrayList<QName>(destinations.values());
}
public EventWiringInfo getEventInfo()
@@ -384,22 +383,22 @@
return eventInfo.getName();
}
- public Set<Window> getSourceWindows()
+ public List<Window> getSourceWindows()
{
return sourceWindows;
}
- public Set<QName> getSourceEvents()
+ public List<QName> getSourceEvents()
{
return sourceEvents;
}
- public Set<Window> getDestinationWindows()
+ public List<Window> getDestinationWindows()
{
return destinationWindows;
}
- public Set<QName> getDestinationEvents()
+ public List<QName> getDestinationEvents()
{
return destinationEvents;
}
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-08-31 14:32:15 UTC (rev 11769)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 20:18:33 UTC (rev 11770)
@@ -75,7 +75,12 @@
</h:column>
<h:column>
<f:facet name="header">Target Windows</f:facet>
- <ui:repeat var="window" value="#{binding.windows}">#{window.name},</ui:repeat>
+ <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>
</h:column>
<h:column>
<f:facet name="header">Actions</f:facet>
@@ -168,35 +173,49 @@
</f:facet>
#{wiring.name}
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/>
</f:facet>
- #{wiring.sourceWindows}
+ <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>
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/>
</f:facet>
- #{wiring.sourceEvents}
+ <ui:repeat var="event" value="#{wiring.sourceEvents}">#{event}</ui:repeat>
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/>
</f:facet>
- #{wiring.destinationEvents}
+ <ui:repeat var="event" value="#{wiring.destinationEvents}">#{event}</ui:repeat>
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/>
</f:facet>
- #{wiring.destinationWindows}
+ <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>
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/>
</f:facet>
-
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{wiring.name}"/>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11769 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-31 10:32:15 -0400 (Sun, 31 Aug 2008)
New Revision: 11769
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/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/jsf/editCoordination.xhtml
Log:
- Use name instead of id when passing a binding to rename or delete confirmation page.
- Rename and delete should reload data from Coordination service (except that right now persistence doesn't work).
- Reset the selection after creating a binding.
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-08-30 01:13:22 UTC (rev 11768)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31 14:32:15 UTC (rev 11769)
@@ -22,7 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import org.jboss.portal.common.util.ConversionException;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
@@ -68,7 +67,7 @@
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>();
private String newName;
- private static final String EDIT_COORDINATION = "editCoordination";
+ static final String EDIT_COORDINATION = "editCoordination";
private enum CoordinationType
{
@@ -247,7 +246,7 @@
}
}
- public String editCoordination() throws ConversionException
+ public String editCoordination()
{
try
{
@@ -342,6 +341,7 @@
try
{
selectedType.bean().delete(selectedName);
+ editCoordination();
}
catch (IllegalCoordinationException e)
{
@@ -370,6 +370,7 @@
if(selectedType != null)
{
selectedType.bean().rename(selectedName, newName);
+ editCoordination();
}
// reset selection
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-08-30 01:13:22 UTC (rev 11768)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-31 14:32:15 UTC (rev 11769)
@@ -317,7 +317,7 @@
selectedDestinationEvent = null;
selectedDestinationWindows = null;
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String delete(String name) throws IllegalCoordinationException
@@ -330,7 +330,7 @@
managerBean.getCoordinationService().removeEventWiring(event);
displayEventWirings.remove(name);
}
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String rename(String oldName, String newName) throws IllegalCoordinationException
@@ -340,12 +340,9 @@
{
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().renameEventWiring(event, newName);
-
- // reload event information
- loadInfoFrom(managerBean.getSelectedPage());
}
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public void extractInfoFrom(Window window, PortletInfo info)
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-08-30 01:13:22 UTC (rev 11768)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-31 14:32:15 UTC (rev 11769)
@@ -278,7 +278,13 @@
}
}
}
- return null;
+
+ // reset selection
+ windowBindingName = null;
+ selectedWindows = null;
+ selectedRenderParameter = null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String cancelBinding()
@@ -300,7 +306,8 @@
managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
displayParameterBindings.remove(name);
}
- return null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String rename(String name, String newName) throws IllegalCoordinationException
@@ -310,11 +317,8 @@
{
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
-
- // reload event information
- loadInfoFrom(managerBean.getSelectedPage());
}
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
}
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-08-30 01:13:22 UTC (rev 11768)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31 14:32:15 UTC (rev 11769)
@@ -47,7 +47,7 @@
#{bundle.COORDINATION_PARAMETER_CREATE_STEP3}
<h:inputText id="bindingName" value="#{windowCoordination.windowBindingName}"/>
<h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
- action="#{eventCoordination.createBinding}" styleClass="portlet-form-button"/>
+ action="#{windowCoordination.createBinding}" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventCoordination.cancelBinding}"
styleClass="portlet-form-button"/>
</div>
@@ -81,12 +81,12 @@
<f:facet name="header">Actions</f:facet>
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
- <f:param name="name" value="#{binding.name}"/>
+ <f:param name="name" value="#{binding.id}"/>
<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.name}"/>
+ <f:param name="name" value="#{binding.id}"/>
<f:param name="type" value="parameter"/>
</h:commandLink>
</h:column>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11768 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-08-29 21:13:22 -0400 (Fri, 29 Aug 2008)
New Revision: 11768
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml
Log:
Chapter 6. XML Descriptors:
- fix my plural/singular mistake.
6.1.3. The JBoss Portal Object DTD:
- Table 6.1. Properties: minor text revisions.
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-08-29 15:22:32 UTC (rev 11767)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-08-30 01:13:22 UTC (rev 11768)
@@ -633,14 +633,13 @@
<!ELEMENT properties (property*)>]]>
</programlisting>
<para>
- A set of generic properties for the portal object. The <computeroutput><properties></computeroutput> elements contains definitions specific to a portal object.
+ A set of generic properties for the portal object. The <computeroutput><properties></computeroutput> elements contain definitions specific to a portal object.
</para>
<programlisting><![CDATA[
<!ELEMENT property (name,value)>]]>
</programlisting>
<para>
- A generic string property.
- The following non exhaustive values are used:
+ A generic string property. The following table lists accepted values. This table is not exhaustive:
<table>
<title>Properties</title>
<tgroup cols="2" align="left" colsep="1" rowsep="1">
@@ -654,17 +653,16 @@
</thead>
<tbody>
<row>
- <entry>layout.id</entry>
- <entry>Defines the layout to use for this portal object and sub-objects if they don't override the value</entry>
+ <entry><computeroutput>layout.id</computeroutput></entry>
+ <entry>Defines the layout to use for the portal object and sub-objects if they do not override the value.</entry>
</row>
<row>
- <entry>theme.id</entry>
- <entry>Defines the theme to use for this portal object and sub-objects if they don't override the value</entry>
+ <entry><computeroutput>theme.id</computeroutput></entry>
+ <entry>Defines the theme used for the portal object and sub-objects if they do not override the value.</entry>
</row>
<row id="xml.default.objectname.property">
- <entry>portal.defaultObjectName</entry>
- <entry>This value is used to define the default child object. If applied on a <literal>context</literal>, it will define which portal is the default one.
- If applied on a <literal>portal</literal>, it will define which page is the default one.</entry>
+ <entry><computeroutput>portal.defaultObjectName</computeroutput></entry>
+ <entry>Defines the default child object. If applied to a <literal>context</literal>, it defines the default portal. If applied to a <literal>portal</literal>, it defines the default portal page.</entry>
</row>
</tbody>
</tgroup>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11767 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: model/portal/metadata and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-29 11:22:32 -0400 (Fri, 29 Aug 2008)
New Revision: 11767
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java
Log:
- Generification.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-08-28 23:16:33 UTC (rev 11766)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-08-29 15:22:32 UTC (rev 11767)
@@ -27,6 +27,7 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.xml.NullEntityResolver;
import org.jboss.portal.common.xml.XMLTools;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
@@ -34,7 +35,6 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.PortalObjectPath;
-import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.model.portal.metadata.BuildContext;
import org.jboss.portal.core.model.portal.metadata.PortalObjectMetaData;
import org.jboss.portal.server.deployment.PortalWebApp;
@@ -78,7 +78,7 @@
protected ObjectDeploymentFactory factory;
/** What we have deployed. */
- protected ArrayList units;
+ protected ArrayList<Unit> units;
public ObjectDeployment(URL url,
MBeanServer mbeanServer,
@@ -129,13 +129,12 @@
Element deploymentsElt = doc.getDocumentElement();
// Build the list of deployment units
- List deploymentElts = XMLTools.getChildren(deploymentsElt, "deployment");
- units = new ArrayList(deploymentElts.size());
- for (int i = 0; i < deploymentElts.size(); i++)
+ List<Element> deploymentElts = XMLTools.getChildren(deploymentsElt, "deployment");
+ units = new ArrayList<Unit>(deploymentElts.size());
+ for (Element deploymentElt : deploymentElts)
{
- Element deploymentElt = (Element)deploymentElts.get(i);
Unit unit = new Unit();
-
+
//
Element parentRefElt = XMLTools.getUniqueChild(deploymentElt, "parent-ref", false);
unit.parentRef = parentRefElt == null ? null : PortalObjectId.parse(XMLTools.asString(parentRefElt), PortalObjectPath.LEGACY_FORMAT);
@@ -216,9 +215,8 @@
};
// Create all objects
- for (int i = 0; i < units.size(); i++)
+ for (Unit unit : units)
{
- Unit unit = (Unit)units.get(i);
if (isTrace)
{
log.trace(unit);
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2008-08-28 23:16:33 UTC (rev 11766)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2008-08-29 15:22:32 UTC (rev 11767)
@@ -28,8 +28,6 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.w3c.dom.Element;
-import java.util.List;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
@@ -75,10 +73,8 @@
}
//
- List pageElts = XMLTools.getChildren(contextElt, "portal");
- for (int i = 0; i < pageElts.size(); i++)
+ for (Element portalElt : XMLTools.getChildren(contextElt, "portal"))
{
- Element portalElt = (Element)pageElts.get(i);
PortalMetaData pageMD = (PortalMetaData)PortalObjectMetaData.buildMetaData(contentProviderRegistry, portalElt);
contextMD.getChildren().put(pageMD.getName(), pageMD);
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2008-08-28 23:16:33 UTC (rev 11766)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2008-08-29 15:22:32 UTC (rev 11767)
@@ -22,13 +22,6 @@
******************************************************************************/
package org.jboss.portal.core.model.portal.metadata;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
import org.jboss.logging.Logger;
import org.jboss.portal.common.i18n.LocaleFormat;
import org.jboss.portal.common.i18n.LocalizedString;
@@ -42,7 +35,6 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.core.model.portal.Portal;
import org.jboss.portal.core.model.portal.metadata.coordination.CoordinationMetaData;
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
@@ -51,6 +43,13 @@
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
import org.w3c.dom.Element;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
@@ -63,8 +62,8 @@
private String name;
private String listener;
- private Map properties;
- private Map children;
+ private Map<String,String> properties;
+ private Map<String,PortalObjectMetaData> children;
private SecurityConstraintsMetaData securityConstraints;
private LocalizedString displayName;
private String resourceBundle;
@@ -72,8 +71,8 @@
public PortalObjectMetaData()
{
- properties = new HashMap();
- children = new HashMap();
+ properties = new HashMap<String, String>();
+ children = new HashMap<String, PortalObjectMetaData>();
}
public String getName()
@@ -96,7 +95,7 @@
this.listener = listener;
}
- public Map getProperties()
+ public Map<String,String> getProperties()
{
return properties;
}
@@ -106,7 +105,7 @@
this.properties = properties;
}
- public Map getChildren()
+ public Map<String, PortalObjectMetaData> getChildren()
{
return children;
}
@@ -153,9 +152,8 @@
configure(buildContext, object);
// Build children recursively
- for (Iterator i = getChildren().values().iterator(); i.hasNext();)
+ for (PortalObjectMetaData portalObjectMD : getChildren().values())
{
- PortalObjectMetaData portalObjectMD = (PortalObjectMetaData)i.next();
portalObjectMD.create(buildContext, object);
}
@@ -191,12 +189,9 @@
private void configure(BuildContext buildContext, PortalObject object) throws SecurityConfigurationException
{
// Configure properties
- for (Iterator i = properties.entrySet().iterator(); i.hasNext();)
+ for (Map.Entry<String,String> entry : properties.entrySet())
{
- Map.Entry entry = (Map.Entry)i.next();
- String name = (String)entry.getKey();
- String value = (String)entry.getValue();
- object.setDeclaredProperty(name, value);
+ object.setDeclaredProperty(entry.getKey(), entry.getValue());
}
// Configure listener
@@ -317,10 +312,8 @@
public static void buildPropertiesMetaData(PortalObjectMetaData portalObjectMD, Element propertiesElt)
{
- List propertyElts = XMLTools.getChildren(propertiesElt, "property");
- for (int i = 0; i < propertyElts.size(); i++)
+ for (Element propertyElt : XMLTools.getChildren(propertiesElt, "property"))
{
- Element propertyElt = (Element)propertyElts.get(i);
Element nameElt = XMLTools.getUniqueChild(propertyElt, "name", true);
Element valueElt = XMLTools.getUniqueChild(propertyElt, "value", true);
String name = XMLTools.asString(nameElt);
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11766 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-28 19:16:33 -0400 (Thu, 28 Aug 2008)
New Revision: 11766
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml
Log:
- Simpler handling of whitespace issue.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-08-28 23:14:38 UTC (rev 11765)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-08-28 23:16:33 UTC (rev 11766)
@@ -22,7 +22,7 @@
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
- <h3>#{bundle.COMMON_DELETE}  <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
+ <h3>#{bundle.COMMON_DELETE} #{portalobjectmgr.selectedObjectType}</h3>
<p class="portlet-msg-alert">
#{bundle.COMMON_DELETING}
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11765 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/impl/coordination and 4 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-28 19:14:38 -0400 (Thu, 28 Aug 2008)
New Revision: 11765
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml
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/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/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java
Log:
- Added rename operations on CoordinationConfigurator and associated test cases.
- Implemented rename behavior.
- Next step is looking at backend since operations don't seem to be persisted properly
and creation of wiring doesn't work.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-08-28 23:14:38 UTC (rev 11765)
@@ -58,8 +58,8 @@
void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
/**
- * Set event wiring implicit mode for a given page container. This will be inherited recursively
- * by all children page containers
+ * Set event wiring implicit mode for a given page container. This will be inherited recursively by all children page
+ * containers
*
* @param pageContainer
* @param mode
@@ -68,6 +68,15 @@
void setEventWiringImplicitMode(PageContainer pageContainer, boolean mode) throws IllegalCoordinationException;
/**
+ * Renames the specified wiring to the new name
+ *
+ * @param eventWiring the wiring to be renamed
+ * @param newName the wiring new name
+ * @throws IllegalCoordinationException
+ */
+ void renameEventWiring(EventWiringInfo eventWiring, String newName) throws IllegalCoordinationException;
+
+ /**
* Checks if implicit event wiring is enabled for a given page container. May return null if no implicit mode is not
* set for this portal object
*
@@ -84,9 +93,8 @@
*/
void removeEventWiringImplicitMode(PageContainer pageContainer) throws IllegalCoordinationException;
-
/**
- * @param page
+ * @param page
* @param eventQName
* @return all wirings defined for a given qname
*/
@@ -127,10 +135,18 @@
*/
void removeWindowBinding(WindowBindingInfo parameterBinding) throws IllegalCoordinationException;
+ /**
+ * Renames the specified window binding to the new name
+ *
+ * @param windowBinding the window binding to be renamed
+ * @param newName the binding new name
+ * @throws IllegalCoordinationException
+ */
+ void renameWindowBinding(WindowBindingInfo windowBinding, String newName) throws IllegalCoordinationException;
/**
- * Set parameter binding implicit mode for a given page container. This will be inherited recursively by
- * all children page containers
+ * Set parameter binding implicit mode for a given page container. This will be inherited recursively by all children
+ * page containers
*
* @param pageContainer
* @param mode
@@ -138,7 +154,6 @@
*/
void setParameterBindingImplicitMode(PageContainer pageContainer, boolean mode) throws IllegalCoordinationException;
-
/**
* Removes parameter binding implicit mode entry for a given page container
*
@@ -156,8 +171,6 @@
*/
Boolean isParameterBindingImplicitModeEnabled(PageContainer pageContainer);
-
-
/**
* Set alias binding for a given page. If alias with given name already exists it will be overwritten
*
@@ -177,6 +190,15 @@
void removeAliasBinding(AliasBindingInfo aliasInfo) throws IllegalCoordinationException;
/**
+ * Renames the specified alias to the new name
+ *
+ * @param aliasBinding the alias binding to be renamed
+ * @param newName the alias new name
+ * @throws IllegalCoordinationException
+ */
+ void renameAliasBinding(AliasBindingInfo aliasBinding, String newName) throws IllegalCoordinationException;
+
+ /**
* @param page
* @return collection of alias bindings connected to the given page
*/
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-08-28 23:14:38 UTC (rev 11765)
@@ -22,6 +22,7 @@
package org.jboss.portal.core.impl.coordination;
+import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.core.controller.coordination.AliasBindingInfo;
import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.controller.coordination.CoordinationManager;
@@ -52,46 +53,30 @@
/**
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version : 0.1 $
*/
public class CoordinationService extends AbstractJBossService
implements CoordinationManager, CoordinationConfigurator
{
public static final String SOURCE = "source";
-
public static final String DESTINATION = "destination";
-
public static final String BINDING = "binding";
-
public static final String PREFIX = "coordination";
-
public static final String QNAME_SEPARATOR = ";";
-
public static final String PREFIX_EVENT = PREFIX + ".event";
-
public static final String PREFIX_PARAMETER = PREFIX + ".parameter";
-
public static final String PREFIX_PARAMETER_ALIAS = PREFIX_PARAMETER + ".alias";
-
public static final String PREFIX_EVENT_NAME = PREFIX_EVENT + ".name";
-
public static final String PREFIX_EVENT_WIRING = PREFIX_EVENT + ".wiring";
-
public static final String PREFIX_PARAMETER_NAME = PREFIX_PARAMETER + ".name";
-
public static final String PREFIX_PARAMETER_BINDING = PREFIX_PARAMETER + ".binding";
-
public static final String PREFIX_PARAMETER_ALIAS_NAME = PREFIX_PARAMETER_ALIAS + ".name";
-
public static final String PREFIX_EVENT_IMPLICIT_MODE = PREFIX_EVENT + ".implicit_mode";
-
public static final String PREFIX_PARAMETER_IMPLICIT_MODE = PREFIX_PARAMETER + ".implicit_mode";
-
public static final Boolean DEFAULT_IMPLICIT_MODE = true;
-
protected EventConverter eventConverter = new SimpleEventConverter();
-
protected PortalObjectContainer portalObjectContainer;
protected void startService() throws Exception
@@ -107,34 +92,20 @@
public Map<Window, PortletWindowEvent> getEventWindows(PortletWindowEvent event, ControllerPortletControllerContext context) throws IllegalCoordinationException
{
+ ParameterValidation.throwIllegalArgExceptionIfNull(event, "event");
+ ParameterValidation.throwIllegalArgExceptionIfNull(context, "context");
- if (event == null)
- {
- throw new IllegalArgumentException("event is null");
- }
-
- if (context == null)
- {
- throw new IllegalArgumentException("context is null");
- }
-
// Obtain page for which we scope this event
-
Page page = context.getWindow(event.getWindowId()).getPage();
-
boolean implicitMode = resolveEventWiringImplicitModeEnabled(page);
- Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
-
// Only explicit wirings
-
+ Map<Window, PortletWindowEvent> windows;
if(!implicitMode)
{
windows = getEventWindowsExplicit(page, event, context);
}
-
// If no explicit wirings for this event fallback to implicit
-
else
{
windows = getEventWindowsExplicit(page, event, context);
@@ -152,7 +123,6 @@
{
Set<String> names = new HashSet<String>();
- //
for (WindowBindingInfo info : getWindowBindings(window))
{
for (Map.Entry<Window, QName> entry : info.getWindows().entrySet())
@@ -176,16 +146,13 @@
}
}
- //
return names;
}
private Map<Window, PortletWindowEvent> getEventWindowsExplicit(Page page, PortletWindowEvent event, ControllerPortletControllerContext context)
{
Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
-
Collection<EventWiringInfo> infos = getEventWirings(page);
-
for (EventWiringInfo info : infos)
{
for (Map.Entry<Window, QName> entry : info.getSources().entrySet())
@@ -207,7 +174,6 @@
break;
}
}
-
}
return windows;
@@ -216,7 +182,6 @@
private Map<Window, PortletWindowEvent> getEventWindowsImplicit(Page page, PortletWindowEvent event, ControllerPortletControllerContext context)
{
Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
-
for (String windowName : context.getWindowNames())
{
PortletInfo info = context.getPortletInfo(windowName);
@@ -234,22 +199,10 @@
public void setEventWiring(Map<Window, QName> sources, Map<Window, QName> destinations, String eventName) throws IllegalCoordinationException
{
-
- if (sources == null)
- {
- throw new IllegalArgumentException("sources are null");
- }
-
- if (destinations == null)
- {
- throw new IllegalArgumentException("destinations are null");
- }
-
- if (eventName == null)
- {
- throw new IllegalArgumentException("eventName is null");
- }
-
+ ParameterValidation.throwIllegalArgExceptionIfNull(sources, "sources");
+ ParameterValidation.throwIllegalArgExceptionIfNull(destinations, "destinations");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(eventName, "event name", null);
+
if (sources.isEmpty())
{
throw new IllegalArgumentException("empty sources map");
@@ -318,10 +271,7 @@
public void removeEventWiring(EventWiringInfo info) throws IllegalCoordinationException
{
- if (info == null)
- {
- throw new IllegalArgumentException("EventWiringInfo is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(info, "EventWiringInfo");
// Remove all entries
@@ -339,60 +289,41 @@
}
}
- public void setEventWiringImplicitMode(PageContainer pageContainer, boolean mode) throws IllegalCoordinationException
+ public void renameEventWiring(EventWiringInfo eventWiring, String newName) throws IllegalCoordinationException
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("pageContainer is null");
- }
+ removeEventWiring(eventWiring);
+ setEventWiring(eventWiring.getSources(), eventWiring.getDestinations(), newName);
+ }
-
+ public void setEventWiringImplicitMode(PageContainer pageContainer, boolean mode) throws IllegalCoordinationException
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
setImplicitMode(pageContainer, mode, PREFIX_EVENT_IMPLICIT_MODE);
}
public void removeEventWiringImplicitMode(PageContainer pageContainer) throws IllegalCoordinationException
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("pageContainer is null");
- }
-
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
setImplicitMode(pageContainer, null, PREFIX_EVENT_IMPLICIT_MODE);
}
public Boolean isEventWiringImplicitModeEnabled(PageContainer pageContainer)
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
return decodeImplicitMode(pageContainer, PREFIX_EVENT_IMPLICIT_MODE);
}
public Boolean resolveEventWiringImplicitModeEnabled(PageContainer page)
{
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "PageContainer");
return resolveImplicitMode(page, PREFIX_EVENT_IMPLICIT_MODE);
}
public Collection<EventWiringInfo> getEventWirings(Page page, QName eventQName)
{
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
+ ParameterValidation.throwIllegalArgExceptionIfNull(eventQName, "event QName");
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- if (eventQName == null)
- {
- throw new IllegalArgumentException("eventQName is null");
- }
-
Collection<EventWiringInfo> pageEvents = getEventWirings(page);
Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
@@ -410,10 +341,7 @@
public Collection<EventWiringInfo> getEventWirings(Page page)
{
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
// Examine window properties and create page events
@@ -445,7 +373,7 @@
String role = window.getProperty(propName);
- //TODO: if the imformation from properties is not consistent should we throw exception?
+ //TODO: if information from properties is not consistent should we throw exception?
if (name != null)
{
@@ -517,14 +445,8 @@
public void setWindowBinding(String name, Map<Window, QName> windows) throws IllegalCoordinationException
{
- if (windows == null)
- {
- throw new IllegalArgumentException("windows are null");
- }
- if (name == null)
- {
- throw new IllegalArgumentException("name is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(windows, "windows");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "name", "window binding");
if (windows.isEmpty())
{
throw new IllegalArgumentException("empty windows map");
@@ -556,80 +478,56 @@
public void removeWindowBinding(WindowBindingInfo info) throws IllegalCoordinationException
{
- if (info == null)
- {
- throw new IllegalArgumentException("ParameterBindingInfo is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(info, "WindowBindingInfo");
// Remove all entries
String prop_wiring = PREFIX_PARAMETER_BINDING + "." + info.getName();
-
- //
for (Window window : info.getWindows().keySet())
{
window.setDeclaredProperty(prop_wiring, null);
}
}
- public Boolean isParameterBindingImplicitModeEnabled(PageContainer pageContainer)
+ public void renameWindowBinding(WindowBindingInfo windowBinding, String newName) throws IllegalCoordinationException
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("page is null");
- }
+ removeWindowBinding(windowBinding);
+ setWindowBinding(newName, windowBinding.getWindows());
+ }
- //
+ public Boolean isParameterBindingImplicitModeEnabled(PageContainer pageContainer)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
return decodeImplicitMode(pageContainer, PREFIX_PARAMETER_IMPLICIT_MODE);
}
public void setParameterBindingImplicitMode(PageContainer pageContainer, boolean mode) throws IllegalCoordinationException
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("pageContainer is null");
- }
-
- //
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
setImplicitMode(pageContainer, mode, PREFIX_PARAMETER_IMPLICIT_MODE);
}
public Boolean resolveParameterBindingImplicitModeEnabled(PageContainer pageContainer)
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- //
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
return resolveImplicitMode(pageContainer, PREFIX_PARAMETER_IMPLICIT_MODE);
}
public void removeParameterBindingImplicitMode(PageContainer pageContainer) throws IllegalCoordinationException
{
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("pageContainer is null");
- }
-
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageContainer, "PageContainer");
setImplicitMode(pageContainer, null, PREFIX_PARAMETER_IMPLICIT_MODE);
}
public void setAliasBinding(Page page, String aliasName, Set<QName> qnames) throws IllegalCoordinationException
{
- if (page == null)
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(aliasName, "name", "alias binding");
+ ParameterValidation.throwIllegalArgExceptionIfNull(qnames, "aliased QNames");
+ if(qnames.isEmpty())
{
- throw new IllegalArgumentException("page is null");
+ throw new IllegalArgumentException("Aliased QNames set is empty!");
}
- if (aliasName == null)
- {
- throw new IllegalArgumentException("alias name is null");
- }
- if (qnames == null)
- {
- throw new IllegalArgumentException("qnames set is null");
- }
- //
String propName = PREFIX_PARAMETER_ALIAS_NAME + "." + aliasName;
// Check if qname consist separator string
@@ -641,10 +539,7 @@
}
}
- //
StringBuilder qnameList = new StringBuilder();
-
- //
for (Iterator i = qnames.iterator(); i.hasNext(); )
{
QName qname = (QName)i.next();
@@ -655,21 +550,14 @@
}
}
- //
page.setDeclaredProperty(propName, qnameList.toString());
}
public void removeAliasBinding(AliasBindingInfo aliasInfo) throws IllegalCoordinationException
{
- if (aliasInfo == null)
- {
- throw new IllegalArgumentException("alias info is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(aliasInfo, "AliasBindingInfo");
- //
AliasInfoPOJO alias = (AliasInfoPOJO)aliasInfo;
-
- //
String propName = PREFIX_PARAMETER_ALIAS_NAME + "." + aliasInfo.getName();
if (alias.page.getProperties().keySet().contains(propName))
{
@@ -677,17 +565,19 @@
}
}
+ public void renameAliasBinding(AliasBindingInfo aliasBinding, String newName) throws IllegalCoordinationException
+ {
+ removeAliasBinding(aliasBinding);
+ AliasInfoPOJO alias = (AliasInfoPOJO)aliasBinding;
+ setAliasBinding(alias.page, newName, alias.getNames());
+ }
+
public Collection<AliasBindingInfo> getAliasBindings(Page page)
{
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
- //
HashSet<AliasBindingInfo> aliases = new HashSet<AliasBindingInfo>();
- //
for (String propertyName : page.getProperties().keySet())
{
if (propertyName.startsWith(PREFIX_PARAMETER_ALIAS_NAME))
@@ -708,30 +598,16 @@
}
}
- //
return aliases;
}
public Collection<? extends WindowBindingInfo> getWindowBindings(Page page, QName parameterName)
{
- if (page == null)
- {
- throw new IllegalArgumentException("Page is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
+ ParameterValidation.throwIllegalArgExceptionIfNull(parameterName, "parameter QName");
- //
- if (parameterName == null)
- {
- throw new IllegalArgumentException("Name is null");
- }
-
- //
Collection<? extends WindowBindingInfo> pageParams = getWindowBindings(page);
-
- //
Collection<WindowBindingInfo> infos = new HashSet<WindowBindingInfo>();
-
- //
for (WindowBindingInfo pageParam : pageParams)
{
if (pageParam.getWindows().containsValue(parameterName))
@@ -739,8 +615,6 @@
infos.add(pageParam);
}
}
-
- //
return infos;
}
@@ -760,15 +634,11 @@
public Collection<? extends WindowBindingInfo> getWindowBindings(Page page)
{
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
// Examine window properties and create page parameters
Collection<PortalObject> children = page.getChildren(PortalObject.WINDOW_MASK);
- //
Map<String, WindowInfoPOJO> params = new HashMap<String, WindowInfoPOJO>();
for (PortalObject child : children)
{
@@ -779,8 +649,7 @@
if(propName.startsWith(PREFIX_PARAMETER_BINDING))
{
String pn = propName.substring(PREFIX_PARAMETER_BINDING.length() + 1);
- WindowInfoPOJO info = null;
-
+ WindowInfoPOJO info;
if (!params.keySet().contains(pn))
{
info = new WindowInfoPOJO(pn);
@@ -791,15 +660,11 @@
info = params.get(pn);
}
- //
String binding = child.getProperty(propName);
-
//TODO: if the information from properties is not consistent should we throw exception?
if (binding != null)
{
QName qname = decodeQName(binding);
-
- //
if (qname != null)
{
info.windows.put((Window)child, qname);
@@ -809,7 +674,6 @@
}
}
- //
return Collections.unmodifiableCollection(params.values());
}
@@ -853,7 +717,6 @@
private Boolean decodeImplicitMode(PageContainer pageContainer, String prefix)
{
String value = pageContainer.getDeclaredProperty(prefix);
-
return value != null ? Boolean.valueOf(value) : null;
}
@@ -862,12 +725,9 @@
private Boolean resolveImplicitMode(PageContainer pageContainer, String prefix)
{
String value = pageContainer.getDeclaredProperty(prefix);
+ Boolean mode;
- Boolean mode = null;
-
-
// Try to obtain recursive implicit mode from parents
-
if (value == null)
{
mode = resolveRecursiveImplicitMode(pageContainer, prefix);
@@ -961,14 +821,8 @@
private class WindowInfoPOJO implements WindowBindingInfo
{
-
- /** . */
private final String name;
-
- /** . */
private final Map<Window, QName> windows;
-
- /** . */
private final Map<Window, QName> immutableWindows;
private WindowInfoPOJO(String name)
@@ -991,17 +845,9 @@
private class AliasInfoPOJO implements AliasBindingInfo
{
-
- /** . */
private final String name;
-
- /** . */
private final Page page;
-
- /** . */
private final Set<QName> names;
-
- /** . */
private final Set<QName> immutableNames;
private AliasInfoPOJO(String name, Page page)
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-08-28 23:14:38 UTC (rev 11765)
@@ -31,6 +31,7 @@
import org.jboss.portal.common.junit.TransactionAssert;
import org.jboss.portal.core.controller.coordination.AliasBindingInfo;
import org.jboss.portal.core.controller.coordination.EventWiringInfo;
+import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
import org.jboss.portal.core.impl.coordination.CoordinationService;
import org.jboss.portal.core.model.content.ContentType;
@@ -55,7 +56,6 @@
public class CoordinationServiceTestCase extends AbstractPortalObjectContainerTestCase
{
-
static
{
Appender appender = new ConsoleAppender(new SimpleLayout());
@@ -405,6 +405,109 @@
TransactionAssert.commitTransaction();
}
+ public void testRenameEventWiring() throws IllegalCoordinationException
+ {
+ TransactionAssert.beginTransaction();
+
+ Portal portal1 = container.getContext("").getPortal("Portal_1");
+ Page page1 = portal1.getPage("Page_1");
+
+ Window w1 = page1.getWindow("Window_1");
+ Window w2 = page1.getWindow("Window_2");
+
+ Map<Window, QName> s1 = new HashMap<Window, QName>();
+ s1.put(w1, new QName("juju", "foo"));
+
+ Map<Window, QName> d1 = new HashMap<Window, QName>();
+ d1.put(w2, new QName("bobo", "bar"));
+
+ cos.setEventWiring(s1, d1, "event1");
+
+ Collection<EventWiringInfo> events = cos.getEventWirings(page1);
+ assertNotNull(events);
+ assertEquals(1, events.size());
+
+ EventWiringInfo info = events.iterator().next();
+ assertEquals("event1", info.getName());
+
+ cos.renameEventWiring(info, "new");
+
+ events = cos.getEventWirings(page1);
+ assertEquals(1, events.size());
+
+ info = events.iterator().next();
+ assertEquals("new", info.getName());
+
+ TransactionAssert.commitTransaction();
+ }
+
+ public void testRenameWindowBinding() throws Exception
+ {
+ TransactionAssert.beginTransaction();
+
+ Portal portal1 = container.getContext("").getPortal("Portal_1");
+ Page page1 = portal1.getPage("Page_1");
+
+ Window w1 = page1.getWindow("Window_1");
+ Window w2 = page1.getWindow("Window_2");
+
+ Map<Window, QName> ws = new HashMap<Window, QName>();
+ ws.put(w1, new QName("juju", "foo"));
+ ws.put(w2, new QName("juju", "foo1"));
+
+ cos.setWindowBinding("binding1", ws);
+
+ Collection<? extends WindowBindingInfo> bindings = cos.getWindowBindings(page1);
+ assertEquals(1, bindings.size());
+
+ WindowBindingInfo info = bindings.iterator().next();
+ assertEquals("binding1", info.getName());
+
+ cos.renameWindowBinding(info, "new");
+
+ bindings = cos.getWindowBindings(w1);
+ assertEquals(1, bindings.size());
+ info = bindings.iterator().next();
+ assertEquals("new", info.getName());
+
+ TransactionAssert.commitTransaction();
+ }
+
+ public void testRenameAliasBinding() throws Exception
+ {
+ TransactionAssert.beginTransaction();
+
+ Portal portal1 = container.getContext("").getPortal("Portal_1");
+ Page page1 = portal1.getPage("Page_1");
+
+ QName qname1 = new QName("nm1", "local1");
+ QName qname2 = new QName("nm2", "local2");
+ QName qname3 = new QName("nm3", "local3");
+
+ HashSet<QName> qnames1 = new HashSet<QName>();
+ qnames1.add(qname1);
+ qnames1.add(qname2);
+ qnames1.add(qname3);
+
+ cos.setAliasBinding(page1, "alias1", qnames1);
+
+ Collection<AliasBindingInfo> bindings1 = cos.getAliasBindings(page1);
+
+ assertTrue(bindings1.size() == 1);
+ AliasBindingInfo info = bindings1.iterator().next();
+
+ assertEquals("alias1", info.getName());
+
+ cos.renameAliasBinding(info, "new");
+ bindings1 = cos.getAliasBindings(page1);
+ assertEquals(1, bindings1.size());
+
+ info = bindings1.iterator().next();
+ assertEquals("new", info.getName());
+
+ TransactionAssert.commitTransaction();
+ }
+
public CoordinationService getCos()
{
return cos;
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-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-28 23:14:38 UTC (rev 11765)
@@ -67,6 +67,8 @@
private CoordinationType selectedType;
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>();
+ private String newName;
+ private static final String EDIT_COORDINATION = "editCoordination";
private enum CoordinationType
{
@@ -110,7 +112,7 @@
public abstract String delete(String name) throws IllegalCoordinationException;
- public abstract String rename(String name);
+ public abstract String rename(String oldName, String newName) throws IllegalCoordinationException;
public abstract void extractInfoFrom(Window window, PortletInfo info);
}
@@ -282,7 +284,7 @@
e.printStackTrace();
}
- return "editCoordination";
+ return EDIT_COORDINATION;
}
// JSF helper methods
@@ -350,19 +352,30 @@
// reset selection
selectedType = null;
selectedName = null;
- return null;
+ return EDIT_COORDINATION;
}
- public String renameSelected()
+ public void setNewName(String newName)
{
+ this.newName = newName;
+ }
+
+ public String getNewName()
+ {
+ return newName;
+ }
+
+ public String renameSelected() throws IllegalCoordinationException
+ {
if(selectedType != null)
{
- selectedType.bean().rename(selectedName);
+ selectedType.bean().rename(selectedName, newName);
}
// reset selection
selectedType = null;
selectedName = null;
- return null;
+ newName = null;
+ return EDIT_COORDINATION;
}
}
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-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-28 23:14:38 UTC (rev 11765)
@@ -22,7 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import org.jboss.portal.common.NotYetImplemented;
import org.jboss.portal.core.controller.coordination.EventWiringInfo;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.model.portal.Page;
@@ -334,16 +333,19 @@
return null;
}
- public String rename(String name)
+ public String rename(String oldName, String newName) throws IllegalCoordinationException
{
- DisplayEventWiring displayEvent = displayEventWirings.get(name);
+ DisplayEventWiring displayEvent = displayEventWirings.get(oldName);
if (displayEvent != null)
{
- //todo: implement, rename operation should be on CoordinationConfigurator
EventWiringInfo event = displayEvent.getEventInfo();
+ managerBean.getCoordinationService().renameEventWiring(event, newName);
+
+ // reload event information
+ loadInfoFrom(managerBean.getSelectedPage());
}
- throw new NotYetImplemented("renameWiring not yet implemented!");
+ return null;
}
public void extractInfoFrom(Window window, PortletInfo info)
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-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-28 23:14:38 UTC (rev 11765)
@@ -22,7 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import org.jboss.portal.common.NotYetImplemented;
import org.jboss.portal.core.controller.coordination.AliasBindingInfo;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
@@ -304,15 +303,18 @@
return null;
}
- public String rename(String name)
+ public String rename(String name, String newName) throws IllegalCoordinationException
{
DisplayParameterBinding displayParam = displayParameterBindings.get(name);
if (displayParam != null)
{
- //todo: implement, rename operation should be on CoordinationConfigurator
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
+ managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
+
+ // reload event information
+ loadInfoFrom(managerBean.getSelectedPage());
}
- throw new NotYetImplemented("renameWiring not yet implemented!");
+ return null;
}
}
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-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-08-28 23:14:38 UTC (rev 11765)
@@ -541,6 +541,10 @@
<from-outcome>confirmCoordinationDeletion</from-outcome>
<to-view-id>/jsf/confirmDeleteCoordination.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>renameCoordination</from-outcome>
+ <to-view-id>/jsf/renameCoordination.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<lifecycle>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml 2008-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml 2008-08-28 23:14:38 UTC (rev 11765)
@@ -20,7 +20,7 @@
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
- <h3>#{bundle.COMMON_DELETE}  <h:outputText value="#{coordinationManager.selectedType}"/></h3>
+ <h3>#{bundle.COMMON_DELETE} #{coordinationManager.selectedType}</h3>
<p class="portlet-msg-alert">
#{bundle.COMMON_DELETING}
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-08-28 20:52:43 UTC (rev 11764)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-28 23:14:38 UTC (rev 11765)
@@ -79,7 +79,7 @@
</h:column>
<h:column>
<f:facet name="header">Actions</f:facet>
- <h:commandLink action="#{coordinationManager.renameSelected}" actionListener="#{coordinationManager.select}">
+ <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="parameter"/>
@@ -197,7 +197,7 @@
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/>
</f:facet>
- <h:commandLink action="#{coordinationManager.renameSelected}" actionListener="#{coordinationManager.select}">
+ <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{wiring.name}"/>
<f:param name="type" value="wiring"/>
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2008-08-28 23:14:38 UTC (rev 11765)
@@ -0,0 +1,22 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/>
+ <ui:define name="content">
+ <h3>#{bundle.RENAME} #{coordinationManager.selectedType}</h3>
+ <h:form id="renameForm">
+ <h:message for="newName"/>
+
+ <p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span>
+ #{coordinationManager.selectedType} #{bundle.TO}:
+ <h:inputText id="newName" value="#{coordinationManager.newName}"/>
+ <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" styleClass="portlet-form-button"/>
+ </p>
+ </h:form>
+ </ui:define>
+ </ui:composition>
+</div>
15 years, 8 months
- 1
- 0
JBoss Portal SVN: r11764 - in modules/cms/trunk/cms-jackrabbit: src/test/java/org/jboss/portal/cms/test and 4 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-08-28 16:52:43 -0400 (Thu, 28 Aug 2008)
New Revision: 11764
Removed:
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/TestJackRabbitFirstHop.java
modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/fs-repository.xml
Modified:
modules/cms/trunk/cms-jackrabbit/pom.xml
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java
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/security/SecureCommandTestCase.java
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestManageAccess.java
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestReadAccess.java
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestWriteAccess.java
modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml
modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml
Log:
fixing the security test cases
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-08-28 20:52:43 UTC (rev 11764)
@@ -270,30 +270,27 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>false</skip>
- <excludes>
- <exclude>**/TestJackRabbitFirstHop.java</exclude>
+ <skip>false</skip>
+ <excludes>
<exclude>**/TestFileCreateFailed$1TestCommand.java</exclude>
- <exclude>**/TestSearch.java</exclude>
- <exclude>**/TestReadAccess.java</exclude>
- <exclude>**/TestWriteAccess.java</exclude>
- <exclude>**/TestManageAccess.java</exclude>
- </excludes>
- <!--
+ <exclude>**/TestSearch.java</exclude>
+ </excludes>
+ <!--
<includes>
- <include>**/TestSearch.java</include>
- </includes>
+ <include>**/TestReadAccess.java</include>
+ <include>**/TestWriteAccess.java</include>
+ <include>**/TestManageAccess.java</include>
+ </includes>
-->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- put your configurations here -->
+ <configuration>
<compilerArgument>-nowarn</compilerArgument>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
Deleted: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/TestJackRabbitFirstHop.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/TestJackRabbitFirstHop.java 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/TestJackRabbitFirstHop.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -1,68 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, 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.cms.test;
-
-import junit.framework.TestCase;
-
-import org.apache.log4j.Logger;
-
-import javax.jcr.Repository;
-import javax.jcr.Session;
-import org.apache.jackrabbit.core.TransientRepository;
-
-/**
- * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
- *
- */
-public class TestJackRabbitFirstHop extends TestCase
-{
- /**
- *
- */
- private static Logger log = Logger.getLogger(TestJackRabbitFirstHop.class);
-
- /**
- *
- * @throws Exception
- */
- public void testFirstHop() throws Exception
- {
- Repository repository = new TransientRepository();
- Session session = repository.login();
- try
- {
- String user = session.getUserID();
- String name = repository.getDescriptor(Repository.REP_NAME_DESC);
- log.info("-------------------------------------------------------");
- log.info("Logged in as " + user + " to a " + name + " repository.");
- log.info("-------------------------------------------------------");
- }
- finally
- {
- if(session != null)
- {
- session.logout();
- }
- }
- }
-}
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -61,7 +61,7 @@
service = new JCRCMS();
service.setDoChecking(true);
- service.setDefaultLocale(Locale.ENGLISH.getDisplayName());
+ service.setDefaultLocale(Locale.ENGLISH.getLanguage());
service.setDefaultContentLocation("default-content/default");
service.setConfig(config.getDocumentElement());
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-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -48,8 +48,7 @@
/** Tests retrieval of the version labeled LIVE. */
public void testFileGet() throws CMSException, QueryConversionException
- {
- /*
+ {
FederatedQuery query = new FederatedQuery("risks");
JCRQueryConverter converter = new JCRQueryConverter();
@@ -61,11 +60,6 @@
File file = (File)list.get(0);
assertEquals("/default/private/license.html", file.getBasePath());
file = (File)list.get(1);
- assertEquals("/default/support.html", file.getBasePath());
- */
-
- Command getCMD = service.getCommandFactory().createFileGetCommand("/default/index.html", Locale.ENGLISH);
- File newfile = (File)service.execute(getCMD);
- assertNotNull("/default/index.html Not Found", newfile);
+ assertEquals("/default/support.html", file.getBasePath());
}
}
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/SecureCommandTestCase.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/SecureCommandTestCase.java 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/SecureCommandTestCase.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -80,6 +80,8 @@
IdentityServiceController identityService = ((AuthorizationProviderImpl)aclInterceptor.getAuthorizationManager().getProvider()).
getIdentityServiceController();
this.userModule = (UserModule)identityService.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE);
+
+ JCRCMS.getUserInfo().set(null);
}
/**
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestManageAccess.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestManageAccess.java 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestManageAccess.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.cms.test.security;
-import junit.framework.TestSuite;
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.FolderImpl;
@@ -47,15 +46,7 @@
{
}
- /**
- *
- *
- */
- public static TestSuite suite() throws Exception
- {
- return createTestSuite(TestManageAccess.class);
- }
-
+
/** @return */
private Folder getNewPublicFolder()
{
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestReadAccess.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestReadAccess.java 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestReadAccess.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.cms.test.security;
-import junit.framework.TestSuite;
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.model.File;
@@ -45,18 +44,9 @@
*/
public TestReadAccess()
{
- }
+ }
- /**
- *
- *
- */
- public static TestSuite suite() throws Exception
- {
- return createTestSuite(TestReadAccess.class);
- }
-
/**
*
*
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestWriteAccess.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestWriteAccess.java 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestWriteAccess.java 2008-08-28 20:52:43 UTC (rev 11764)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.cms.test.security;
-import junit.framework.TestSuite;
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
@@ -51,14 +50,6 @@
{
}
- /**
- *
- *
- */
- public static TestSuite suite() throws Exception
- {
- return createTestSuite(TestWriteAccess.class);
- }
/** @return */
private Folder getNewPublicFolder()
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml 2008-08-28 20:52:43 UTC (rev 11764)
@@ -35,6 +35,10 @@
<name>hibernate.cache.use_query_cache</name>
<value>true</value>
</property>
+ <property>
+ <name>hbm2ddl.auto</name>
+ <value>create-drop</value>
+ </property>
</properties>
</configuration>
<!-- The hsqldb configuration -->
Deleted: modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/fs-repository.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/fs-repository.xml 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/fs-repository.xml 2008-08-28 20:52:43 UTC (rev 11764)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<Repository>
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/repository"/>
- </FileSystem>
- <Security appName="Jackrabbit">
- <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"/>
- <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
- <!-- anonymous user name ('anonymous' is the default value) -->
- <param name="anonid" value="anonymous"/>
- </LoginModule>
- </Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
- <Workspace name="${wsp.name}">
- <PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${wsp.home}s"/>
- </FileSystem>
- <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>
- </Workspace>
- <Versioning rootPath="${rep.home}/versions">
- <PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/versions"/>
- </FileSystem>
- </Versioning>
-</Repository>
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml 2008-08-28 18:54:44 UTC (rev 11763)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml 2008-08-28 20:52:43 UTC (rev 11764)
@@ -26,19 +26,12 @@
| virtual file system where the repository stores global state (e.g. registered namespaces, custom node types, etc.)
| Configure to use FS or RDBMS.
-->
-
- <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
+
<FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
<param name="schemaObjectPrefix" value="CMSEntry"/>
<param name="JNDIName" value="java:/SessionFactory"/>
</FileSystem>
-
- <!-- LocalFileSystem: uses FileSystem for storage. -->
- <!--
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/repository"/>
- </FileSystem>
- -->
+
<Security appName="Jackrabbit">
<AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"/>
<LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
@@ -47,34 +40,17 @@
</LoginModule>
</Security>
<Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
- <Workspace name="${wsp.name}">
- <!-- Virtual file system of the workspace: Configure to use FS or RDBMS. -->
-
- <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
+ <Workspace name="${wsp.name}">
<FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
<param name="schemaObjectPrefix" value="CMSEntry"/>
<param name="JNDIName" value="java:/SessionFactory"/>
- </FileSystem>
- <!-- LocalFileSystem: uses FileSystem for storage. -->
- <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${wsp.home}"/>
- </FileSystem>-->
-
- <!--
- persistence manager of the workspace.
- Use XMLPersistenceManager for LocalFileSystem Store and HibernatePersistenceManager/JBossCachePersistenceManager .
- -->
-
- <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
+ </FileSystem>
<PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager">
<param name="schemaObjectPrefix" value="WSP"/>
<param name="JNDIName" value="java:/SessionFactory"/>
<param name="externalBLOBs" value="false"/>
- </PersistenceManager>
-
- <!-- XMLPersistenceManager: uses FileSystem for storage -->
- <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
-
+ </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"/>
@@ -87,40 +63,19 @@
<param name="cacheSize" value="1000"/>
<param name="forceConsistencyCheck" value="false"/>
<param name="autoRepair" value="true"/>
- </SearchIndex>
- </Workspace>
- <Versioning rootPath="${rep.home}/versions">
- <!--
- Configures the filesystem to use for versioning for the respective persistence manager
- Configure to use FS or RDBMS.
+ </SearchIndex>
-->
-
- <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
+ </Workspace>
+ <Versioning rootPath="${rep.home}/versions">
<FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
<param name="schemaObjectPrefix" value="VersionEntry"/>
<param name="JNDIName" value="java:/SessionFactory"/>
</FileSystem>
-
- <!-- LocalFileSystem: uses FileSystem for storage. -->
- <!--
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/versions"/>
- </FileSystem>
- -->
-
- <!--
- Configures the persistence manager to be used for persisting version state.
- Use XMLPersistenceManager for LocalFileSystem Store and HibernatePersistenceManager/JBossCachePersistenceManager for HibernateStore.
- -->
-
- <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
+
<PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager">
<param name="schemaObjectPrefix" value="Version"/>
<param name="JNDIName" value="java:/SessionFactory"/>
<param name="externalBLOBs" value="false"/>
- </PersistenceManager>
-
- <!-- XMLPersistenceManager: uses FileSystem for storage -->
- <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
+ </PersistenceManager>
</Versioning>
</Repository>
\ No newline at end of file
15 years, 8 months
- 1
- 0