July 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r11349 - in branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal: wsrp and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-08 11:04:56 -0400 (Tue, 08 Jul 2008) New Revision: 11349 Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/interop/LiferayServiceDescriptionBehavior.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java Log: - Make sure we handle null lang attribute properly. Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/interop/LiferayServiceDescriptionBehavior.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/interop/LiferayServiceDescriptionBehavior.java 2008-07-08 12:01:24 UTC (rev 11348) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/interop/LiferayServiceDescriptionBehavior.java 2008-07-08 15:04:56 UTC (rev 11349) @@ -26,8 +26,6 @@ import org.jboss.portal.wsrp.core.LocalizedString; import org.jboss.portal.wsrp.core.PortletDescription; -import java.util.Set; - /** * Liferay behavior as exhibited at http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4162201#4162201 * @@ -67,6 +65,12 @@ locString.setLang(lang); locString.setValue("Software Catalog"); - serviceDescription.setOfferedPortlets(new PortletDescription[]{pd}); - } + // add another value that checks that we handle null lang properly + PortletDescription pd2 = createPortletDescription("99", null); + pd.getMarkupTypes()[0].getLocales()[0] = "en_US"; + locString = pd.getShortTitle(); + locString.setLang(null); + + serviceDescription.setOfferedPortlets(new PortletDescription[]{pd, pd2}); + } } \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java 2008-07-08 12:01:24 UTC (rev 11348) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java 2008-07-08 15:04:56 UTC (rev 11349) @@ -426,31 +426,38 @@ public static Locale getLocale(String lang) throws IllegalArgumentException { - String possiblyRelaxed = lang; - if (!WSRPUtils.strict) + if (lang != null) { - // treat en_US as valid by en_US => en-US - // todo: maybe this should be handled by an interceptor... - possiblyRelaxed = lang.replace('_', '-'); - } + String possiblyRelaxed = lang; + if (!WSRPUtils.strict) + { + // treat en_US as valid by en_US => en-US + // todo: maybe this should be handled by an interceptor... + possiblyRelaxed = lang.replace('_', '-'); + } - try - { - return LocaleFormat.RFC3066_LANGUAGE_TAG.getLocale(possiblyRelaxed); - } - catch (ConversionException e) - { - if (WSRPUtils.strict) + try { - throw new IllegalArgumentException(e); + return LocaleFormat.RFC3066_LANGUAGE_TAG.getLocale(possiblyRelaxed); } - else + catch (ConversionException e) { - log.debug("Was given an invalid language: '" + possiblyRelaxed - + "'. Since we're using relaxed validation, we will assume " + Locale.ENGLISH + " to avoid crashing!", e); - return Locale.ENGLISH; + if (WSRPUtils.strict) + { + throw new IllegalArgumentException(e); + } + else + { + log.debug("Was given an invalid language: '" + possiblyRelaxed + + "'. Since we're using relaxed validation, we will assume " + Locale.ENGLISH + " to avoid crashing!", e); + return Locale.ENGLISH; + } } } + else + { + return Locale.getDefault(); + } } public static String toString(Locale locale) throws IllegalArgumentException

16 years

1
0
0 / 0

JBoss Portal SVN: r11348 - in branches/JBoss_Portal_Branch_2_7/core/src: main/org/jboss/portal/core/controller/portlet and 8 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-07-08 08:01:24 -0400 (Tue, 08 Jul 2008) New Revision: 11348 Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationEventWiringMetaData.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationParameterBindingMetaData.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowMetaData.java Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 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/ObjectDeploymentFactory.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/CoordinationService.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ImplicitStrategy.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 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/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd Log: Syncing explicit coordination stuff. For now no configuration test cases and not plugged in ControllerPageNavigationalState. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -36,9 +36,12 @@ import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator; +import org.jboss.portal.core.model.portal.coordination.CoordinationManager; import org.jboss.portal.core.model.portal.content.ContentRendererRegistry; import org.jboss.portal.core.model.portal.control.page.PageControlPolicy; import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry; +import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; import org.jboss.portal.server.RequestController; @@ -52,6 +55,7 @@ /** * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public class Controller extends AbstractJBossService implements RequestController @@ -93,6 +97,13 @@ /** . */ protected InternalContentProviderRegistry contentProviderRegistry; + /** . */ + protected CoordinationConfigurator coordinationConfigurator; + + /** . */ + protected CoordinationManager coordinationManager; + + public InternalContentProviderRegistry getContentProviderRegistry() { return contentProviderRegistry; @@ -213,6 +224,26 @@ this.pageControlPolicy = pageControlPolicy; } + public CoordinationConfigurator getCoordinationConfigurator() + { + return coordinationConfigurator; + } + + public void setCoordinationConfigurator(CoordinationConfigurator coordinationConfigurator) + { + this.coordinationConfigurator = coordinationConfigurator; + } + + public CoordinationManager getCoordinationManager() + { + return coordinationManager; + } + + public void setCoordinationManager(CoordinationManager coordinationManager) + { + this.coordinationManager = coordinationManager; + } + public final void handle(ServerInvocation invocation) throws ServerException { // Create controller context Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -59,6 +59,7 @@ /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision: 630 $ */ public class ControllerPortletControllerContext implements PortletControllerContext @@ -236,4 +237,9 @@ // return instance.invoke(actionInvocation); } + + public ControllerContext getControllerContext() + { + return controllerContext; + } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -23,12 +23,16 @@ package org.jboss.portal.core.controller.portlet; import java.util.LinkedList; +import java.util.Map; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.EventPhaseContext; import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService; +import org.jboss.portal.core.model.portal.coordination.CoordinationManager; +import org.jboss.portal.core.model.portal.Window; import org.apache.log4j.Logger; /** @@ -60,18 +64,16 @@ { try { - for (String windowName : portletControllerContext.getWindowNames()) + CoordinationManager coordinationManager = + portletControllerContext.getControllerContext().getController().getCoordinationManager(); + + Map<Window, PortletWindowEvent> windows = coordinationManager.getEventWindows(producedEvent, portletControllerContext); + + for (PortletWindowEvent event : windows.values()) { - PortletInfo info = portletControllerContext.getPortletInfo(windowName); + context.queueEvent(event); + } - // - if (info.getEventing().getConsumedEvents().containsKey(producedEvent.getName())) - { - PortletWindowEvent distributedEvent = new PortletWindowEvent(producedEvent.getName(), producedEvent.getPayload(), windowName); - context.queueEvent(distributedEvent); - } - } - // Portal events unused at the moment if (PORTAL_NAMESPACE.equals(producedEvent.getName().getNamespaceURI())) { 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-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -34,6 +34,7 @@ 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.model.portal.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; @@ -52,6 +53,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public class ObjectDeployment extends Deployment @@ -206,6 +208,11 @@ { return pwa; } + + public CoordinationConfigurator getCoordinationConfigurator() + { + return factory.getCoordinationConfigurator(); + } }; // Create all objects Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -26,6 +26,7 @@ import org.jboss.portal.common.transaction.TransactionManagerProvider; import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator; import org.jboss.portal.server.deployment.PortalWebApp; import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory; import org.jboss.portal.server.deployment.jboss.Deployment; @@ -39,6 +40,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public class ObjectDeploymentFactory extends AbstractDeploymentFactory @@ -58,6 +60,9 @@ /** . */ protected EntityResolver portalObjectEntityResolver; + /** . */ + protected CoordinationConfigurator coordinationConfigurator; + public boolean acceptFile(URL url) { String urlAsFile = url.getFile(); @@ -107,4 +112,14 @@ { this.contentProviderRegistry = contentProviderRegistry; } + + public CoordinationConfigurator getCoordinationConfigurator() + { + return coordinationConfigurator; + } + + public void setCoordinationConfigurator(CoordinationConfigurator coordinationConfigurator) + { + this.coordinationConfigurator = coordinationConfigurator; + } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/CoordinationService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/CoordinationService.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/CoordinationService.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -101,13 +101,13 @@ protected EventConverter eventConverter = new SimpleEventConverter(); - protected PortalObjectContainer container; + protected PortalObjectContainer portalObjectContainer; protected void startService() throws Exception { super.startService(); - if (container == null) + if (portalObjectContainer == null) { throw new IllegalStateException("Cannot instantiate CoordinationManager: no PortalObjectContainer present"); } @@ -763,14 +763,14 @@ // SETTERS & GETTERS - public PortalObjectContainer getContainer() + public PortalObjectContainer getPortalObjectContainer() { - return container; + return portalObjectContainer; } - public void setContainer(PortalObjectContainer container) + public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer) { - this.container = container; + this.portalObjectContainer = portalObjectContainer; } public EventConverter getEventConverter() @@ -821,43 +821,10 @@ { String value = pageContainer.getDeclaredProperty(prefix); - return decodeStrategy(value); + return ImplicitStrategy.decodeStrategy(value); } - private ImplicitStrategy decodeStrategy(String value) - { - if (value == null) - { - return null; - } - else if (value.equals(STRATEGY_DISABLED)) - { - return ImplicitStrategy.DISABLED; - } - else if (value.equals(STRATEGY_EXCLUSIVE)) - { - return ImplicitStrategy.EXCLUSIVE; - } - else if (value.equals(STRATEGY_FALLBACK)) - { - return ImplicitStrategy.FALLBACK; - } - else if (value.equals(STRATEGY_RECURSIVE_DISABLED)) - { - return ImplicitStrategy.RECURSIVE_DISABLED; - } - else if (value.equals(STRATEGY_RECURSIVE_EXCLUSIVE)) - { - return ImplicitStrategy.RECURSIVE_EXCLUSIVE; - } - else if (value.equals(STRATEGY_RECURSIVE_FALLBACK)) - { - return ImplicitStrategy.RECURSIVE_FALLBACK; - } - // Strategy unknown - return null; - } private ImplicitStrategy resolveStrategy(PageContainer pageContainer, String prefix) { @@ -874,7 +841,7 @@ } else { - strategy = decodeStrategy(value); + strategy = ImplicitStrategy.decodeStrategy(value); } if (strategy != null) @@ -909,7 +876,7 @@ if (value != null) { - strategy = decodeStrategy(value); + strategy = ImplicitStrategy.decodeStrategy(value); } if (strategy != null && Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ImplicitStrategy.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ImplicitStrategy.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ImplicitStrategy.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -47,4 +47,39 @@ // All children nodes in the tree will inherit DISABLED strategy RECURSIVE_DISABLED; + public static ImplicitStrategy decodeStrategy(String value) + { + if (value == null) + { + return null; + } + else if (value.equals(DISABLED.name())) + { + return ImplicitStrategy.DISABLED; + } + else if (value.equals(EXCLUSIVE.name())) + { + return ImplicitStrategy.EXCLUSIVE; + } + else if (value.equals(FALLBACK.name())) + { + return ImplicitStrategy.FALLBACK; + } + else if (value.equals(RECURSIVE_DISABLED.name())) + { + return ImplicitStrategy.RECURSIVE_DISABLED; + } + else if (value.equals(RECURSIVE_EXCLUSIVE.name())) + { + return ImplicitStrategy.RECURSIVE_EXCLUSIVE; + } + else if (value.equals(RECURSIVE_FALLBACK.name())) + { + return ImplicitStrategy.RECURSIVE_FALLBACK; + } + + // Strategy unknown + return null; + } + } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -25,12 +25,14 @@ import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator; import org.jboss.portal.server.deployment.PortalWebApp; /** * Defines the callbacks for creating a portal object. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public interface BuildContext @@ -40,4 +42,6 @@ ContentHandler getContentHandler(ContentType contentType); PortalWebApp getPortalWebApp(); + + CoordinationConfigurator getCoordinationConfigurator(); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -28,6 +28,7 @@ import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.core.model.portal.PageContainer; import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.metadata.coordination.CoordinationMetaData; import org.w3c.dom.Element; import java.util.ArrayList; @@ -38,12 +39,16 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thoams Heute</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public class PageMetaData extends PortalObjectMetaData { private static final Logger logger = Logger.getLogger(PageMetaData.class); + + private CoordinationMetaData coordinationMetaData; + public PageMetaData() { } @@ -102,10 +107,26 @@ } } + Element coordinationElt = XMLTools.getUniqueChild(pageElt, "coordination", false); + if (coordinationElt != null) + { + pageMD.setCoordinationMetaData(CoordinationMetaData.buildMetaData(coordinationElt)); + } + // return pageMD; } + private void setCoordinationMetaData(CoordinationMetaData coordinationMetaData) + { + this.coordinationMetaData = coordinationMetaData; + } + + public CoordinationMetaData getCoordinationMetaData() + { + return coordinationMetaData; + } + private static boolean checkConstraints(PageMetaData pageMD) { // Check that no more than 1 window has been defined as maximized Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -29,6 +29,7 @@ import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalContainer; import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.metadata.coordination.CoordinationMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData; @@ -39,12 +40,14 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public class PortalMetaData extends PortalObjectMetaData { private SupportsMetaData supportsMetaData; + private CoordinationMetaData coordinationMetaData; public PortalMetaData() { @@ -172,10 +175,26 @@ portalMD.getChildren().put(pageMD.getName(), pageMD); } + Element coordinationElt = XMLTools.getUniqueChild(portalElt, "coordination", false); + if (coordinationElt != null) + { + portalMD.setCoordinationMetaData(CoordinationMetaData.buildMetaData(coordinationElt)); + } + // return portalMD; } + private void setCoordinationMetaData(CoordinationMetaData coordinationMetaData) + { + this.coordinationMetaData = coordinationMetaData; + } + + public CoordinationMetaData getCoordinationMetaData() + { + return coordinationMetaData; + } + public static void buildSupportedModes(PortalMetaData portalMD, Element supportedModesElt) { List modeElts = XMLTools.getChildren(supportedModesElt, "mode"); 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-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -42,6 +42,8 @@ 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; import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; @@ -51,6 +53,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ */ public abstract class PortalObjectMetaData @@ -156,6 +159,22 @@ portalObjectMD.create(buildContext, object); } + // Coordination - must be applied after children (windows) were created + CoordinationMetaData coordinationMD = null; + if (this instanceof PortalMetaData) + { + coordinationMD = ((PortalMetaData)this).getCoordinationMetaData(); + } + else if (this instanceof PageMetaData) + { + coordinationMD = ((PageMetaData)this).getCoordinationMetaData(); + } + + if (coordinationMD != null) + { + coordinationMD.configure(buildContext, object); + } + // return object; } Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationEventWiringMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationEventWiringMetaData.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationEventWiringMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -0,0 +1,123 @@ +/* +* 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.core.model.portal.metadata.coordination; + +import org.w3c.dom.Element; +import org.jboss.portal.common.xml.XMLTools; + +import java.util.List; +import java.util.LinkedList; +import java.util.Iterator; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ + +public class CoordinationEventWiringMetaData +{ + + private String name; + + private List<CoordinationWindowMetaData> sources = new LinkedList<CoordinationWindowMetaData>(); + + private List<CoordinationWindowMetaData> destinations = new LinkedList<CoordinationWindowMetaData>(); + + public CoordinationEventWiringMetaData(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public List<CoordinationWindowMetaData> getSources() + { + return sources; + } + + public void setSources(List<CoordinationWindowMetaData> sources) + { + this.sources = sources; + } + + public void addSource(CoordinationWindowMetaData window) + { + this.sources.add(window); + } + + public List<CoordinationWindowMetaData> getDestinations() + { + return destinations; + } + + public void setDestinations(List<CoordinationWindowMetaData> destinations) + { + this.destinations = destinations; + } + + public void addDestination(CoordinationWindowMetaData window) + { + this.destinations.add(window); + } + + public static CoordinationEventWiringMetaData buildMetaData(Element wiringElement) + { + Element nameElt = XMLTools.getUniqueChild(wiringElement, "name", true); + + CoordinationEventWiringMetaData wiringMD = new CoordinationEventWiringMetaData(XMLTools.asString(nameElt)); + + Element sourcesElt = XMLTools.getUniqueChild(wiringElement, "sources", true); + + Iterator windowIter = XMLTools.getChildrenIterator(sourcesElt, "window-coordination"); + + while (windowIter.hasNext()) + { + Element element = (Element)windowIter.next(); + + wiringMD.addSource(CoordinationWindowMetaData.buildMetaData(element)); + } + + Element destinationsElt = XMLTools.getUniqueChild(wiringElement, "destinations", true); + + windowIter = XMLTools.getChildrenIterator(destinationsElt, "window-coordination"); + + while (windowIter.hasNext()) + { + Element element = (Element)windowIter.next(); + + wiringMD.addDestination(CoordinationWindowMetaData.buildMetaData(element)); + } + + return wiringMD; + + + } +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -0,0 +1,261 @@ +/* +* 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.core.model.portal.metadata.coordination; + +import org.jboss.portal.core.model.portal.coordination.ImplicitStrategy; +import org.jboss.portal.core.model.portal.coordination.IllegalCoordinationException; +import org.jboss.portal.core.model.portal.metadata.BuildContext; +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PageContainer; +import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService; +import org.jboss.portal.common.xml.XMLTools; +import org.w3c.dom.Element; + +import javax.xml.namespace.QName; +import java.util.List; +import java.util.LinkedList; +import java.util.Iterator; +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CoordinationMetaData +{ + + private ImplicitStrategy eventStrategy; + + private ImplicitStrategy parameterStrategy; + + List<CoordinationParameterBindingMetaData> parameterBindings = new LinkedList<CoordinationParameterBindingMetaData>(); + + List<CoordinationEventWiringMetaData> wirings = new LinkedList<CoordinationEventWiringMetaData>(); + + List<String> parameterAliases = new LinkedList<String>(); + + public static CoordinationMetaData buildMetaData(Element coordinationElt) + { + + CoordinationMetaData coordinationMetaData = new CoordinationMetaData(); + + Element eventStrategy = XMLTools.getUniqueChild(coordinationElt, "implicit-event-strategy", false); + + if (eventStrategy != null) + { + coordinationMetaData.setEventStrategy(ImplicitStrategy.decodeStrategy(XMLTools.asString(eventStrategy))); + } + + + Element parameterStrategy = XMLTools.getUniqueChild(coordinationElt, "implicit-parameter-strategy", false); + + if (parameterStrategy != null) + { + coordinationMetaData.setParameterStrategy(ImplicitStrategy.decodeStrategy(XMLTools.asString(parameterStrategy))); + } + + Element wiringsElement = XMLTools.getUniqueChild(coordinationElt, "wirings", false); + + if (wiringsElement != null) + { + coordinationMetaData.setWirings(buildWiringsMetaData(wiringsElement)); + } + + Element bindingsElement = XMLTools.getUniqueChild(coordinationElt, "bindings", false); + + if (bindingsElement != null) + { + // Aliases + Iterator aliasesIter = XMLTools.getChildrenIterator(bindingsElement, "parameter-alias"); + + while (aliasesIter.hasNext()) + { + Element alias = (Element)aliasesIter.next(); + + coordinationMetaData.addAlias(XMLTools.asString(alias)); + } + + // Param bindings + + Iterator paramBindingsIter = XMLTools.getChildrenIterator(bindingsElement, "parameter-binding"); + while (paramBindingsIter.hasNext()) + { + Element bindingElement = (Element)paramBindingsIter.next(); + coordinationMetaData.addParameterBinding(CoordinationParameterBindingMetaData.buildMetaData(bindingElement)); + } + + } + + + return coordinationMetaData; + } + + private static List<CoordinationEventWiringMetaData> buildWiringsMetaData(Element wiringsElement) + { + List<CoordinationEventWiringMetaData> w = new LinkedList<CoordinationEventWiringMetaData>(); + + Iterator wiringsIter = XMLTools.getChildrenIterator(wiringsElement, "event-wiring"); + + while (wiringsIter.hasNext()) + { + Element element = (Element)wiringsIter.next(); + + w.add(CoordinationEventWiringMetaData.buildMetaData(element)); + } + + return w; + } + + public void configure(BuildContext buildContext, PortalObject object) throws IllegalCoordinationException + { + if (getEventStrategy() != null) + { + buildContext.getCoordinationConfigurator().setImplicitEventWiringStrategy((PageContainer)object, getEventStrategy()); + } + + if (getParameterStrategy() != null) + { + buildContext.getCoordinationConfigurator().setImplicitParameterBindingStrategy((PageContainer)object, getEventStrategy()); + } + + if (object instanceof Page) + { + Page page = (Page)object; + + for (String parameterAlias : parameterAliases) + { + buildContext.getCoordinationConfigurator().setParameterAlias(page, parameterAlias); + } + + for (CoordinationParameterBindingMetaData parameterBinding : parameterBindings) + { + Map<Window, QName> bindings = new HashMap<Window, QName>(); + + populateWindows(bindings, parameterBinding.getWindows(), page); + + buildContext.getCoordinationConfigurator().setParameterBinding(parameterBinding.getName(), bindings); + } + + for (CoordinationEventWiringMetaData wiring : wirings) + { + Map<Window, QName> sources = new HashMap<Window,QName>(); + Map<Window, QName> destinations = new HashMap<Window,QName>(); + + populateWindows(sources, wiring.getSources(), page); + populateWindows(destinations, wiring.getDestinations(), page); + + buildContext.getCoordinationConfigurator().setEventWiring(sources, destinations, wiring.getName()); + + } + + } + + } + + private static void populateWindows(Map<Window, QName> map, List<CoordinationWindowMetaData> windows, Page page) throws IllegalCoordinationException + { + for (CoordinationWindowMetaData windowMD : windows) + { + QName name = QName.valueOf(windowMD.getQname()); + Window window = page.getWindow(windowMD.getWindowName()); + + if (window == null) + { + throw new IllegalCoordinationException("Cannot obtain window: \"" + windowMD.getWindowName() + "\" on page: " + + page.getName()); + } + + map.put(window, name); + } + } + + public ImplicitStrategy getEventStrategy() + { + return eventStrategy; + } + + public void setEventStrategy(ImplicitStrategy eventStrategy) + { + this.eventStrategy = eventStrategy; + } + + public ImplicitStrategy getParameterStrategy() + { + return parameterStrategy; + } + + public void setParameterStrategy(ImplicitStrategy parameterStrategy) + { + this.parameterStrategy = parameterStrategy; + } + + public List<CoordinationEventWiringMetaData> getWirings() + { + return wirings; + } + + public void setWirings(List<CoordinationEventWiringMetaData> wirings) + { + this.wirings = wirings; + } + + public void addWirings(CoordinationEventWiringMetaData wiring) + { + this.wirings.add(wiring); + } + + public List<CoordinationParameterBindingMetaData> getParameterBindings() + { + return parameterBindings; + } + + public void setParameterBindings(List<CoordinationParameterBindingMetaData> parameterBindings) + { + this.parameterBindings = parameterBindings; + } + + public void addParameterBinding(CoordinationParameterBindingMetaData binding) + { + this.parameterBindings.add(binding); + } + + public List<String> getParameterAliases() + { + return parameterAliases; + } + + public void setParameterAliases(List<String> parameterAliases) + { + this.parameterAliases = parameterAliases; + } + + public void addAlias(String alias) + { + this.parameterAliases.add(alias); + } + + +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationParameterBindingMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationParameterBindingMetaData.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationParameterBindingMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -0,0 +1,88 @@ +/* +* 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.core.model.portal.metadata.coordination; + +import org.w3c.dom.Element; +import org.jboss.portal.common.xml.XMLTools; + +import java.util.List; +import java.util.LinkedList; +import java.util.Iterator; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CoordinationParameterBindingMetaData +{ + private String name; + + List<CoordinationWindowMetaData> windows = new LinkedList<CoordinationWindowMetaData>(); + + public CoordinationParameterBindingMetaData(String name) + { + this.name = name; + } + + public List<CoordinationWindowMetaData> getWindows() + { + return windows; + } + + public void setWindows(List<CoordinationWindowMetaData> windows) + { + this.windows = windows; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public void addWindow(CoordinationWindowMetaData window) + { + windows.add(window); + } + + public static CoordinationParameterBindingMetaData buildMetaData(Element bindingElement) + { + Element nameElt = XMLTools.getUniqueChild(bindingElement, "name", true); + CoordinationParameterBindingMetaData paramMetaData = new CoordinationParameterBindingMetaData(XMLTools.asString(nameElt)); + + Iterator windowIter = XMLTools.getChildrenIterator(bindingElement, "window-coordination"); + + while (windowIter.hasNext()) + { + Element element = (Element)windowIter.next(); + + paramMetaData.addWindow(CoordinationWindowMetaData.buildMetaData(element)); + } + + return paramMetaData; + } +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowMetaData.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowMetaData.java 2008-07-08 12:01:24 UTC (rev 11348) @@ -0,0 +1,74 @@ +/* +* 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.core.model.portal.metadata.coordination; + + +import org.jboss.portal.common.xml.XMLTools; +import org.w3c.dom.Element; + + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CoordinationWindowMetaData +{ + + private String windowName; + + private String qname; + + public CoordinationWindowMetaData(String windowName, String qname) + { + this.windowName = windowName; + this.qname = qname; + } + + public String getWindowName() + { + return windowName; + } + + public void setWindowName(String windowName) + { + this.windowName = windowName; + } + + public String getQname() + { + return qname; + } + + public void setQname(String qname) + { + this.qname = qname; + } + + public static CoordinationWindowMetaData buildMetaData(Element element) + { + Element name = XMLTools.getUniqueChild(element, "window-name", true); + Element qname = XMLTools.getUniqueChild(element, "qname", true); + + return new CoordinationWindowMetaData(XMLTools.asString(name), XMLTools.asString(qname)); + } +} \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-08 12:01:24 UTC (rev 11348) @@ -680,6 +680,17 @@ <attribute name="CacheNaturalId">true</attribute> </mbean> +  + + <mbean code="org.jboss.portal.core.impl.model.portal.coordination.CoordinationService" + name="portal:service=CoordinationService" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute"> + portal:container=PortalObject + </depends> + </mbean> +  <mbean code="org.jboss.portal.core.impl.model.CustomizationManagerService" name="portal:service=CustomizationManager" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> @@ -1010,6 +1021,13 @@ <depends optional-attribute-name="ContentProviderRegistry" proxy-type="attribute"> portal:service=ContentProviderRegistry </depends> + <depends optional-attribute-name="CoordinationManager" proxy-type="attribute"> + portal:service=CoordinationService + </depends> + <depends optional-attribute-name="CoordinationConfigurator" proxy-type="attribute"> + portal:service=CoordinationService + </depends> + </mbean>  @@ -1066,6 +1084,9 @@ </depends> <depends optional-attribute-name="PortalObjectEntityResolver" proxy-type="attribute">portal:service=EntityResolver </depends> + <depends optional-attribute-name="CoordinationConfigurator" proxy-type="attribute"> + portal:service=CoordinationService + </depends> <attribute name="SetupLocation">conf/data/default-object.xml</attribute>  <attribute name="RegistrationControlledByService">@portal.single@</attribute> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-07-08 12:01:24 UTC (rev 11348) @@ -134,6 +134,10 @@ <unchecked/> </policy-permission> </security-constraint> + <coordination> + <implicit-event-strategy>FALLBACK</implicit-event-strategy> + <implicit-parameter-strategy>FALLBACK</implicit-parameter-strategy> + </coordination> <page> <page-name>default</page-name> <display-name xml:lang="en">Home</display-name> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2008-07-08 11:51:16 UTC (rev 11347) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2008-07-08 12:01:24 UTC (rev 11348) @@ -110,7 +110,7 @@ --> <!ELEMENT portal (portal-name,supported-modes,supported-window-states?,properties?, listener?,security-constraint?,page*, - (display-name* | (resource-bundle, supported-locale+)))> + (display-name* | (resource-bundle, supported-locale+)), coordination?)>  <!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*, - (display-name* | (resource-bundle, supported-locale+)))> + (display-name* | (resource-bundle, supported-locale+)), coordination?)> <!ELEMENT display-name (#PCDATA)> <!ATTLIST display-name @@ -328,3 +328,80 @@ * view - Users can view the page. --> <!ELEMENT role-name (#PCDATA)> + + +<!ELEMENT coordination (implicit-event-strategy?, implicit-parameter-strategy?, wirings?, bindings?)> + + +<!ELEMENT implicit-event-strategy (#PCDATA)> + + +<!ELEMENT implicit-parameter-strategy (#PCDATA)> + + +<!ELEMENT wirings (event-wiring*)> + + +<!ELEMENT bindings (parameter-alias*, parameter-binding*)> + + +<!ELEMENT event-wiring (name, sources, destinations)> + + +<!ELEMENT sources (window-coordination+)> + + +<!ELEMENT destinations (window-coordination+)> + + +<!ELEMENT parameter-alias (#PCDATA)> + + +<!ELEMENT parameter-binding (name, window-coordination+)> + + +<!ELEMENT window-coordination (window-name, qname)> + + +<!ELEMENT qname (#PCDATA)> + +

16 years

1
0
0 / 0

JBoss Portal SVN: r11347 - docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-07-08 07:51:16 -0400 (Tue, 08 Jul 2008) New Revision: 11347 Modified: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/installation.xml Log: Refer to the common image Modified: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/installation.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/installation.xml 2008-07-08 11:43:01 UTC (rev 11346) +++ docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/installation.xml 2008-07-08 11:51:16 UTC (rev 11347) @@ -100,7 +100,7 @@ url="http://localhost:8080/portal">http://localhost:8080/portal</ulink> . You should see the default page for JBoss Portal (Figure 2). <mediaobject> <imageobject> - <imagedata align="center" fileref="images/image002.png" format="PNG" + <imagedata align="center" fileref="images/common/frontpage.png" format="PNG" scale="" valign="middle" /> </imageobject>

16 years

1
0
0 / 0

JBoss Portal SVN: r11346 - in docs/branches/JBoss_Portal_Branch_2_7: referenceGuide/en/images/common and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-07-08 07:43:01 -0400 (Tue, 08 Jul 2008) New Revision: 11346 Modified: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/common/frontpage.png docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/common/frontpage.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/common/frontpage.png Log: Updating frontpage Modified: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/common/frontpage.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/common/frontpage.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/common/frontpage.png =================================================================== (Binary files differ)

16 years

1
0
0 / 0

JBoss Portal SVN: r11345 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-08 07:38:22 -0400 (Tue, 08 Jul 2008) New Revision: 11345 Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java Log: - Minor. Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java 2008-07-08 11:37:00 UTC (rev 11344) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java 2008-07-08 11:38:22 UTC (rev 11345) @@ -43,7 +43,6 @@ import org.jboss.portal.test.wsrp.v1.consumer.behaviors.ResourceMarkupBehavior; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.SessionMarkupBehavior; import org.jboss.portal.wsrp.WSRPConsumer; -import org.jboss.portal.wsrp.producer.WSRPValidator; import java.util.Set; @@ -189,7 +188,6 @@ { this.strict = strict; producer.setUseStrictMode(strict); - WSRPValidator.setStrict(strict); } public boolean isStrict()

16 years

1
0
0 / 0

JBoss Portal SVN: r11344 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-08 07:37:00 -0400 (Tue, 08 Jul 2008) New Revision: 11344 Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java Log: - Fixed tests. Thanks, Bolek. Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java 2008-07-08 11:31:43 UTC (rev 11343) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java 2008-07-08 11:37:00 UTC (rev 11344) @@ -188,8 +188,7 @@ public void setStrict(boolean strict) { this.strict = strict; - //producer.setUseStrictMode(strict); - WSRPValidator.setStrict(strict); + producer.usingStrictModeChangedTo(strict); } public boolean isStrict()

16 years

1
0
0 / 0

JBoss Portal SVN: r11343 - in docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images: admincms and 3 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-07-08 07:31:43 -0400 (Tue, 08 Jul 2008) New Revision: 11343 Removed: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/forums/ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/permissions/ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/normalstate.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/setup/ Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/cms_adminpage.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/createdirectory.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/createhtml.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editfile.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editorhelp.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editorpreview.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editorsource.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/fileproperties.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/live.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/plus.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourcecopy.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourcedelete.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourcemove.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourceupload.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourceuploadarchive.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/secure_menu.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/secure_node.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/ss_exportarchive.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/ss_viewfile.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/workflow_file_view.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/workflow_pending_items.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/cms_portlet.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/dashboard_assignportlets.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/greetings.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/login_ss.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/newsportlet.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/newsportlet_edit.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/page_portlet.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet_create.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet_loggedin.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet_lost.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config1.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config2.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config3.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config4.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config5.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weatherportlet.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weatherportlet_edit.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_page.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_page_layout.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_page_rename.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal_properties.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal_security.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal_theme.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/display_names.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/google_window.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/instances.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_cms1.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_cms2.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_content.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_final.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_google1.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_google2.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_google3.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_instance.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_region.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portals.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portals_properties.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portlet_details.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portlets.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/tree.gif docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/wizard.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/assign_roles.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/create_role.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/create_user.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/edit_profile.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/edit_role.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/role_management.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/role_members.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/user_management.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/user_pending.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/user_su.png Log: Remove unused images. Cropped/worked on the others Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/cms_adminpage.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/createdirectory.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/createhtml.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editfile.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editorhelp.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editorpreview.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/editorsource.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/fileproperties.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/live.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/plus.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourcecopy.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourcedelete.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourcemove.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourceupload.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/resourceuploadarchive.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/secure_menu.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/secure_node.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/ss_exportarchive.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/ss_viewfile.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/workflow_file_view.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/admincms/workflow_pending_items.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/cms_portlet.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/dashboard_assignportlets.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/greetings.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/login_ss.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/newsportlet.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/newsportlet_edit.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/page_portlet.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet_create.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet_loggedin.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/user_portlet_lost.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config1.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config2.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config3.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config4.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weather_config5.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weatherportlet.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/intro/weatherportlet_edit.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_page.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_page_layout.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_page_rename.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal_properties.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal_security.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/default_portal_theme.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/display_names.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/google_window.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/instances.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_cms1.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_cms2.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_content.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_final.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_google1.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_google2.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_google3.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_instance.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/layout_region.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portals.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portals_properties.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portlet_details.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/portlets.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/tree.gif =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/management/wizard.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/assign_roles.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/create_role.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/create_user.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/edit_profile.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/edit_role.png =================================================================== (Binary files differ) Deleted: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/normalstate.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/role_management.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/role_members.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/user_management.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/user_pending.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/role/user_su.png =================================================================== (Binary files differ)

16 years

1
0
0 / 0

JBoss Portal SVN: r11342 - in docs/branches/JBoss_Portal_Branch_2_7: quickstartuser and 11 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-07-08 06:54:21 -0400 (Tue, 08 Jul 2008) New Revision: 11342 Added: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/common/ docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/common/frontpage.png docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/common/ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/common/frontpage.png Removed: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/image002.png docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/overview.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/forumsPortlet.xml Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/master.xml docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/pom.xml docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/master.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/admincmsPortlet.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/dynamicity.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/intro.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/target.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/user_role.xml docs/branches/JBoss_Portal_Branch_2_7/userGuide/pom.xml Log: More cleanup, fixing the doc Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,3 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <preface id="acknowledgements"> <title>Acknowledgments</title> <para>We would like to thank the developers that participate in the JBoss Portal project.</para> @@ -5,36 +8,37 @@ <para> <itemizedlist> <listitem> - Luca Stancapiano and Luc Boudreau for their localization contributions. + <para>Luca Stancapiano, Luc Boudreau and Anton Borisow for their Italian, Canadian French and Russian localization contributions.</para> </listitem> <listitem> - Antoine Herzog for his feedback, writing Wikis, and helping in the forums. + <para>Antoine Herzog and Peter Johnson for helping in the forums.</para> </listitem> <listitem> - Mark Fernandes and Paul Tamaro from Novell, for their hard work in supplying the - portal project with usable and attractive themes and layouts in the 2.4 version of JBoss Portal. + <para>Mark Fernandes and Paul Tamaro from Novell, for their hard work in supplying the + portal project with usable and attractive themes and layouts in the 2.4 version of JBoss Portal.</para> </listitem> <listitem> - Martin Holzner from Novell, for his work on themes in the 2.4 version of JBoss Portal. + <para>Martin Holzner from Novell, for his work on themes in the 2.4 version of JBoss Portal.</para> </listitem> <listitem> - Kev "kevs3d" Roast for supplying us with two working portlets that integrate existing - frameworks in to the portal: Sun JSF-RI and Spring MVC portlets. + <para>Kev "kevs3d" Roast for supplying us with two working portlets that integrate existing + frameworks in to the portal: Sun JSF-RI and Spring MVC portlets.</para> </listitem> <listitem> - Swarn "sdhaliwal" Dhaliwal for supplying us with the Struts-Bridge, that will allow - for existing Apache Struts applications to work with JBoss Portal. + <para>Swarn "sdhaliwal" Dhaliwal for supplying us with the Struts-Bridge, that will allow + for existing Apache Struts applications to work with JBoss Portal.</para> </listitem> <listitem> - A few Red Hat employees: Remy Maucherat for Apache Tomcat configuration, Magesh Kumar Bojan and Martin Putz for always being there to help our customers, - Prabhat Jha for making sure that JBoss Portal runs great everywhere, Noel Rocher for his contributions and early feedback on JBoss Portal 2.6, and James Cobb for the renaissance theme. + <para>A few Red Hat employees: Remy Maucherat for Apache Tomcat configuration, Magesh Kumar Bojan and Martin Putz for always being there to help our customers, + Prabhat Jha for making sure that JBoss Portal runs great everywhere, Murray Mc Allister for his work on the doc, Noel Rocher for his contributions and early feedback on JBoss Portal 2.6, + James Cobb for the renaissance theme and many others !</para> </listitem> <listitem> - The JBoss Labs (<ulink url="http://www.jboss.org" />) team for building a great infrastructure on top of JBoss Portal 2.6, providing very useful feedback, and - giving us the initial Drag and Drop implementation. + <para>The JBoss Labs (<ulink url="http://www.jboss.org" />) team for building a great infrastructure on top of JBoss Portal 2.6, providing very useful feedback, and + giving us the initial Drag and Drop implementation.</para> </listitem> <listitem> - Everyone in general who participates in the forums and on the Wiki. + <para>Everyone in general who participates on the code, in the forums and on the Wiki.</para> </listitem> </itemizedlist> </para> Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,3 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <preface id="features"> <title>Feature List</title> <para>The following list details features found in this release of JBoss Portal. For a @@ -10,36 +13,36 @@ <emphasis role="bold">Technology and Architecture</emphasis> <itemizedlist> <listitem> - <emphasis role="bold">JEMS:</emphasis> + <para><emphasis role="bold">JEMS:</emphasis> leverages the power of JBoss Enterprise Middleware - Services: JBoss Application Server, JBoss Cache, JGroups, and Hibernate. + Services: JBoss Application Server, JBoss Cache, JGroups, and Hibernate.</para> </listitem> <listitem> - <emphasis role="bold">Database Agnostic:</emphasis> - works with any RDBMS supported by Hibernate. + <para><emphasis role="bold">Database Agnostic:</emphasis> + works with any RDBMS supported by Hibernate.</para> </listitem> <listitem> - <emphasis role="bold"><trademark class="trade">Java</trademark> Authentication and Authorization Service (JAAS):</emphasis> - custom authentication via JAAS login modules. + <para><emphasis role="bold"><trademark class="trade">Java</trademark> Authentication and Authorization Service (JAAS):</emphasis> + custom authentication via JAAS login modules.</para> </listitem> <listitem> - <emphasis role="bold">Caching:</emphasis> - utilizes render-view caching for improved performance. + <para><emphasis role="bold">Caching:</emphasis> + utilizes render-view caching for improved performance.</para> </listitem> <listitem> - <emphasis role="bold">Clustering:</emphasis> + <para><emphasis role="bold">Clustering:</emphasis> cluster support allows the portal state to be - clustered for all portal instances. + clustered for all portal instances.</para> </listitem> <listitem> - <emphasis role="bold">Hot-deployment:</emphasis> + <para><emphasis role="bold">Hot-deployment:</emphasis> leverages JBoss dynamic auto-deployment - features. + features.</para> </listitem> <listitem> - <emphasis role="bold">SAR Installer:</emphasis> + <para><emphasis role="bold">SAR Installer:</emphasis> browser-based installer makes installation - and initial configuration a breeze. + and initial configuration a breeze.</para> </listitem> </itemizedlist> </para> @@ -47,10 +50,10 @@ <emphasis role="bold">Single Sign On</emphasis> <itemizedlist> <listitem> - <emphasis role="bold">Leverages Apache Tomcat and JBoss Single Sign On (SSO) solutions.</emphasis> + <para><emphasis role="bold">Leverages Apache Tomcat and JBoss Single Sign On (SSO) solutions.</emphasis></para> </listitem> <listitem> - <emphasis role="bold">Integrates with Java Open Single Sign-On (JOSSO) and Central Authentication Service (CAS) out of the box. Experimental support for the Open Web SSO project (OpenSSO).</emphasis> + <para><emphasis role="bold">Integrates with Java Open Single Sign-On (JOSSO) and Central Authentication Service (CAS) out of the box. Experimental support for the Open Web SSO project (OpenSSO).</emphasis></para> </listitem> </itemizedlist> </para> @@ -58,10 +61,10 @@ <emphasis role="bold">LDAP</emphasis> <itemizedlist> <listitem> - <emphasis role="bold">Connect to virtually any LDAP server.</emphasis> + <para><emphasis role="bold">Connect to virtually any LDAP server.</emphasis></para> </listitem> <listitem> - <emphasis role="bold">Integrates with <trademark class="trade">Sun</trademark> Active Directory and OpenLDAP out of the box. Experimental support for <trademark class="registered">Microsoft</trademark> <trademark class="registered">Active Directory</trademark>.</emphasis> + <para><emphasis role="bold">Integrates with <trademark class="trade">Sun</trademark> Active Directory and OpenLDAP out of the box. Experimental support for <trademark class="registered">Microsoft</trademark> <trademark class="registered">Active Directory</trademark>.</emphasis></para> </listitem> </itemizedlist> </para> @@ -69,24 +72,30 @@ <emphasis role="bold">Supported Standards</emphasis> <itemizedlist> <listitem> - <emphasis role="bold">Portlet Specification and API 1.0 (JSR-168).</emphasis> + <para><emphasis role="bold">Portlet Specification and API 1.0 (JSR-168).</emphasis></para> </listitem> <listitem> - <emphasis role="bold">Content Repository for <trademark class="trade">Java</trademark> technology API (JSR-170).</emphasis> + <para><emphasis role="bold">Portlet Specification and API 2.0 (JSR-286).</emphasis></para> </listitem> <listitem> - <emphasis role="bold"><trademark class="trade">JavaServer</trademark> Faces 1.2 (JSR-252).</emphasis> + <para><emphasis role="bold">Content Repository for <trademark class="trade">Java</trademark> technology API (JSR-170).</emphasis></para> </listitem> <listitem> - <emphasis role="bold">Java Management Extension (<trademark class="trade">JMX</trademark>) 1.2.</emphasis> + <para><emphasis role="bold"><trademark class="trade">JavaServer</trademark> Faces 1.2 (JSR-252).</emphasis></para> </listitem> <listitem> - <emphasis role="bold">Web Services for Remote Portlets (WSRP) 1.0:</emphasis> + <para><emphasis role="bold"><trademark class="trade">JavaServer</trademark> Faces 2.0 (JSR-314).</emphasis></para> + </listitem> + <listitem> + <para><emphasis role="bold">Java Management Extension (<trademark class="trade">JMX</trademark>) 1.2.</emphasis></para> + </listitem> + <listitem> + <para><emphasis role="bold">Web Services for Remote Portlets (WSRP) 1.0:</emphasis> refer to <ulink url="http://docs.jboss.com/jbportal/v2.6.5/referenceGuide/html/wsrp.html#wsrp_...">WSRP - support in JBoss Portal</ulink> for further details. + support in JBoss Portal</ulink> for further details.</para> </listitem> <listitem> - <emphasis role="bold">Full <trademark class="trade">J2EE</trademark> 1.4 compliance when used with JBoss Application Server.</emphasis> + <para><emphasis role="bold">Full <trademark class="trade">J2EE</trademark> 1.4 compliance when used with JBoss Application Server.</emphasis></para> </listitem> </itemizedlist> </para> @@ -95,39 +104,39 @@ </para> <itemizedlist> <listitem> - <emphasis role="bold">Multiple Portal Instances:</emphasis> + <para><emphasis role="bold">Multiple Portal Instances:</emphasis> the ability to have multiple portal - instances running inside one portal container. + instances running inside one portal container.</para> </listitem> <listitem> - <emphasis role="bold">IPC:</emphasis> + <para><emphasis role="bold">IPC:</emphasis> the Inter-Portlet Communication API enables portlets to create links to other - objects, such as pages, portals, and windows. + objects, such as pages, portals, and windows.</para> </listitem> <listitem> - <emphasis role="bold">Dynamic:</emphasis> + <para><emphasis role="bold">Dynamic:</emphasis> the ability for administrators and users to create and destroy objects such as - portlets, pages, portals, themes, and layouts at runtime. + portlets, pages, portals, themes, and layouts at runtime.</para> </listitem> <listitem> - <emphasis role="bold">Internationalization:</emphasis> + <para><emphasis role="bold">Internationalization:</emphasis> the ability to use internationalization - resource files for every portlet. + resource files for every portlet.</para> </listitem> <listitem> - <emphasis role="bold">Pluggable Services:</emphasis> + <para><emphasis role="bold">Pluggable Services:</emphasis> with authentication performed by the - servlet container and JAAS, it is possible to swap the authentication scheme. + servlet container and JAAS, it is possible to swap the authentication scheme.</para> </listitem> <listitem> - <emphasis role="bold">Page-based Architecture:</emphasis> + <para><emphasis role="bold">Page-based Architecture:</emphasis> allows the grouping and division - of portlets on a per-page basis. + of portlets on a per-page basis.</para> </listitem> <listitem> - <emphasis role="bold">Existing Framework Support:</emphasis> + <para><emphasis role="bold">Existing Framework Support:</emphasis> portlets utilizing Apache Struts, - Spring Web MVC, Sun JSF-RI, AJAX, and Apache MyFaces are supported. + Spring Web MVC, Sun JSF-RI, AJAX, and Apache MyFaces are supported.</para> </listitem> </itemizedlist> <para> @@ -135,19 +144,19 @@ </para> <itemizedlist> <listitem> - <emphasis role="bold">Swapping Themes and Layouts:</emphasis> + <para><emphasis role="bold">Swapping Themes and Layouts:</emphasis> new themes and layouts - containing images can easily be deployed in WAR archives. + containing images can easily be deployed in WAR archives.</para> </listitem> <listitem> - <emphasis role="bold">Flexible API:</emphasis> + <para><emphasis role="bold">Flexible API:</emphasis> the Theme and Layout APIs are designed to - separate the business layer from the presentation layer. + separate the business layer from the presentation layer.</para> </listitem> <listitem> - <emphasis role="bold">Per-page Layout Strategy:</emphasis> + <para><emphasis role="bold">Per-page Layout Strategy:</emphasis> different layouts can be - assigned to different pages. + assigned to different pages.</para> </listitem> </itemizedlist> <para> @@ -155,36 +164,36 @@ </para> <itemizedlist> <listitem> - <emphasis role="bold">User Registration and Validation:</emphasis> + <para><emphasis role="bold">User Registration and Validation:</emphasis> configurable registration - parameters allow user email validation before activation. + parameters allow user email validation before activation.</para> </listitem> <listitem> - <emphasis role="bold">Workflow:</emphasis> - ability to define your own jBPM workflow on user registration. + <para><emphasis role="bold">Workflow:</emphasis> + ability to define your own jBPM workflow on user registration.</para> </listitem> <listitem> - <emphasis role="bold">User Log In:</emphasis> - makes use of servlet container authentication. + <para><emphasis role="bold">User Log In:</emphasis> + makes use of servlet container authentication.</para> </listitem> <listitem> - <emphasis role="bold">Create and Edit Users:</emphasis> + <para><emphasis role="bold">Create and Edit Users:</emphasis> ability for administrators to - create and edit user profiles. + create and edit user profiles.</para> </listitem> <listitem> - <emphasis role="bold">Create and Edit Roles:</emphasis> + <para><emphasis role="bold">Create and Edit Roles:</emphasis> ability for administrators to create and edit - roles. + roles.</para> </listitem> <listitem> - <emphasis role="bold">Role Assignment:</emphasis> + <para><emphasis role="bold">Role Assignment:</emphasis> ability for administrators to assign - users to roles. + users to roles.</para> </listitem> <listitem> - <emphasis role="bold">CAPTCHA Support:</emphasis> - distinguish between humans and machines when registering. + <para><emphasis role="bold">CAPTCHA Support:</emphasis> + distinguish between humans and machines when registering.</para> </listitem> </itemizedlist> <para> @@ -192,14 +201,14 @@ </para> <itemizedlist> <listitem> - <emphasis role="bold">Extendable Permissions API:</emphasis> + <para><emphasis role="bold">Extendable Permissions API:</emphasis> allows custom portlet - permissions based on role definition. + permissions based on role definition.</para> </listitem> <listitem> - <emphasis role="bold">Administrative Interface:</emphasis> + <para><emphasis role="bold">Administrative Interface:</emphasis> allows permission - assignments to roles at any time for any deployed portlet, page, or portal instance. + assignments to roles at any time for any deployed portlet, page, or portal instance.</para> </listitem> </itemizedlist> <para> @@ -207,78 +216,78 @@ </para> <itemizedlist> <listitem> - <emphasis role="bold">JCR-compliant:</emphasis> + <para><emphasis role="bold">JCR-compliant:</emphasis> the CMS is powered by Apache Jackrabbit, an open source implementation - of the <trademark class="trade">Java</trademark> content repository API. + of the <trademark class="trade">Java</trademark> content repository API.</para> </listitem> <listitem> - <emphasis role="bold">Database and File System Store Support:</emphasis> + <para><emphasis role="bold">Database and File System Store Support:</emphasis> configure the content store - for either a file system or an RDBMS. + for either a file system or an RDBMS.</para> </listitem> <listitem> - <emphasis role="bold">External Blob Support:</emphasis> + <para><emphasis role="bold">External Blob Support:</emphasis> configurable content store, allowing large blobs to reside on a file system, and content node references and properties to reside in an - RDBMS. + RDBMS.</para> </listitem> <listitem> - <emphasis role="bold">Version and History Support:</emphasis> + <para><emphasis role="bold">Version and History Support:</emphasis> all content edited and created is - auto-versioned with a history of edits, that can be viewed at any time. + auto-versioned with a history of edits, that can be viewed at any time.</para> </listitem> <listitem> - <emphasis role="bold">Content Serving Search-engine-friendly URLS:</emphasis> - http://<replaceable>your-domain</replaceable>/portal/content/index.html (does not apply to portlet actions). + <para><emphasis role="bold">Content Serving Search-engine-friendly URLS:</emphasis> + http://<replaceable>your-domain</replaceable>/portal/content/index.html (does not apply to portlet actions).</para> </listitem> <listitem> - <emphasis role="bold">No Long Portal URLS:</emphasis> + <para><emphasis role="bold">No Long Portal URLS:</emphasis> serve binaries with simple URLs - (http://<replaceable>your-domain</replaceable>/files/products.pdf). + (http://<replaceable>your-domain</replaceable>/files/products.pdf).</para> </listitem> <listitem> - <emphasis role="bold">Multiple HTML Portlet Instance Support:</emphasis> + <para><emphasis role="bold">Multiple HTML Portlet Instance Support:</emphasis> allows extra - instances of static content from the CMS to be served under separate windows. + instances of static content from the CMS to be served under separate windows.</para> </listitem> <listitem> - <emphasis role="bold">Directory Support:</emphasis> + <para><emphasis role="bold">Directory Support:</emphasis> create, move, delete, copy, and upload - entire directory trees. + entire directory trees.</para> </listitem> <listitem> - <emphasis role="bold">File Functions:</emphasis> - create, move, delete, copy, and upload files. + <para><emphasis role="bold">File Functions:</emphasis> + create, move, delete, copy, and upload files.</para> </listitem> <listitem> - <emphasis role="bold">Embedded Directory-browser:</emphasis> + <para><emphasis role="bold">Embedded Directory-browser:</emphasis> when creating, moving, deleting, or copying files, administrators can navigate the directory tree to find - the collection they want to perform the action on. + the collection they want to perform the action on.</para> </listitem> <listitem> - <emphasis role="bold">Ease-of-use Architecture:</emphasis> + <para><emphasis role="bold">Ease-of-use Architecture:</emphasis> all actions to be performed on - files and folder are one mouse-click away. + files and folder are one mouse-click away.</para> </listitem> <listitem> - <emphasis role="bold">Full-featured HTML Editor:</emphasis> + <para><emphasis role="bold">Full-featured HTML Editor:</emphasis> the HTML editor contains a WYSIWYG mode, preview functionality, and HTML source editting mode. HTML commands support tables, fonts, zooming, image and URL linking, flash movie support, bullet and numbered list, and - dozens more. + dozens more.</para> </listitem> <listitem> - <emphasis role="bold">Editor Style Sheet Support:</emphasis> - to easily chose classes, the WYSIWYG editor displays the current portal style sheet. + <para><emphasis role="bold">Editor Style Sheet Support:</emphasis> + to easily chose classes, the WYSIWYG editor displays the current portal style sheet.</para> </listitem> <listitem> - <emphasis role="bold">Internationalization Support:</emphasis> + <para><emphasis role="bold">Internationalization Support:</emphasis> content can be attributed to a specific locale, and then served - to the user based on his or hers Web browser settings. + to the user based on his or hers Web browser settings.</para> </listitem> <listitem> - <emphasis role="bold">Workflow Support:</emphasis> - basic submit for review and approval process. + <para><emphasis role="bold">Workflow Support:</emphasis> + basic submit for review and approval process.</para> </listitem> </itemizedlist> </preface> Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,10 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <preface id="overview"> <title>JBoss Portal - Overview</title> <para> - <imageobject> - <imagedata fileref="images/common/frontpage.png" format="png" align="center" - valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/common/frontpage.png" format="PNG" scalefit="1"/> + </imageobject> + </mediaobject> </para> <para>Many IT organizations look to achieve a competitive advantage for the enterprise by improving business productivity and reducing costs. Today's top enterprises are realizing this @@ -15,9 +19,13 @@ combined with a flexible and scalable underlying platform.</para> <para>JBoss Portal provides an open source and standards-based environment for hosting and serving a portal's Web interface, publishing and managing its content, and customizing its - experience. It is entirely standards-based, and supports the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>, + experience. It is entirely standards-based, and supports the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification (Portlet 1.0)</ulink> and + <ulink url="http://www.jcp.org/en/jsr/detail?id=286">JSR-286 Portlet Specification (Portlet 2.0)</ulink> , which allows you to easily plug-in standards-compliant portlets to meet your specific portal - needs. JBoss Portal is available through the business-friendly <ulink url="http://jboss.com/opensource/lgpl/faq">LGPL</ulink> open source license, and is supported by <ulink url="http://www.jboss.com/services/index">JBoss Enterprise Middleware Professional Support and Consulting</ulink>. JBoss support services are available to assist you in designing, developing, deploying, and ultimately managing your portal environment. JBoss Portal is currently developed by JBoss Enterprise Middleware developers, and community contributors. + needs. JBoss Portal is available through the business-friendly <ulink url="http://jboss.com/opensource/lgpl/faq">LGPL</ulink> open source license, and the + JBoss Enterprise Portal Plarform is supported by + <ulink url="http://www.jboss.com/services/index">JBoss Enterprise Middleware Professional Support and Consulting</ulink>. JBoss support services are available to + assist you in designing, developing, deploying, and ultimately managing your portal environment. JBoss Portal is currently developed by JBoss Enterprise Middleware developers, and community contributors. </para> <para>The JBoss Portal framework and architecture include the portal container, and support a wide range of features, including standard portlets, single sign-on, clustering, and Added: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/common/frontpage.png =================================================================== (Binary files differ) Property changes on: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/common/frontpage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/images/image002.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/master.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/master.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/master.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" -"../../docbook-support/support/docbook-dtd/docbookx.dtd" [ -<!ENTITY overview SYSTEM "../../common/en/modules/overview.xml"> -<!ENTITY forward SYSTEM "modules/forward.xml"> -<!ENTITY installation SYSTEM "modules/installation.xml"> -<!ENTITY portalterminology SYSTEM "modules/portalterminology.xml"> -<!ENTITY interaction SYSTEM "modules/interaction.xml"> -<!ENTITY deployportlet SYSTEM "modules/deployportlet.xml"> -<!ENTITY fin SYSTEM "modules/fin.xml"> -]> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <book lang="en"> <bookinfo> <title>JBoss Portal 2.7.0</title> @@ -43,31 +35,12 @@ <toc></toc> -  + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/overview.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/forward.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/installation.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/portalterminology.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/interaction.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/deployportlet.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/fin.xml"/> - &overview; - -  - - &forward; - -  - - &installation; - -  - - &portalterminology; - -  - - &interaction; - -  - - &deployportlet; - -  - - &fin; </book> Deleted: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/overview.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/overview.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/en/modules/overview.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<preface id="overview"> - <title>JBoss Portal - Overview</title> - - <para> - <imageobject> - <imagedata align="center" fileref="images/image002.png" format="PNG" - valign="middle" /> - </imageobject> - </para> - - <para>Many IT organizations look to achieve a competitive advantage for the - enterprise by improving business productivity and reducing costs. Today's - top enterprises are realizing this goal by deploying enterprise portals - within their IT infrastructure. Enterprise portals simplify access to - information by providing a single source of interaction with corporate - information. Although today's packaged portal frameworks help enterprises - launch portals more quickly, only JBoss Portal can deliver the benefits of a - zero-cost open source license combined with a flexible and scalable - underlying platform.</para> - - <para>JBoss Portal provides an open source and standards-based environment - for hosting and serving a portal's Web interface, publishing and managing - its content, and customizing its experience. It is entirely standards-based - and supports the JSR-168 portlet specification, which allows you to easily - plug-in standards-compliant portlets to meet your specific portal needs. - JBoss Portal is available through the business-friendly <ulink - url="http://www.jboss.org/opensource/lgpl/faq">LGPL</ulink> open source - license and is supported by <ulink - url="http://www.jboss.com/services/index">Red Hat</ulink>. Red Hat support - services are available to assist you in designing, developing, deploying, - and ultimately managing your portal environment. JBoss Portal is currently - developed by Red Hat, Inc. developers, and community contributors. </para> - - <para>The JBoss Portal framework and architecture includes the portal - container and supports a wide range of features including standard portlets, - single sign-on, clustering and internationalization. Portal themes and - layouts are configurable. Users have the ability to fully customize thier - own personal portal pages. Fine-grained security administration down to - portlet permissions rounds out the security model. JBoss Portal includes a - rich content management system with approval cycle support.</para> - - <para> - <emphasis role="bold">JBoss Portal Resources:</emphasis> - - <orderedlist> - <listitem> - <para> - <ulink url="http://www.jboss.org/products/jbossportal">JBoss Portal - Project Home Page</ulink> - </para> - </listitem> - - <listitem> - <para> - <ulink - url="http://labs.jboss.com/jbossportal/download/index.html">Downloads</ulink> - </para> - </listitem> - - <listitem> - <para> - <ulink - url="http://labs.jboss.com/jbossportal/docs/index.html">Documentation</ulink> - </para> - </listitem> - - <listitem> - <para>Forums: <ulink - url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">User</ulink> - | <ulink - url="http://www.jboss.org/index.html?module=bb&op=main&c=14">Developer</ulink> - | <ulink - url="http://jboss.org/index.html?module=bb&op=viewforum&f=239">Eclipse - Portlet Plugin</ulink> </para> - </listitem> - - <listitem> - <para> - <ulink - url="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal">Wiki</ulink> - </para> - </listitem> - - <listitem> - <para> - <ulink url="http://www.portletswap.com">PortletSwap.com portlet - exchange</ulink> - </para> - </listitem> - - <listitem> - <para> - <ulink - url="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plug...">Our - Roadmap</ulink> - </para> - </listitem> - </orderedlist> - </para> - - <para>The JBoss Portal team encourages you to use this guide to install and - configure JBoss Portal. If you encounter any configuration issues or simply - want to take part in our community, we would love to hear from you in our - forums.</para> -</preface> Modified: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/pom.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/pom.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/pom.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -5,11 +5,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss</groupId> - <artifactId>documentation</artifactId> - <version>1.0</version> + <groupId>org.jboss.portal</groupId> + <artifactId>jboss-portal-docs-parent</artifactId> + <version>1-SNAPSHOT</version> </parent> + <groupId>org.jboss.portal</groupId> + <artifactId>quickstartuser-${translation}</artifactId> + <version>2.7.0</version> + <packaging>jdocbook</packaging> + <name>Quick_Start_User_(${translation})</name> + <repositories> <repository> <id>repository.jboss.org</id> @@ -58,10 +64,4 @@ </pluginRepository> </pluginRepositories> - <groupId>org.jboss.portal</groupId> - <artifactId>quickstartuser-${translation}</artifactId> - <version>2.7.0</version> - <packaging>jdocbook</packaging> - <name>Quick_Start_User_(${translation})</name> - </project> Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" - "../../docbook-support/support/docbook-dtd/docbookx.dtd" - > -<book lang="en" xmlns:xi="http://www.w3.org/2001/XInclude"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> +<book lang="en"> <bookinfo> <title><trademark class="registered">JBoss</trademark> Portal 2.7.0</title> <subtitle>Reference Guide</subtitle> @@ -40,39 +39,39 @@ </bookinfo> <toc/> - <xi:include href="modules/trademarks.xml" /> - <xi:include href="../../common/en/modules/overview.xml" /> - <xi:include href="../../common/en/modules/featurelist.xml" /> - <xi:include href="modules/target.xml" /> - <xi:include href="../../common/en/modules/acknowledgements.xml" /> - <xi:include href="modules/supported.xml" /> - <xi:include href="modules/installation.xml" /> - <xi:include href="modules/configuration.xml" /> - <xi:include href="modules/migration.xml" /> - <xi:include href="modules/tutorials.xml" /> - <xi:include href="modules/xmldescriptors.xml" /> - <xi:include href="modules/urls.xml" /> - <xi:include href="modules/errorhandling.xml" /> - <xi:include href="modules/contentintegration.xml" /> - <xi:include href="modules/widgetintegration.xml" /> - <xi:include href="modules/portletmodes.xml" /> - <xi:include href="modules/portalapi.xml" /> - <xi:include href="modules/clustering.xml" /> - <xi:include href="modules/wsrp.xml" /> - <xi:include href="modules/security.xml" /> - <xi:include href="modules/identity.xml" /> - <xi:include href="modules/identityportlets.xml" /> - <xi:include href="modules/authentication.xml" /> - <xi:include href="modules/ldap.xml" /> - <xi:include href="modules/sso.xml" /> - <xi:include href="modules/cmsPortlet.xml" /> - <xi:include href="modules/workflow.xml" /> - <xi:include href="modules/navtabs.xml" /> - <xi:include href="modules/themeandlayouts.xml" /> - <xi:include href="modules/ajax.xml" /> - <xi:include href="modules/troubleshooting.xml" /> - <xi:include href="modules/portalObjectsDTD.xml" /> - <xi:include href="modules/portletInstancesDTD.xml" /> - <xi:include href="modules/jbossPortletDTD.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/trademarks.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/overview.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/featurelist.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/target.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/acknowledgements.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/supported.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/installation.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/configuration.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/migration.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/tutorials.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/xmldescriptors.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/urls.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/errorhandling.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/contentintegration.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/widgetintegration.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/portletmodes.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/portalapi.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/clustering.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/wsrp.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/security.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/identity.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/identityportlets.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/authentication.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/ldap.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/sso.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/cmsPortlet.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/workflow.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/navtabs.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/themeandlayouts.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/ajax.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/troubleshooting.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/portalObjectsDTD.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/portletInstancesDTD.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/jbossPortletDTD.xml" /> </book> Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -10,6 +10,13 @@ <version>1-SNAPSHOT</version> </parent> + <groupId>org.jboss.portal</groupId> + <artifactId>referenceGuide-${translation}</artifactId> + <version>2.7.0</version> + <packaging>jdocbook</packaging> + <name>Reference_Guide_(${translation})</name> + + <repositories> <repository> <id>repository.jboss.org</id> @@ -58,10 +65,4 @@ </pluginRepository> </pluginRepositories> - <groupId>org.jboss.portal</groupId> - <artifactId>referenceGuide-${translation}</artifactId> - <version>2.7.0</version> - <packaging>jdocbook</packaging> - <name>Reference_Guide_(${translation})</name> - </project> Added: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/common/frontpage.png =================================================================== (Binary files differ) Property changes on: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/images/common/frontpage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/master.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/master.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/master.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,31 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" - "../../docbook-support/support/docbook-dtd/docbookx.dtd" [ - <!ENTITY overview SYSTEM "../../common/en/modules/overview.xml"> - <!ENTITY featurelist SYSTEM "../../common/en/modules/featurelist.xml"> - <!ENTITY target SYSTEM "modules/target.xml"> - <!ENTITY acknowledgements SYSTEM "../../common/en/modules/acknowledgements.xml"> - <!ENTITY intro SYSTEM "modules/intro.xml"> - <!ENTITY dynamicity SYSTEM "modules/dynamicity.xml"> - <!ENTITY CMSAdmin SYSTEM "modules/admincmsPortlet.xml"> - <!ENTITY user_role SYSTEM "modules/user_role.xml"> -  - ]> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <book lang="en"> <bookinfo> - <title>JBoss Portal 2.6.4</title> + <title>JBoss Portal 2.7.0</title> <subtitle>User Guide</subtitle> - <releaseinfo>Release 2.6.4</releaseinfo> - <releaseinfo>February 2008</releaseinfo> + <releaseinfo>July 2008</releaseinfo> </bookinfo> <toc/> -  &overview; -  &featurelist; -  &target; -  &acknowledgements; -  &intro; -  &dynamicity; -  &CMSAdmin; -  &user_role; -  + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/overview.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/featurelist.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/target.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../common/en/modules/acknowledgements.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/intro.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/dynamicity.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/admincmsPortlet.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/user_role.xml"/> </book> Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/admincmsPortlet.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/admincmsPortlet.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/admincmsPortlet.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <chapter id="admincmsPortlet"> <chapterinfo> <author> @@ -17,7 +19,7 @@ <para>You should then be presented with a page that is similar to this:</para> <mediaobject> <imageobject> - <imagedata fileref="images/admincms/cms_adminpage.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/cms_adminpage.png" format="PNG"/> </imageobject> </mediaobject> </sect1> @@ -28,7 +30,7 @@ workflow mechanism has been activated. <mediaobject> <imageobject> - <imagedata fileref="images/admincms/actions_menu.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/actions_menu.png" format="PNG"/> </imageobject> </mediaobject> </para> @@ -37,7 +39,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/admincms/ss_viewfile.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/ss_viewfile.png" format="PNG"/> </imageobject> </mediaobject> A user can list directory contents by either clicking on the folder name or selecting "view" from the Action @@ -49,14 +51,14 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/admincms/ss_viewfile.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/ss_viewfile.png" format="PNG"/> </imageobject> </mediaobject> Clicking on the "Name" of a file brings up the File Properties page. </para> <mediaobject> <imageobject> - <imagedata fileref="images/admincms/fileproperties.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/fileproperties.png" format="PNG"/> </imageobject> </mediaobject> <para>The File Properties window displays all the possible actions available to perform on a @@ -64,9 +66,11 @@ </para> <para>Version and Locale Information are also contained on this screen. Note that any version labeled with the - <imageobject> - <imagedata fileref="images/admincms/live.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/live.png" format="PNG"/> + </imageobject> + </mediaobject> is the current "live" version shown to users. </para> </sect2> @@ -74,15 +78,19 @@ <title>Copying Files/Directories</title> <para>Clicking on the "Copy" action, displays the copy file/directory dialog window. </para> - <imageobject> - <imagedata fileref="images/admincms/resourcecopy.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/resourcecopy.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The copy resource window allows a user to copy files to any folder on the system, as well as copy whole directory trees to any directory on the system. A user can select which destination directory to copy the resource to, by using the directory browser. Clicking the - <imageobject> - <imagedata fileref="images/admincms/plus.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/plus.png" format="PNG"/> + </imageobject> + </mediaobject> icon expands the directory tree. Clicking on the name of the directory within the tree, sets it as the destination directory for the copied resource. </para> @@ -91,15 +99,19 @@ <title>Moving Files/Directories</title> <para>Clicking on the "Move" action, displays the move file/directory dialog window. </para> - <imageobject> - <imagedata fileref="images/admincms/resourcemove.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/resourcemove.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The move resource window allows a user to move files to any folder on the system, as well as move whole directory trees to any directory on the system. A user can select which destination directory to move the resource to, by using the directory browser. Clicking the - <imageobject> - <imagedata fileref="images/admincms/plus.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/plus.png" format="PNG"/> + </imageobject> + </mediaobject> icon expands the directory tree. Clicking on the name of the directory within the tree, sets it as the destination directory for the moved resource. </para> @@ -108,24 +120,28 @@ <title>Deleting Files/Directories</title> <para>Clicking on the "Delete" action, displays the delete file/directory confirmation window. </para> - <imageobject> - <imagedata fileref="images/admincms/resourcedelete.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/resourcedelete.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The delete resource confirmation window allows a user to delete a file, or a directory on the system. Note that deleting a directory, will delete the entire tree, so all directories under the deleted one, will also be deleted. </para> - <warning>Currently, there is no way to retrieve deleted files/directories! Deleting a file or - directory is permanent! + <warning><para>Currently, there is no way to retrieve deleted files/directories! Deleting a file or + directory is permanent!</para> </warning> </sect2> <sect2 id="createdir"> <title>Creating Directories</title> <para>Clicking on the "Create Folder" action, displays the create directory dialog window. </para> - <imageobject> - <imagedata fileref="images/admincms/createdirectory.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/createdirectory.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The create directory resource window allows a user to create a directory under chosen path. On this window, a user can specify a name for the new empty directory and assign it a description. @@ -137,32 +153,40 @@ editor and directory browser. </para> - <imageobject> - <imagedata fileref="images/admincms/createhtml.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/createhtml.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The create file window allows a user to create a text or HTML file using the embedded WYSIWYG HTML editor. The editor is a fully-functional HTML editor with a myriad of HTML functions. It also includes a preview - <imageobject> - <imagedata fileref="images/admincms/editorpreview.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/editorpreview.png" format="PNG"/> + </imageobject> + </mediaobject> button and a source view - <imageobject> - <imagedata fileref="images/admincms/editorsource.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/editorsource.png" format="PNG"/> + </imageobject> + </mediaobject> button. </para> <para>An in-depth walk-through of the editor is beyond the scope of this document. However, the editor does contain help pages within it, that can be accessed by clicking the - <imageobject> - <imagedata fileref="images/admincms/editorhelp.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/editorhelp.png" format="PNG"/> + </imageobject> + </mediaobject> icon. </para> - <note>It is important to note here that when creating links to images or other resources + <note><para>It is important to note here that when creating links to images or other resources within the system, as user must use the relative file path to that resource. ie: images/hello.gif. Keep in mind at all times that the document base is - http://localhost/portal/ by default! + http://localhost/portal/ by default!</para> </note> <para>Additionally, a user can set a title for the file that will be used in the portlet title bar, and a language for the file, used in serving localized content. @@ -172,16 +196,20 @@ <title>Uploading Files</title> <para>Clicking on the "Upload File" action, displays the upload file dialog window. </para> - <imageobject> - <imagedata fileref="images/admincms/resourceupload.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/resourceupload.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The upload file window allows a user to upload files to any directory on the system. The upload process will work on files up to 1GB and of all types. A user can select which destination directory to upload the resource to, by using the directory browser. Clicking the - <imageobject> - <imagedata fileref="images/admincms/plus.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/plus.png" format="PNG"/> + </imageobject> + </mediaobject> icon expands the directory tree. Clicking on the name of the directory within the tree, sets it as the destination directory for the uploaded resource. Additionally, a user can set a title for the file that will be used in the portlet title bar, and a language @@ -192,16 +220,20 @@ <title>Uploading Archives</title> <para>Clicking on the "Upload Archive" action, displays the upload archive dialog window. </para> - <imageobject> - <imagedata fileref="images/admincms/resourceuploadarchive.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/resourceuploadarchive.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The upload archive window allows a user to upload archives to any directory on the system. The system will then explode the archive, create versions, and place all the files in the repository. A user can select which destination directory to upload the resource to, by using the directory browser. Clicking the - <imageobject> - <imagedata fileref="images/admincms/plus.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/plus.png" format="PNG"/> + </imageobject> + </mediaobject> icon expands the directory tree. Clicking on the name of the directory within the tree, sets it as the destination directory for the uploaded resource. Additionally, a user can set a language for the archive files, used in serving localized content. @@ -211,46 +243,56 @@ <title>Exporting folders</title> <para>Clicking on the "Export Folder" action, displays the export archive dialog window. </para> - <imageobject> - <imagedata fileref="images/admincms/ss_exportarchive.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/ss_exportarchive.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The export folder window allows a user to export entire directory structures as zip files. The system will aggregate all contents of a specific directory, and present to the user to download it. A user can select which source directory to export the resources from, by using the directory browser. Clicking the - <imageobject> - <imagedata fileref="images/admincms/plus.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/plus.png" format="PNG"/> + </imageobject> + </mediaobject> icon expands the directory tree. Clicking on the name of the directory within the tree, sets it as the source directory for the export resource. Additionally, a user can set a language for the files to be exported. </para> - <note>Version information is not exported. Only versions labeled "Live" are exported!</note> + <note><para>Version information is not exported. Only versions labeled "Live" are exported!</para></note> </sect2> <sect2 id="edittext"> <title>Editing Text/HTML Files</title> <para> <mediaobject> <imageobject> - <imagedata fileref="images/admincms/fileproperties.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/fileproperties.png" format="PNG"/> </imageobject> </mediaobject> Clicking on the "text/html"link, displays the edit file dialog window with the embedded WYSIWYG editor and directory browser. </para> - <imageobject> - <imagedata fileref="images/admincms/editfile.png" format="png" align="center" valign="middle"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/editfile.png" format="PNG"/> + </imageobject> + </mediaobject> <para>The edit file window allows a user to edit a text or HTML file using the embedded WYSIWYG HTML editor. The editor is a fully-functional HTML editor with a myriad of HTML functions. It also includes a preview - <imageobject> - <imagedata fileref="images/admincms/editorpreview.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/editorpreview.png" format="PNG"/> + </imageobject> + </mediaobject> button and a source view - <imageobject> - <imagedata fileref="images/admincms/editorsource.png" format="png"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/admincms/editorsource.png" format="PNG"/> + </imageobject> + </mediaobject> button. </para> <para>A user may specify at this point if he would like to make the new edit "live", or @@ -269,7 +311,7 @@ . <mediaobject> <imageobject> - <imagedata fileref="images/admincms/secure_menu.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/secure_menu.png" format="PNG"/> </imageobject> </mediaobject> </para> @@ -278,23 +320,23 @@ the selected node for selected Roles or specific Users. <mediaobject> <imageobject> - <imagedata fileref="images/admincms/secure_node.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/secure_node.png" format="PNG"/> </imageobject> </mediaobject> There are three main security settings for every node in the CMS. <itemizedlist> <listitem> - <emphasis roled="bold">Read Permissions:</emphasis> - Assigned roles/users can view the resource. + <para><emphasis role="bold">Read Permissions:</emphasis> + Assigned roles/users can view the resource.</para> </listitem> <listitem> - <emphasis roled="bold">Write Permissions:</emphasis> + <para><emphasis role="bold">Write Permissions:</emphasis> Assigned roles/users are able to edit the resource, or create nodes within it (as is the case for - folders) + folders)</para> </listitem> <listitem> - <emphasis roled="bold">Manage Permissions:</emphasis> - These permissions include: copy, move, delete, and exporting. + <para><emphasis role="bold">Manage Permissions:</emphasis> + These permissions include: copy, move, delete, and exporting.</para> </listitem> </itemizedlist> Adminsitrating and assigning permissions on a selected node is as simple as selecting which Roles and/or @@ -313,7 +355,7 @@ The content waiting in this queue is not accessible for "Live" usage. <mediaobject> <imageobject> - <imagedata fileref="images/admincms/workflow_file_view.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/workflow_file_view.png" format="PNG"/> </imageobject> </mediaobject> </para> @@ -322,7 +364,7 @@ in the flyout menu. The Pending Queue screen is as follows: <mediaobject> <imageobject> - <imagedata fileref="images/admincms/workflow_pending_items.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/admincms/workflow_pending_items.png" format="PNG"/> </imageobject> </mediaobject> </para> Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/dynamicity.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/dynamicity.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/dynamicity.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <chapter id="dynamicity"> <chapterinfo> <author> @@ -10,8 +12,8 @@ <title>Administration - Portal Object Management (Dynamicity)</title> <sect1> <title>Introduction</title> - <note>Viewing the Management Portlet is accomplished by logging in as an admin (admin/admin) and navigating to the - Admin portal (see <xref linkend="adminportal"/>). + <note><para>Viewing the Management Portlet is accomplished by logging in as an admin (admin/admin) and navigating to the + Admin portal (see <xref linkend="adminportal"/>).</para> </note> <para> The concept of dynamicity refers to the fact all portal objects can be dynamically modified at runtime, @@ -19,16 +21,16 @@ effect. In the scope of dynamicity, Portal objects are defined and can be altered as follows: <itemizedlist> <listitem> - Portal Instances: Multiple Portal instances can be launched at any time, secured, and skinned.</listitem> - <listitem>Pages: Multiple pages, composed of windows, can coexist inside a portal instance, secured and each - could have its own theme applied, if desired.</listitem> - <listitem>Portlets: Can be hot-deployed and will instantly register with the portal, appearing in the - management portlet.</listitem> - <listitem>Portlet Instances: Instances can be created/destroyed. Their preference variables can be modified - at runtime, instances assigned to windows and secured.</listitem> - <listitem>Windows: Windows can be secured, created/destroyed, and assigned to specific pages.</listitem> - <listitem>Themes/Layouts: Can be hot-deployed and will register with the portal, appearing the management - portlet, allowing for dynamic customization of any of the above components.</listitem> + <para>Portal Instances: Multiple Portal instances can be launched at any time, secured, and skinned.</para></listitem> + <listitem><para>Pages: Multiple pages, composed of windows, can coexist inside a portal instance, secured and each + could have its own theme applied, if desired.</para></listitem> + <listitem><para>Portlets: Can be hot-deployed and will instantly register with the portal, appearing in the + management portlet.</para></listitem> + <listitem><para>Portlet Instances: Instances can be created/destroyed. Their preference variables can be modified + at runtime, instances assigned to windows and secured.</para></listitem> + <listitem><para>Windows: Windows can be secured, created/destroyed, and assigned to specific pages.</para></listitem> + <listitem><para>Themes/Layouts: Can be hot-deployed and will register with the portal, appearing the management + portlet, allowing for dynamic customization of any of the above components.</para></listitem> </itemizedlist> </para>  - <permission> - <permission-name>Read</permission-name> - <role-name></role-name> - </permission> - </item> - </scheme> - ]]></programlisting> - This means that a user with role Users has the permission to add posts - in forums, a user with role Admins has the permissions to Admin anything, while an - anonymous user (not logged on), can only read. - </para> - <para>If you want users to only view a category named "myCategory" to a certain role "myRole", - here is an - <literal>item</literal> - that you can add: - <programlisting><![CDATA[ - <item> - <path>/myCategory</path> - <permission> - <permission-name>ReadCategory</permission-name> - <role-name>myRole</role-name> - </permission> - </item> - ]]></programlisting> - </para> - </sect1> -</chapter> Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/intro.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/intro.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/intro.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <chapter id="intro"> <chapterinfo> <author> @@ -26,7 +28,7 @@ relationship between the user and the portal itself. The hierarchy of portal objects is depicted as follows: <mediaobject> <imageobject> - <imagedata fileref="images/management/tree.gif" format="gif" align="center" valign="middle"/> + <imagedata fileref="images/management/tree.gif" format="GIF" scalefit="1"/> </imageobject> </mediaobject> </para> @@ -40,8 +42,8 @@ <ulink url="http://localhost:8080/portal/portal/default">http://localhost:8080/portal/portal/default</ulink> . </para> - <note>Consult your portal administrator for information on the available portal instances - some of which may - have restricted logins, not found in others. + <note><para>Consult your portal administrator for information on the available portal instances - some of which may + have restricted logins, not found in others.</para> </note> </sect2> <sect2 id="intro_portal_pages"> @@ -74,7 +76,7 @@ <para>Portlet Windows are found on Portal Pages and contain the HTML markup for a specific portlet instance. <mediaobject> <imageobject> - <imagedata fileref="images/intro/window.jpg" format="jpg" align="center" valign="middle"/> + <imagedata fileref="images/intro/window.jpg" format="JPG" scalefit="1"/> </imageobject> </mediaobject> The diagram above, shows the default JBoss Portal page with certain window-related items highlited (in red). @@ -109,9 +111,11 @@ <itemizedlist> <listitem> <para> - <imageobject> - <imagedata fileref="images/intro/ico_16_normal.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_16_normal.gif" format="GIF"/> + </imageobject> + </mediaobject> <emphasis role="bold">(Normal)</emphasis> - Normal window state, is the most common state for portlets (portlets in the above image are in the normal window state). The portlet window will occupy only @@ -120,19 +124,25 @@ </listitem> <listitem> <para> - <imageobject> - <imagedata fileref="images/intro/ico_16_minimize.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_16_minimize.gif" format="GIF"/> + </imageobject> + </mediaobject> <emphasis role="bold">(Minimized)</emphasis> - The portlet is instructed to render minimal-to-no markup. </para> </listitem> <listitem> - <imageobject> - <imagedata fileref="images/intro/ico_16_maximize.gif" format="gif"/> - </imageobject> - <emphasis role="bold">(Maximized)</emphasis> + <para> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_16_maximize.gif" format="GIF"/> + </imageobject> + </mediaobject> + <emphasis role="bold">(Maximized)</emphasis> - The portlet window can occupy as much space of real estate on the page. + </para> </listitem> </itemizedlist> </para> @@ -146,9 +156,11 @@ <itemizedlist> <listitem> <para> - <imageobject> - <imagedata fileref="images/intro/ico_edit.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_edit.gif" format="GIF"/> + </imageobject> + </mediaobject> <emphasis role="bold">(Edit)</emphasis> - Only visible to logged-in users. Allows a logged-in user to customize the portlet's preferences. @@ -156,9 +168,11 @@ </listitem> <listitem> <para> - <imageobject> - <imagedata fileref="images/intro/ico_cancel.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_cancel.gif" format="GIF"/> + </imageobject> + </mediaobject> <emphasis role="bold">(Return to View mode)</emphasis> - The button labeled 'Cancel' is only visible when a user is logged in and the portlet associated to the current window is in the Edit mode. This replaces the @@ -169,9 +183,11 @@ </listitem> <listitem> <para> - <imageobject> - <imagedata fileref="images/intro/ico_16_help.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_16_help.gif" format="GIF"/> + </imageobject> + </mediaobject> <emphasis role="bold">(Help)</emphasis> - Allows a user to access helpful information about the portlet, if it provides it (which is recommended). @@ -200,18 +216,18 @@ by clicking the tab associated to the page in the Navigation Tabs at the top of the page. <mediaobject> <imageobject> - <imagedata fileref="images/intro/tabs.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/tabs.png" format="PNG"/> </imageobject> </mediaobject> </para> - <note>Navigation tabs support sub-page navigation as well. By hovering over a tab + <note><para>Navigation tabs support sub-page navigation as well. By hovering over a tab with child Pages, it will display a flyout menu for those subpages: <mediaobject> <imageobject> - <imagedata fileref="images/intro/nav_sub.gif" format="gif" align="center" valign="middle"/> + <imagedata fileref="images/intro/nav_sub.gif" format="GIF"/> </imageobject> </mediaobject> - There are no pages with subpages in the default Portal installation. + There are no pages with subpages in the default Portal installation.</para> </note> <para> While you can use a Portal anonymously, it is much more interesting to do so while logged in, as you get the @@ -226,8 +242,7 @@ screen where you can enter your credentials: <mediaobject> <imageobject> - <imagedata fileref="images/intro/login_ss.gif" format="gif" align="center" - valign="middle"/> + <imagedata fileref="images/intro/login_ss.gif" format="GIF"/> </imageobject> </mediaobject> @@ -243,11 +258,11 @@ out. If you have access to other portal instances, they will be shown here as well. <mediaobject> <imageobject> - <imagedata fileref="images/intro/logged.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/logged.png" format="PNG"/> </imageobject> </mediaobject> - <note>If you login as an administrator, you will also be presented with a link to the - <emphasis>Admin</emphasis> portal. + <note><para>If you login as an administrator, you will also be presented with a link to the + <emphasis>Admin</emphasis> portal.</para> </note> </para> </sect2> @@ -258,7 +273,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/greetings.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/greetings.png" format="PNG"/> </imageobject> </mediaobject> Displays hard-coded links to downloading JBoss Portal, downloading @@ -269,13 +284,13 @@ </sect3> <sect3 id="intro_user_portlet"> <title>Identity User Portlet</title> - <note>Administrators should view <xref linkend="useradmin"/> for managing the portal user base. Only user - operations are covered in this section... + <note><para>Administrators should view <xref linkend="useradmin"/> for managing the portal user base. Only user + operations are covered in this section...</para> </note> <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/user_portlet.png" format="png" align="center" + <imagedata fileref="images/intro/user_portlet.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -285,7 +300,7 @@ is covered in the following sections. <mediaobject> <imageobject> - <imagedata fileref="images/intro/user_portlet_loggedin.png" format="png" align="center" + <imagedata fileref="images/intro/user_portlet_loggedin.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -301,7 +316,7 @@ information to create an account on the system: <mediaobject> <imageobject> - <imagedata fileref="images/intro/user_portlet_create.png" format="png" align="center" + <imagedata fileref="images/intro/user_portlet_create.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -319,7 +334,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/user_portlet_lost.png" format="png" align="center" + <imagedata fileref="images/intro/user_portlet_lost.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -349,7 +364,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/cms_portlet.gif" format="gif" align="center" valign="middle"/> + <imagedata fileref="images/intro/cms_portlet.gif" format="GIF" scalefit="1"/> </imageobject> </mediaobject> Portal includes a basic Content Management System (CMS). Portal provides a CMS portlet which allows users @@ -372,7 +387,7 @@ and retrieve the Spanish version of that file. If a Spanish version is not found, it will then try and retrieve the default language version set for the CMSPortlet (set to English, by default). </para> - <note>Administrators should read <xref linkend="admincmsPortlet"/> for managing the data in the CMS.</note> + <note><para>Administrators should read <xref linkend="admincmsPortlet"/> for managing the data in the CMS.</para></note> </sect3> </sect2> <sect2> @@ -380,7 +395,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/newspage.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/newspage.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> The News Page contains 2 portlets displaying news from common internet feeds. An open internet @@ -391,26 +406,27 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/newsportlet.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/newsportlet.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> The News Portlet retrieves an RSS news feed from a URL and displays it as HTML to the user. </para> <para>Additionally, a logged-in user is able to modify her preference in RSS feed source by using the Portlet's Edit Mode (click - <imageobject> - <imagedata fileref="images/intro/ico_edit.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_edit.gif" format="GIF"/> + </imageobject> + </mediaobject> ). Once the form is submitted, this property will be saved in the user's preference, so she will always see the same news source, when logged in. <mediaobject> <imageobject> - <imagedata fileref="images/intro/newsportlet_edit.png" format="png" align="center" - valign="middle"/> + <imagedata fileref="images/intro/newsportlet_edit.png" format="PNG"/> </imageobject> </mediaobject> </para> - <note>This portlet is capable of handling most RSS 1.0 and RSS 2.0 feeds.</note> + <note><para>This portlet is capable of handling most RSS 1.0 and RSS 2.0 feeds.</para></note> </sect3> </sect2> <sect2> @@ -423,7 +439,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/intro/weatherportlet.gif" format="gif" align="center" valign="middle"/> + <imagedata fileref="images/intro/weatherportlet.gif" format="GIF"/> </imageobject> </mediaobject> The Weather Portlet retrieves an RSS weather feed, based on a key (commonly a US Postal Code), and @@ -431,14 +447,16 @@ </para> <para>Additionally, a logged-in user is able to modify her preference in location by using the Portlet's Edit Mode (click - <imageobject> - <imagedata fileref="images/intro/ico_edit.gif" format="gif"/> - </imageobject> + <mediaobject> + <imageobject> + <imagedata fileref="images/intro/ico_edit.gif" format="GIF"/> + </imageobject> + </mediaobject> ). Any valid US Postal Code can be input here. Once the form is submitted, this property will be saved in the user's preference, so she will always see the same weather data for her location, when logged in. <mediaobject> <imageobject> - <imagedata fileref="images/intro/weatherportlet_edit.gif" format="gif" align="center" + <imagedata fileref="images/intro/weatherportlet_edit.gif" format="GIF" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -456,7 +474,7 @@ <para>Enter your city name in the location field, found on the page: <mediaobject> <imageobject> - <imagedata fileref="images/intro/weather_config1.png" format="png" align="center" + <imagedata fileref="images/intro/weather_config1.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -467,7 +485,7 @@ (<emphasis>Marseille, France</emphasis>, in this case): <mediaobject> <imageobject> - <imagedata fileref="images/intro/weather_config2.gif" format="gif" align="center" + <imagedata fileref="images/intro/weather_config2.gif" format="GIF" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -478,7 +496,7 @@ in this case): <mediaobject> <imageobject> - <imagedata fileref="images/intro/weather_config3.gif" format="gif" align="center" + <imagedata fileref="images/intro/weather_config3.gif" format="GIF" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -489,14 +507,14 @@ this case): <mediaobject> <imageobject> - <imagedata fileref="images/intro/weather_config4.png" format="png" align="center" + <imagedata fileref="images/intro/weather_config4.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> Hit <emphasis>submit</emphasis>... <mediaobject> <imageobject> - <imagedata fileref="images/intro/weather_config5.png" format="png" align="center" + <imagedata fileref="images/intro/weather_config5.png" format="PNG" align="center" valign="middle"/> </imageobject> </mediaobject> @@ -513,7 +531,7 @@ <emphasis>Dashboard</emphasis> link at the top-right of the portal page. Note how the links changed. <mediaobject> <imageobject> - <imagedata fileref="images/intro/dashboard.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/dashboard.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> The personal dashboard allows users to customize their portal pages however they like, and all changes will be @@ -527,7 +545,7 @@ This will clone the page and add it to your personal dashboard as a page with the same name. <mediaobject> <imageobject> - <imagedata fileref="images/intro/dashboard_copy_to.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/dashboard_copy_to.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> </para> @@ -537,8 +555,7 @@ You can configure your dashboard by using the top-right menu item labeled <emphasis>'Configure dashboard'</emphasis>: <mediaobject> <imageobject> - <imagedata fileref="images/intro/dashboard_configure.png" format="png" align="center" - valign="middle"/> + <imagedata fileref="images/intro/dashboard_configure.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> </para> @@ -553,8 +570,8 @@ page in the <emphasis>Create New Page</emphasis> form at the top left of the screen. <note> <itemizedlist> - <listitem>Page names must be unique.</listitem> - <listitem>Page names cannot be blank.</listitem> + <listitem><para>Page names must be unique.</para></listitem> + <listitem><para>Page names cannot be blank.</para></listitem> </itemizedlist> </note> Upon creating a new page, the screen will refresh and allow a user to customize the new page. @@ -565,12 +582,11 @@ at the bottom of the screen. We will note that users are not able to delete the default dashboard page. <mediaobject> <imageobject> - <imagedata fileref="images/intro/dashboard_deletepage.png" format="png" align="center" - valign="middle"/> + <imagedata fileref="images/intro/dashboard_deletepage.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> <warning> - Deleted pages are NOT recoverable. This change is permanent! + <para>Deleted pages are NOT recoverable. This change is permanent!</para> </warning> </para> </sect3> @@ -583,8 +599,7 @@ of the Admin portal, which we will look at in <xref linkend="page_configuration"/> <mediaobject> <imageobject> - <imagedata fileref="images/intro/dashboard_assignportlets.png" format="png" align="center" - valign="middle"/> + <imagedata fileref="images/intro/dashboard_assignportlets.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> </para> @@ -594,24 +609,24 @@ <sect1 id="adminportal"> <title>Admin Portal</title> <para> - <note>You <emphasis role="bold">must be</emphasis> logged in as an administrator, or have proper privileges - to see this portal. + <note><para>You <emphasis role="bold">must be</emphasis> logged in as an administrator, or have proper privileges + to see this portal.</para> </note> <mediaobject> <imageobject> - <imagedata fileref="images/intro/adminportal.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/intro/adminportal.png" format="PNG" scalefit="1"/> </imageobject> </mediaobject> The Admin Portal's purpose is to allow an administrator to manage all aspects of the portal. Follow the links for in-depth reviews of these functions: <itemizedlist> - <listitem>Users/Roles (See: <xref linkend="useradmin"/>, <xref linkend="roleadmin"/>)</listitem> - <listitem>Content Management System (See: <xref linkend="admincmsPortlet"/>)</listitem> - <listitem>Portal Objects (themes, layouts, portal instances, pages, windows, security, and deployed - portlets) (See: <xref linkend="dynamicity"/>)</listitem> - <listitem>WSRP (See the + <listitem><para>Users/Roles (See: <xref linkend="useradmin"/>, <xref linkend="roleadmin"/>)</para></listitem> + <listitem><para>Content Management System (See: <xref linkend="admincmsPortlet"/>)</para></listitem> + <listitem><para>Portal Objects (themes, layouts, portal instances, pages, windows, security, and deployed + portlets) (See: <xref linkend="dynamicity"/>)</para></listitem> + <listitem><para>WSRP (See the <ulink url="http://docs.jboss.com/jbportal/v2.6/reference-guide/en/html/wsrp.html">WSRP chapter</ulink> - in the Reference Guide for more information) + in the Reference Guide for more information)</para> </listitem> </itemizedlist> </para> Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/target.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/target.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/target.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,3 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <preface id="target"> <title>Target Audience</title> <para>This document is intended for those using JBoss Portal as End-Users. This is a "Where do I Click?" Guide.</para> Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/user_role.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/user_role.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/en/modules/user_role.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <chapter id="userPortlet"> <chapterinfo> <author> @@ -26,7 +28,7 @@ For role management please see <xref linkend="roleadmin"/>. <mediaobject> <imageobject> - <imagedata fileref="images/role/memberspage.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/memberspage.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -44,7 +46,7 @@ the mode used in the User management portlet. <mediaobject> <imageobject> - <imagedata fileref="images/role/user_management.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/user_management.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -60,7 +62,7 @@ criteria. <mediaobject> <imageobject> - <imagedata fileref="images/role/user_su.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/user_su.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -77,7 +79,7 @@ link on the search page will allow you to edit a user's profile data, and even reset his password. <mediaobject> <imageobject> - <imagedata fileref="images/role/edit_profile.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/edit_profile.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -94,7 +96,7 @@ link in the search page allows you to modify the roles a specific user belongs to. <mediaobject> <imageobject> - <imagedata fileref="images/role/assign_roles.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/assign_roles.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -112,7 +114,7 @@ link on the main UserPortlet view, allows administrators to instantly create new users. <mediaobject> <imageobject> - <imagedata fileref="images/role/create_user.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/create_user.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -132,7 +134,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/role/user_pending.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/user_pending.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -142,8 +144,8 @@ </mediaobject> </para> <note> - By default the subscription modes are set to <emphasis>automatic</emphasis> and users will be created automatically. Furthermore the - link to <emphasis>Show pending registrations</emphasis> will only be displayed if a user needs to be approved by the administrator. + <para>By default the subscription modes are set to <emphasis>automatic</emphasis> and users will be created automatically. Furthermore the + link to <emphasis>Show pending registrations</emphasis> will only be displayed if a user needs to be approved by the administrator.</para> </note> </sect3> </sect2> @@ -161,7 +163,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/role/role_management.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/role_management.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -184,7 +186,7 @@ link in the portlet. <mediaobject> <imageobject> - <imagedata fileref="images/role/create_role.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/create_role.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -207,7 +209,7 @@ Editing roles, is accomplished by clicking on <emphasis>Edit role</emphasis> in the row of the role you want to edit. <mediaobject> <imageobject> - <imagedata fileref="images/role/edit_role.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/edit_role.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> @@ -226,7 +228,7 @@ link at the role management page for the role you would like to modify. <mediaobject> <imageobject> - <imagedata fileref="images/role/role_members.png" format="png" align="center" valign="middle"/> + <imagedata fileref="images/role/role_members.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para> Modified: docs/branches/JBoss_Portal_Branch_2_7/userGuide/pom.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/userGuide/pom.xml 2008-07-08 08:35:00 UTC (rev 11341) +++ docs/branches/JBoss_Portal_Branch_2_7/userGuide/pom.xml 2008-07-08 10:54:21 UTC (rev 11342) @@ -5,11 +5,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss</groupId> - <artifactId>documentation</artifactId> - <version>1.0</version> + <groupId>org.jboss.portal</groupId> + <artifactId>jboss-portal-docs-parent</artifactId> + <version>1-SNAPSHOT</version> </parent> - + + <groupId>org.jboss.portal</groupId> + <artifactId>user-guide-${translation}</artifactId> + <version>2.7.0</version> + <packaging>jdocbook</packaging> + <name>User_Guide_(${translation})</name> + <repositories> <repository> <id>repository.jboss.org</id> @@ -58,10 +64,4 @@ </pluginRepository> </pluginRepositories> - <groupId>org.jboss.portal</groupId> - <artifactId>user-guide-${translation}</artifactId> - <version>2.7.0</version> - <packaging>jdocbook</packaging> - <name>User_Guide_(${translation})</name> - </project>

16 years

1
0
0 / 0

JBoss Portal SVN: r11341 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-07-08 04:35:00 -0400 (Tue, 08 Jul 2008) New Revision: 11341 Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java Log: Commenting out code that doesn't compile - Chris? Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java 2008-07-07 23:03:37 UTC (rev 11340) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPConsumerBaseTest.java 2008-07-08 08:35:00 UTC (rev 11341) @@ -188,7 +188,7 @@ public void setStrict(boolean strict) { this.strict = strict; - producer.setUseStrictMode(strict); + //producer.setUseStrictMode(strict); WSRPValidator.setStrict(strict); }

16 years

1
0
0 / 0

JBoss Portal SVN: r11340 - modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-07-07 19:03:37 -0400 (Mon, 07 Jul 2008) New Revision: 11340 Added: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/UpdateObject.java Log: forgot to add a class a few commits ago... Added: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/UpdateObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/UpdateObject.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/UpdateObject.java 2008-07-07 23:03:37 UTC (rev 11340) @@ -0,0 +1,103 @@ +/****************************************************************************** + * 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.presentation.ajax.client.model.update; + +import java.util.Set; +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class UpdateObject extends ModelUpdate +{ + + /** . */ + private String objectId; + + /** . */ + private Set removedProperties; + + /** . */ + private Map updatedProperties; + + /** . */ + private Map addedProperties; + + public UpdateObject(String objectId, Set removedProperties, Map updatedProperties, Map addedProperties) + { + this.objectId = objectId; + this.removedProperties = removedProperties; + this.updatedProperties = updatedProperties; + this.addedProperties = addedProperties; + } + + public UpdateObject() + { + } + + public String getObjectId() + { + return objectId; + } + + public void setObjectId(String objectId) + { + this.objectId = objectId; + } + + public Set getRemovedProperties() + { + return removedProperties; + } + + public void setRemovedProperties(Set removedProperties) + { + this.removedProperties = removedProperties; + } + + public Map getUpdatedProperties() + { + return updatedProperties; + } + + public void setUpdatedProperties(Map updatedProperties) + { + this.updatedProperties = updatedProperties; + } + + public Map getAddedProperties() + { + return addedProperties; + } + + public void setAddedProperties(Map addedProperties) + { + this.addedProperties = addedProperties; + } + + public String toString() + { + return "UpdateObject[objectId=" + objectId + "]"; + } +}

16 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits July 2008