JBoss Portal SVN: r12031 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-03 12:21:07 -0400 (Fri, 03 Oct 2008)
New Revision: 12031
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java
Log:
- JBPORTAL-2184: fixed NPE, cleaned-up code at the same time.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2008-10-03 16:20:44 UTC (rev 12030)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2008-10-03 16:21:07 UTC (rev 12031)
@@ -48,11 +48,7 @@
/** . */
private PortalRuntimeContext prc;
- public PortalNodeEventContextImpl(
- PortalEventListenerRegistry registry,
- PortalNodeImpl node,
- PortalNodeEvent event,
- PortalRuntimeContext prc)
+ public PortalNodeEventContextImpl(PortalEventListenerRegistry registry, PortalNodeImpl node, PortalNodeEvent event, PortalRuntimeContext prc)
{
this.registry = registry;
this.node = node;
@@ -78,37 +74,29 @@
}
}
- // Dispatch to the listener
+ // Dispatch
PortalNodeEvent nextEvent = null;
- if (listener != null)
+ PortalNode parent = node.getParent();
+ if (parent != null)
{
PortalNodeImpl current = node;
try
{
- node = (PortalNodeImpl)node.getParent();
- nextEvent = listener.onEvent(this, event);
+ node = (PortalNodeImpl)parent;
+ if (listener != null)
+ {
+ nextEvent = listener.onEvent(this, event);
+ }
+ else
+ {
+ nextEvent = dispatch();
+ }
}
finally
{
node = current;
}
}
- else
- {
- if (node.getParent() != null)
- {
- PortalNodeImpl current = node;
- try
- {
- node = (PortalNodeImpl)node.getParent();
- nextEvent = dispatch();
- }
- finally
- {
- node = current;
- }
- }
- }
//
return nextEvent;
17 years, 7 months
JBoss Portal SVN: r12030 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-03 12:20:44 -0400 (Fri, 03 Oct 2008)
New Revision: 12030
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java
Log:
- JBPORTAL-2184: fixed NPE, cleaned-up code at the same time.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2008-10-03 15:21:36 UTC (rev 12029)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2008-10-03 16:20:44 UTC (rev 12030)
@@ -49,10 +49,10 @@
private PortalRuntimeContext prc;
public PortalNodeEventContextImpl(
- PortalEventListenerRegistry registry,
- PortalNodeImpl node,
- PortalNodeEvent event,
- PortalRuntimeContext prc)
+ PortalEventListenerRegistry registry,
+ PortalNodeImpl node,
+ PortalNodeEvent event,
+ PortalRuntimeContext prc)
{
this.registry = registry;
this.node = node;
@@ -78,37 +78,29 @@
}
}
- // Dispatch to the listener
+ // Dispatch
PortalNodeEvent nextEvent = null;
- if (listener != null)
+ PortalNode parent = node.getParent();
+ if (parent != null)
{
PortalNodeImpl current = node;
try
{
- node = (PortalNodeImpl)node.getParent();
- nextEvent = listener.onEvent(this, event);
+ node = (PortalNodeImpl)parent;
+ if (listener != null)
+ {
+ nextEvent = listener.onEvent(this, event);
+ }
+ else
+ {
+ nextEvent = dispatch();
+ }
}
finally
{
node = current;
}
}
- else
- {
- if (node.getParent() != null)
- {
- PortalNodeImpl current = node;
- try
- {
- node = (PortalNodeImpl)node.getParent();
- nextEvent = dispatch();
- }
- finally
- {
- node = current;
- }
- }
- }
//
return nextEvent;
17 years, 7 months
JBoss Portal SVN: r12029 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-10-03 11:21:36 -0400 (Fri, 03 Oct 2008)
New Revision: 12029
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
Log:
some alien put an extra ">". thanks Chris.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-10-03 14:45:25 UTC (rev 12028)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-10-03 15:21:36 UTC (rev 12029)
@@ -7,7 +7,7 @@
xmlns:pfc="http://www.jboss.com/portal/facelet/common"
xmlns:c="http://java.sun.com/jstl/core">
-<h:form id="obj-nav-form">>
+<h:form id="obj-nav-form">
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
<h:dataTable id="portal-datatable" var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList datatable"
17 years, 7 months
JBoss Portal SVN: r12028 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: model/portal/navstate and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-03 10:45:25 -0400 (Fri, 03 Oct 2008)
New Revision: 12028
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java
Log:
JBPORTAL-2187: Partial refresh broke while integrating portlet container 2.0
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2008-10-03 09:05:41 UTC (rev 12027)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2008-10-03 14:45:25 UTC (rev 12028)
@@ -198,6 +198,14 @@
boolean fullRefresh = false;
//
+
+ if (ctx.getChanges() == null)
+ {
+ fullRefresh = true;
+ }
+ else
+ {
+
for (Iterator i = ctx.getChanges(); i.hasNext();)
{
NavigationalStateChange change = (NavigationalStateChange)i.next();
@@ -209,14 +217,14 @@
break;
}
NavigationalStateObjectChange update = (NavigationalStateObjectChange)change;
-
+/*
// A change that modifies potentially the page structure
if (update.getType() != NavigationalStateObjectChange.UPDATE)
{
fullRefresh = true;
break;
}
-
+*/
// Get the state key
NavigationalStateKey key = update.getKey();
@@ -250,6 +258,7 @@
dirtyWindowIds.add(key.getId());
}
}
+ }
// Commit changes
ctx.applyChanges();
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-10-03 09:05:41 UTC (rev 12027)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-10-03 14:45:25 UTC (rev 12028)
@@ -182,6 +182,10 @@
public Iterator<NavigationalStateObjectChange> getChanges()
{
+ if (changes == null)
+ {
+ return null;
+ }
return changes.values().iterator();
}
17 years, 7 months
JBoss Portal SVN: r12027 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-03 05:05:41 -0400 (Fri, 03 Oct 2008)
New Revision: 12027
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
Log:
JBPORTAL-2187: Partial refresh broke while integrating portlet container 2.0
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2008-10-02 19:43:18 UTC (rev 12026)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2008-10-03 09:05:41 UTC (rev 12027)
@@ -171,20 +171,22 @@
}
}
else if (controllerResponse instanceof UpdatePageResponse)
+// {
+// UpdatePageResponse upr = (UpdatePageResponse)controllerResponse;
+// ViewPageCommand rpc = new ViewPageCommand(upr.getPageId());
+// String url = controllerContext.renderURL(rpc, null, null);
+// UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url);
+// return new AjaxResponse(dresp);
+// }
+// else if (controllerResponse instanceof UpdateWindowResponse)
{
- UpdatePageResponse upr = (UpdatePageResponse)controllerResponse;
- ViewPageCommand rpc = new ViewPageCommand(upr.getPageId());
- String url = controllerContext.renderURL(rpc, null, null);
- UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url);
- return new AjaxResponse(dresp);
- }
- else if (controllerResponse instanceof UpdateWindowResponse)
- {
- UpdateWindowResponse upw = (UpdateWindowResponse)controllerResponse;
+ UpdatePageResponse upw = (UpdatePageResponse)controllerResponse;
// Obtain page and portal
- final Window window = (Window)portalObjectContainer.getObject(upw.getWindowId());
- Page page = (Page)window.getParent();
+// final Window window = (Window)portalObjectContainer.getObject(upw.getWindowId());
+// Page page = (Page)window.getParent();
+ final Page page = (Page)portalObjectContainer.getObject(upw.getPageId());
+
//
NavigationalStateContext ctx = (NavigationalStateContext)controllerContext.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE);
17 years, 7 months
JBoss Portal SVN: r12026 - in branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer: config and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-02 15:43:18 -0400 (Thu, 02 Oct 2008)
New Revision: 12026
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
Log:
- Hopefully fixed the mess I made with my hasty merge from 2.7. Let's see what Mr. Hudson will say! :)
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-02 19:16:30 UTC (rev 12025)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-02 19:43:18 UTC (rev 12026)
@@ -81,7 +81,8 @@
boolean registrationValid = producer.isRegistrationValid(registration);
ProducerRegistrationRequirements requirements = producer.getProducerRegistrationRequirements();
- PortletDescription[] offeredPortlets;
+
+ PortletDescription[] offeredPortlets = null;
ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(requirements.isRegistrationRequired());
serviceDescription.setRequiresInitCookie(BEA_8_CONSUMER_FIX);
serviceDescription.setLocales(producer.getSupportedLocales());
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-02 19:16:30 UTC (rev 12025)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-02 19:43:18 UTC (rev 12026)
@@ -23,8 +23,6 @@
package org.jboss.portal.wsrp.producer.config;
-import java.util.List;
-
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -33,6 +31,4 @@
public interface ProducerConfiguration
{
ProducerRegistrationRequirements getRegistrationRequirements();
-
- List<ProducerConfigurationChangeListener> getChangeListeners();
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-02 19:16:30 UTC (rev 12025)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-02 19:43:18 UTC (rev 12026)
@@ -45,11 +45,6 @@
return requirements;
}
- public List<ProducerConfigurationChangeListener> getChangeListeners()
- {
- return listeners;
- }
-
public void setRegistrationRequirements(ProducerRegistrationRequirements requirements)
{
this.requirements = requirements;
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-02 19:16:30 UTC (rev 12025)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-02 19:43:18 UTC (rev 12026)
@@ -30,7 +30,6 @@
import org.jboss.portal.registration.RegistrationPolicyChangeListener;
import org.jboss.portal.registration.RegistrationPropertyChangeListener;
import org.jboss.portal.wsrp.producer.config.ProducerConfiguration;
-import org.jboss.portal.wsrp.producer.config.ProducerConfigurationChangeListener;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationFactory;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationProvider;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService;
@@ -56,7 +55,6 @@
import java.io.Writer;
import java.net.URL;
import java.util.Enumeration;
-import java.util.List;
import java.util.Set;
/**
@@ -142,13 +140,11 @@
ObjectModelFactory factory = new ProducerConfigurationFactory();
// save listeners if we already have a configuration
- List<ProducerConfigurationChangeListener> listeners = null;
Set<RegistrationPolicyChangeListener> policyListeners = null;
Set<RegistrationPropertyChangeListener> propertyListeners = null;
ProducerRegistrationRequirements registrationRequirements;
if (configuration != null)
{
- listeners = configuration.getChangeListeners();
registrationRequirements = configuration.getRegistrationRequirements();
if (registrationRequirements != null)
{
@@ -161,13 +157,6 @@
configuration = (ProducerConfiguration)unmarshaller.unmarshal(configURL.openStream(), factory, null);
// restore listeners
- if (listeners != null)
- {
- for (ProducerConfigurationChangeListener listener : listeners)
- {
- configuration.addChangeListener(listener);
- }
- }
registrationRequirements = configuration.getRegistrationRequirements();
if (registrationRequirements != null)
{
17 years, 7 months
JBoss Portal SVN: r12025 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-02 15:16:30 -0400 (Thu, 02 Oct 2008)
New Revision: 12025
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
Log:
- JBPORTAL-2185: return empty NavigationInfo and EventingInfo instead of null as it'd cause an NPE otherwise.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-10-02 18:40:00 UTC (rev 12024)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-10-02 19:16:30 UTC (rev 12025)
@@ -30,10 +30,12 @@
import org.jboss.portal.portlet.TransportGuarantee;
import org.jboss.portal.portlet.info.CacheInfo;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
+import org.jboss.portal.portlet.info.EventInfo;
import org.jboss.portal.portlet.info.EventingInfo;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.ModeInfo;
import org.jboss.portal.portlet.info.NavigationInfo;
+import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.portlet.info.SecurityInfo;
@@ -47,6 +49,8 @@
import org.jboss.portal.wsrp.core.PortletPropertyDescriptionResponse;
import org.jboss.portal.wsrp.core.PropertyDescription;
+import javax.xml.namespace.QName;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -109,8 +113,8 @@
WSRPCapabilitiesInfo otherCapabilities = (WSRPCapabilitiesInfo)other.getCapabilities();
capabilities = new WSRPCapabilitiesInfo(new HashMap<MediaType, MediaTypeInfo>(otherCapabilities.mediaTypes),
- new HashSet<ModeInfo>(otherCapabilities.modes), new HashSet<WindowStateInfo>(otherCapabilities.windowStates),
- new HashSet<Locale>(otherCapabilities.locales));
+ new HashSet<ModeInfo>(otherCapabilities.modes), new HashSet<WindowStateInfo>(otherCapabilities.windowStates),
+ new HashSet<Locale>(otherCapabilities.locales));
WSRPMetaInfo otherMeta = (WSRPMetaInfo)other.getMeta();
metaInfo = new WSRPMetaInfo(new HashMap<String, org.jboss.portal.common.i18n.LocalizedString>(otherMeta.metaInfos));
@@ -158,7 +162,7 @@
{
String key = desc.getName();
prefInfos.put(key, new WSRPPreferenceInfo(key, getPortalLocalizedStringOrNullFrom(desc.getLabel()),
- getPortalLocalizedStringOrNullFrom(desc.getHint())));
+ getPortalLocalizedStringOrNullFrom(desc.getHint())));
}
}
else
@@ -220,12 +224,41 @@
public EventingInfo getEventing()
{
- return null; // todo: implement with WSRP 2.0
+ //todo: revisit when implementing WSRP 2
+ return new EventingInfo()
+ {
+ public Map<QName, ? extends EventInfo> getProducedEvents()
+ {
+ return Collections.emptyMap();
+ }
+
+ public Map<QName, ? extends EventInfo> getConsumedEvents()
+ {
+ return Collections.emptyMap();
+ }
+ };
}
public NavigationInfo getNavigation()
{
- return null; // todo: implement with WSRP 2.0
+ //todo: revisit when implementing WSRP 2
+ return new NavigationInfo()
+ {
+ public ParameterInfo getPublicParameter(String s)
+ {
+ return null;
+ }
+
+ public ParameterInfo getPublicParameter(QName qName)
+ {
+ return null;
+ }
+
+ public Collection<? extends ParameterInfo> getPublicParameters()
+ {
+ return Collections.emptyList();
+ }
+ };
}
public <T> T getAttachment(Class<T> tClass) throws IllegalArgumentException
@@ -352,7 +385,7 @@
if (wsrpLocalizedString != null)
{
return new org.jboss.portal.common.i18n.LocalizedString(wsrpLocalizedString.getValue(),
- WSRPUtils.getLocale(wsrpLocalizedString.getLang()));
+ WSRPUtils.getLocale(wsrpLocalizedString.getLang()));
}
return null;
@@ -495,10 +528,10 @@
return Collections.unmodifiableSet(mimeTypeInfo.modes);
}
-
+
public ModeInfo getMode(Mode mode)
{
- for (ModeInfo info: modes)
+ for (ModeInfo info : modes)
{
if (info.getMode().equals(mode))
{
@@ -526,7 +559,7 @@
public WindowStateInfo getWindowState(WindowState windowState)
{
- for (WindowStateInfo info: windowStates)
+ for (WindowStateInfo info : windowStates)
{
if (info.getWindowState().equals(windowState))
{
@@ -535,7 +568,7 @@
}
return null;
}
-
+
public Set<Locale> getAllLocales()
{
return locales;
17 years, 7 months
JBoss Portal SVN: r12024 - in branches/JBoss_Portal_Branch_2_6: core-wsrp/src/resources/portal-wsrp-admin-war and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-02 14:40:00 -0400 (Thu, 02 Oct 2008)
New Revision: 12024
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
Log:
- JBPORTAL-2103: fixed issue with duplicated ids.
- Improved display of registration properties a little bit using dataTable instead of forEach.
- Improved CSS.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-02 17:29:00 UTC (rev 12023)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-02 18:40:00 UTC (rev 12024)
@@ -28,11 +28,15 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.RegistrationInfo;
+import org.jboss.portal.wsrp.consumer.RegistrationProperty;
import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
/**
@@ -283,8 +287,27 @@
return getProducerInfo().hasLocalRegistrationInfo();
}
- public RegistrationInfo getExpectedRegistrationInfo()
+ public boolean isRegistrationPropertiesEmpty()
{
+ RegistrationInfo regInfo = getProducerInfo().getRegistrationInfo();
+ return regInfo == null || regInfo.isRegistrationPropertiesEmpty();
+ }
+
+ public boolean isExpectedRegistrationPropertiesEmpty()
+ {
+ RegistrationInfo info = getExpectedRegistrationInfo();
+ if (info != null)
+ {
+ return info.isRegistrationPropertiesEmpty();
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ private RegistrationInfo getExpectedRegistrationInfo()
+ {
if (expectedRegistrationInfo == null)
{
Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
@@ -294,6 +317,23 @@
return expectedRegistrationInfo;
}
+ public List<RegistrationProperty> getRegistrationProperties()
+ {
+ return getSortedProperties(getProducerInfo().getRegistrationInfo());
+ }
+
+ public List<RegistrationProperty> getExpectedRegistrationProperties()
+ {
+ return getSortedProperties(getExpectedRegistrationInfo());
+ }
+
+ private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
+ {
+ LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
+ Collections.sort(list);
+ return list;
+ }
+
// Actions
public String update()
@@ -360,7 +400,7 @@
}
}
- // if the registration is locally modified, bypassed the refresh as it will not yield a proper result
+ // if the registration is locally modified, bypass the refresh as it will not yield a proper result
if (!isRegistrationLocallyModified())
{
manager.refresh(consumer);
@@ -509,6 +549,7 @@
FacesContext.getCurrentInstance().renderResponse();
}
+ // todo: valueChangeListener not needed anymore when events on RegistrationProperties work
public void regPropListener(ValueChangeEvent event)
{
if (!registrationLocallyModified)
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-10-02 18:40:00 UTC (rev 12024)
@@ -82,29 +82,34 @@
<h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}">
- <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
- <tr>
- <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
- <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
- <th>#{i18n.edit_consumer_prop_value}</th>
- </tr>
- <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
- var="prop">
- <tr title="#{prop.description.label.value}">
- <td>#{prop.name}</td>
- <td>#{prop.description.label.value}</td>
- <td>
- <h:inputText id="prop-value-input" value="#{prop.value}" size="50"
- valueChangeListener="#{consumer.regPropListener}"
- disabled="#{consumer.registrationModified}"/>
- <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
- rendered="#{prop.determinedInvalid}"/>
- </td>
- </tr>
- </c:forEach>
- </table>
- <h:commandLink id="cons-update-link" action="#{consumer.update}"
+ <c:when test="#{consumer.registrationPropertiesEmpty}">
+ <h:dataTable id="existingProps"
+ value="#{consumer.registrationProperties}" var="prop"
+ rowClasses="portlet-section-body,portlet-section-alternate"
+ columnClasses="nameColumn,descColumn,"
+ headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}"
+ styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}"
+ width="100%">
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet>
+ #{prop.name}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet>
+ #{prop.description.label.value}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet>
+ <!-- todo: valueChangeListener not needed anymore when events on RegistrationProperties work -->
+ <h:inputText id="prop-value-input" value="#{prop.value}" size="50"
+ valueChangeListener="#{consumer.regPropListener}"
+ disabled="#{consumer.registrationModified}"/>
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
+ rendered="#{prop.determinedInvalid}"
+ converter="faces.convert.RegistrationProperty.Status"/>
+ </h:column>
+ </h:dataTable>
+ <h:commandLink id="cons-update-link" action="#{consumer.update}"
value="#{i18n.edit_consumer_registration_update_props}"
rendered="#{consumer.registered}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
@@ -127,26 +132,30 @@
<h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}">
- <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
- <tr>
- <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
- <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
- <th>#{i18n.edit_consumer_prop_value}</th>
- </tr>
- <c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop">
- <tr title="#{prop.description.label.value}">
- <td>#{prop.name}</td>
- <td>#{prop.description.label.value}</td>
- <td>
- <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/>
-
- <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
- rendered="#{prop.determinedInvalid}"/>
- </td>
- </tr>
- </c:forEach>
- </table>
+ <c:when test="#{consumer.expectedRegistrationPropertiesEmpty}">
+ <h:dataTable id="expectedProps"
+ value="#{consumer.expectedRegistrationProperties}" var="prop"
+ rowClasses="portlet-section-body,portlet-section-alternate"
+ columnClasses="nameColumn,descColumn,"
+ headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}"
+ styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}"
+ width="100%">
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet>
+ #{prop.name}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet>
+ #{prop.description.label.value}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet>
+ <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/>
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
+ rendered="#{prop.determinedInvalid}"
+ converter="faces.convert.RegistrationProperty.Status"/>
+ </h:column>
+ </h:dataTable>
</c:when>
<c:otherwise>
#{i18n.edit_consumer_registration_no_props}
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-10-02 17:29:00 UTC (rev 12023)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-10-02 18:40:00 UTC (rev 12024)
@@ -17,7 +17,7 @@
/* Top nav. */
.wsrp-consumers-ui ul.topnav {
- padding: 4px 0px 3px;
+ padding: 4px 0 3px;
border-bottom: 1px solid #b3c0c7;
margin: 0;
}
@@ -25,9 +25,8 @@
.wsrp-consumers-ui ul.topnav li {
list-style-type: none;
display: inline;
- margin: 0;
+ margin: 0 0 0 5px;
padding: 3px 0.5em;
- margin-left: 5px;
border: 1px solid #b3c0c7;
border-bottom: none;
background-color: #f2f4f5;
@@ -60,14 +59,10 @@
border: solid 1px #bbb;
border-left: solid 1px #eee;
border-right: solid 1px #eee;
- background-color: #d5d5d5;
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
+ background: url( img/pathBackground.png ) repeat-x left;
height: 21px;
- margin: 0px;
- padding: 0px;
- padding-left: 2px;
+ margin: 0;
+ padding: 0 0 0 2px;
}
.wsrp-consumers-ui ul.objectpath li {
@@ -105,16 +100,12 @@
color: #315896;
font-size: 11px;
padding: 3px 0 3px 3px;
- background-image: url( img/section-subHeader-bg.gif );
- background-position: left top;
- background-repeat: repeat-x;
+ background: url( img/section-subHeader-bg.gif ) repeat-x left top;
border: 1px solid #b9c6d7;
}
.wsrp-consumers-ui .portlet-section-header {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
+ background: url( img/pathBackground.png ) repeat-x left;
font-weight: bold;
color: #656565;
font-size: 10px;
@@ -124,9 +115,7 @@
}
.wsrp-consumers-ui .portlet-section-header th {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
+ background: url( img/pathBackground.png ) repeat-x left;
font-weight: bold;
color: #656565;
font-size: 10px;
@@ -136,71 +125,51 @@
}
.wsrp-consumers-ui .actionConfigure {
- background-image: url( img/actionIcon_Configure.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/settings.gif ) no-repeat left;
+ line-height: 18px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRefresh {
- background-image: url( img/actionIcon_Refresh.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/refresh.gif ) no-repeat left;
+ line-height: 18px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRegister {
- background-image: url( img/actionIcon_Register.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ padding: 5px 5px 5px 24px;
+ background: url( img/jbp-icon-set/register.gif ) no-repeat left;
+ line-height: 18px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeregister {
- background-image: url( img/actionIcon_Deregister.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ padding: 5px 5px 5px 24px;
+ background: url( img/jbp-icon-set/deregister.gif ) no-repeat left;
+ line-height: 18px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDelete {
- background-image: url( img/actionIcon_Delete.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/delete2.gif ) no-repeat left;
line-height: 18px;
- padding-left: 18px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionActivate {
- background-image: url( img/actionIcon_Activate.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding: 5px 5px 5px 23px;
+ background: url( img/jbp-icon-set/activate.gif ) no-repeat left;
line-height: 18px;
- padding-left: 18px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeactivate {
- background-image: url( img/actionIcon_Deactivate.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/deactivate.gif ) no-repeat left;
line-height: 18px;
- padding-left: 18px;
white-space: nowrap;
}
@@ -286,25 +255,34 @@
}
.wsrp-consumers-ui .registration-prop-table.active th {
- background-color: #C7DDB7;
+ background: #C7DDB7 none;
}
-.wsrp-consumers-ui .registration-prop-table.inactive {
+.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate
+{
+ background: #dcf0d0;
+}
+
+.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive {
border: 1px solid #EBD1B8;
}
.wsrp-consumers-ui .registration-prop-table.inactive th {
- background-color: #EBD1B8;
+ background: #EBD1B8 none;
}
-.wsrp-consumers-ui .registration-prop-table th.nameColumn {
- width: 25%;
+.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate {
+ background: #f0f0dd;
}
-.wsrp-consumers-ui .registration-prop-table th.descColumn {
- width: 25%;
+.wsrp-consumers-ui .registration-prop-table .nameColumn {
+ width: 20%;
}
+.wsrp-consumers-ui .registration-prop-table .descColumn {
+ width: 20%;
+}
+
.wsrp-consumers-ui .portlet-section-buttonrow {
margin-top: 6px;
margin-bottom: 6px;
@@ -339,8 +317,7 @@
color: #fff;
font-size: 11px;
background-color: #5986b3;
- padding: 2px;
- padding-left: 4px;
+ padding: 2px 2px 2px 4px;
margin: 0;
display: block;
}
@@ -371,4 +348,4 @@
.wsrp-consumers-ui .wsrp-content-container {
margin: 0 auto 0 auto;
width: 98%;
-}
+}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-10-02 17:29:00 UTC (rev 12023)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-10-02 18:40:00 UTC (rev 12024)
@@ -231,9 +231,14 @@
public boolean hasLocalInfo()
{
- return persistentRegistrationHandle != null || (persistentRegistrationProperties != null && !persistentRegistrationProperties.isEmpty());
+ return persistentRegistrationHandle != null || isRegistrationPropertiesEmpty();
}
+ public boolean isRegistrationPropertiesEmpty()
+ {
+ return persistentRegistrationProperties != null && !persistentRegistrationProperties.isEmpty();
+ }
+
public RegistrationData getRegistrationData()
{
registrationData = WSRPTypeFactory.createDefaultRegistrationData();
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-10-02 17:29:00 UTC (rev 12023)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-10-02 18:40:00 UTC (rev 12024)
@@ -31,7 +31,7 @@
* @version $Revision$
* @since 2.6
*/
-public class RegistrationProperty
+public class RegistrationProperty implements Comparable<RegistrationProperty>
{
private Long persistentId;
private RegistrationPropertyDescription persistentDescription;
@@ -60,6 +60,11 @@
setValue(stringValue);
}
+ public int compareTo(RegistrationProperty o)
+ {
+ return persistentName.compareTo(o.persistentName);
+ }
+
@Override
public boolean equals(Object o)
{
17 years, 7 months
JBoss Portal SVN: r12023 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-10-02 13:29:00 -0400 (Thu, 02 Oct 2008)
New Revision: 12023
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml
Log:
prepending some forms under jsf/common with common to avoid duplicate id
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -14,7 +14,7 @@
</tr>
<tr>
<td valign="top" class="portlet-section-body">
-<h:form id="edit-page-error-form">
+<h:form id="common-edit-page-error-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -16,7 +16,7 @@
<tr>
<td valign="top" class="portlet-section-body">
-<h:form id="edit-portal-error-form">
+<h:form id="common-edit-portal-error-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -7,7 +7,7 @@
<c:choose>
<c:when test="#{not empty prefs.entries}">
- <h:form id="edit-pref-form">
+ <h:form id="common-edit-pref-form">
<table class="full-width datatable">
<thead class="portlet-section-header" style="text-align:left;">
<tr>
@@ -55,7 +55,7 @@
</c:choose>
<c:if test="#{prefs.selectedEntry != null}">
- <h:form id="edit-exisiting-form" style="padding: 1em 0 1em 0">
+ <h:form id="common-edit-exisiting-form" style="padding: 1em 0 1em 0">
<fieldset style="border: 1px solid;">
<legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend>
<table>
@@ -89,7 +89,7 @@
</fieldset>
</h:form>
- <h:form id="append-form">
+ <h:form id="common-append-form">
<fieldset style="border: 1px solid;">
<legend>#{bundle.COMMON_APPEND_VALUE}</legend>
<h:outputLabel for="new_value">
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -20,7 +20,7 @@
<tr>
<td class="dotted-blue-vert-rt">
- <h:form id="edit-prop-form">
+ <h:form id="common-edit-prop-form">
<!-- defines layout of property form -->
<table>
<tbody>
@@ -79,7 +79,7 @@
<tr>
<td class="portlet-section-body" valign="top">
- <h:form id="manage-prop-form">
+ <h:form id="common-manage-prop-form">
<!-- defines layout of property table -->
<h:dataTable id="prop-data-table" value="#{properties.entries}" width="100%" headerClass="portlet-section-header"
styleClass="datatable full-width"
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
- <h:form id="edit-security-form">
+ <h:form id="common-edit-security-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -1,7 +1,7 @@
<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">
- <h:form id="edit-theme-form">
+ <h:form id="common-edit-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <h:form id="edit-window-theme-form">
+ <h:form id="common-edit-window-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-10-02 17:29:00 UTC (rev 12023)
@@ -7,7 +7,7 @@
xmlns:portal="http://www.jboss.org/portal">
<div class="details-container">
-<h:form id="show-portlet-detail-form">
+<h:form id="common-show-portlet-detail-form">
<div class="full-width details-header">
<div class="main-header">
<br/>
17 years, 7 months
JBoss Portal SVN: r12022 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-10-02 13:25:11 -0400 (Thu, 02 Oct 2008)
New Revision: 12022
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml
Log:
prepending some forms under jsf/common with common to avoid duplicate id
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -17,7 +17,7 @@
<td valign="top" class="portlet-section-body">
-<h:form id="edit-page-error-form">
+<h:form id="common-edit-page-error-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -18,7 +18,7 @@
<tr>
<td valign="top" class="portlet-section-body">
-<h:form id="edit-portal-error-form">
+<h:form id="common-edit-portal-error-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -8,7 +8,7 @@
<f:loadBundle basename="Resource" var="bundle" />
<c:choose>
<c:when test="#{not empty prefs.entries}">
- <h:form id="edit-pref-form">
+ <h:form id="common-edit-pref-form">
<table class="full-width datatable">
<thead class="portlet-section-header" style="text-align:left;">
<tr>
@@ -56,7 +56,7 @@
</c:choose>
<c:if test="#{prefs.selectedEntry != null}">
- <h:form id="edit-exisiting-form" style="padding: 1em 0 1em 0">
+ <h:form id="common-edit-exisiting-form" style="padding: 1em 0 1em 0">
<fieldset style="border: 1px solid;">
<legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend>
<table>
@@ -90,7 +90,7 @@
</fieldset>
</h:form>
- <h:form id="append-form">
+ <h:form id="common-append-form">
<fieldset style="border: 1px solid;">
<legend>#{bundle.COMMON_APPEND_VALUE}</legend>
<h:outputLabel for="new_value">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -22,7 +22,7 @@
<tr>
<td class="dotted-blue-vert-rt">
- <h:form id="edit-prop-form">
+ <h:form id="common-edit-prop-form">
<!-- defines layout of property form -->
<table>
<tbody>
@@ -81,7 +81,7 @@
<tr>
<td class="portlet-section-body" valign="top">
- <h:form id="manage-prop-form">
+ <h:form id="common-manage-prop-form">
<!-- defines layout of property table -->
<h:dataTable id="prop-data-table" value="#{properties.entries}" width="100%" headerClass="portlet-section-header"
styleClass="datatable full-width"
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form id="edit-security-form">
+ <h:form id="common-edit-security-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -2,7 +2,7 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form id="edit-theme-form">
+ <h:form id="common-edit-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form id="edit-window-theme-form">
+ <h:form id="common-edit-window-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2008-10-02 14:21:19 UTC (rev 12021)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2008-10-02 17:25:11 UTC (rev 12022)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form id="show-portlet-detail-form">
+ <h:form id="common-show-portlet-detail-form">
<p class="portlet-area-header">#{bundle.COMMON_PORTLET_INSTANCE_INFORMATION}</p>
<h:panelGrid id="detail-panel" columns="3" styleClass="panelGrid-basic">
<f:subview id="field1">
17 years, 7 months