JBoss Portal SVN: r11259 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-07-02 05:19:08 -0400 (Wed, 02 Jul 2008)
New Revision: 11259
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
- Fix improper XML (comment in comment doesn't work so well ^_^).
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-02 08:18:37 UTC (rev 11258)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-02 09:19:08 UTC (rev 11259)
@@ -26,20 +26,20 @@
<!-- Server configuration service -->
<mbean
- code="org.jboss.portal.server.config.ServerConfigService"
- name="portal:service=ServerConfig"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.config.ServerConfigService"
+ name="portal:service=ServerConfig"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
<!-- DTD repository -->
<mbean
- code="org.jboss.portal.server.impl.xml.EntityResolverService"
- name="portal:service=EntityResolver"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.xml.EntityResolverService"
+ name="portal:service=EntityResolver"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DTDMapping">
<properties>
@@ -53,119 +53,123 @@
<!-- Runtime context for running portlet container -->
<mbean
- code="org.jboss.portal.web.jboss.JBossWebContext"
- name="portal:service=ServletContainerFactory"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.web.jboss.JBossWebContext"
+ name="portal:service=ServletContainerFactory"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- Portal security services-->
<mbean
- code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
- name="portal:service=AuthorizationDomainRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
+ name="portal:service=AuthorizationDomainRegistry"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
- name="portal:service=PortalAuthorizationManagerFactory"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
+ name="portal:service=PortalAuthorizationManagerFactory"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="AuthorizationDomainRegistry"
- proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ optional-attribute-name="AuthorizationDomainRegistry"
+ proxy-type="attribute">portal:service=AuthorizationDomainRegistry
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
- name="portal:service=PortletSecurityService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
+ name="portal:service=PortletSecurityService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
<depends
- optional-attribute-name="AuthorizationDomainRegistry"
- proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends
+ optional-attribute-name="AuthorizationDomainRegistry"
+ proxy-type="attribute">portal:service=AuthorizationDomainRegistry
+ </depends>
</mbean>
<!-- Server stack -->
<mbean
- code="org.jboss.portal.server.aspects.server.SessionLockInterceptor"
- name="portal:service=Interceptor,type=Server,name=SessionLock"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.aspects.server.SessionLockInterceptor"
+ name="portal:service=Interceptor,type=Server,name=SessionLock"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
- name="portal:service=Interceptor,type=Server,name=Transaction"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
+ name="portal:service=Interceptor,type=Server,name=Transaction"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor"
- name="portal:service=Interceptor,type=Server,name=UserEvent"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor"
+ name="portal:service=Interceptor,type=Server,name=UserEvent"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.aspects.server.SignOutInterceptor"
- name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.aspects.server.SignOutInterceptor"
+ name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="ServletContainerFactory"
- proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+ optional-attribute-name="ServletContainerFactory"
+ proxy-type="attribute">portal:service=ServletContainerFactory
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.server.UserInterceptor"
- name="portal:service=Interceptor,type=Server,name=User"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.server.UserInterceptor"
+ name="portal:service=Interceptor,type=Server,name=User"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="CacheUser">true</attribute>
<depends>portal:service=Module,type=IdentityServiceController</depends>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
- name="portal:service=Interceptor,type=Server,name=Locale"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
+ name="portal:service=Interceptor,type=Server,name=Locale"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.server.PortalContextPathInterceptor"
- name="portal:service=Interceptor,type=Server,name=PortalContextPath"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.server.PortalContextPathInterceptor"
+ name="portal:service=Interceptor,type=Server,name=PortalContextPath"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
- name="portal:service=Interceptor,type=Server,name=ContentType"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
+ name="portal:service=Interceptor,type=Server,name=ContentType"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.server.IdentityCacheInterceptor"
- name="portal:service=Interceptor,type=Server,name=IdentityCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.server.IdentityCacheInterceptor"
+ name="portal:service=Interceptor,type=Server,name=IdentityCache"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Server"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Server"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=SessionLock</depends-list-element>
@@ -182,27 +186,28 @@
<!-- Command stack -->
<mbean
- code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
- name="portal:service=Interceptor,type=Command,name=Control"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Control"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PortalControlPolicy"
- proxy-type="attribute">portal:service=ControlPolicy,type=Portal</depends>
+ optional-attribute-name="PortalControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Portal
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
- name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
+ name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
- name="portal:service=Interceptor,type=Command,name=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!--
this tag has to be set when context root of portal-ajax is
@@ -211,76 +216,80 @@
<attribute name="TargetContextPath">/portal-ajax</attribute> -->
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor"
- name="portal:service=Interceptor,type=Command,name=NavigationalState"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor"
+ name="portal:service=Interceptor,type=Command,name=NavigationalState"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!--
This interceptor cleans the Navigation state of windows when the user call a new page or refresh the page
-->
<mbean
- code="org.jboss.portal.core.aspects.controller.CleanNSInterceptor"
- name="portal:service=Interceptor,type=Command,name=CleanNS"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.CleanNSInterceptor"
+ name="portal:service=Interceptor,type=Command,name=CleanNS"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
- name="portal:service=Interceptor,type=Command,name=PortalNode"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PortalNode"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
- name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
- name="portal:service=Interceptor,type=Command,name=PageCustomizer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PageCustomizer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="TargetContextPath">/portal-core</attribute>
<attribute name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute>
<attribute name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute>
- <!-- Overrides the value of core.login.namespace in config.xml -->
- <!-- attribute name="LoginNamespace">dashboard</attribute -->
+ <!-- Overrides the value of core.login.namespace in config.xml --><!-- attribute name="LoginNamespace">dashboard</attribute -->
<depends
- optional-attribute-name="Config"
- proxy-type="attribute">portal:service=ServerConfig</depends>
+ optional-attribute-name="Config"
+ proxy-type="attribute">portal:service=ServerConfig
+ </depends>
<depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
-
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
+
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
- name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
+ name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="ListenerRegistry"
- proxy-type="attribute">portal:service=ListenerRegistry</depends>
+ optional-attribute-name="ListenerRegistry"
+ proxy-type="attribute">portal:service=ListenerRegistry
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Command"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Command"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element>
@@ -297,140 +306,145 @@
<!-- Instance stack -->
<mbean
- code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Instance"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Instance"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization
+ </depends-list-element>
</depends-list>
</mbean>
<!-- Producer stack -->
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Valve"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Valve"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="ServletContainerFactory"
- proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+ optional-attribute-name="ServletContainerFactory"
+ proxy-type="attribute">portal:service=ServletContainerFactory
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.bridge.BridgeInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Bridge"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.bridge.BridgeInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Bridge"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=WindowStates"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=WindowStates"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Modes"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Modes"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Transaction"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Transaction"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Header"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Header"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization
+ </depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element>
@@ -443,37 +457,63 @@
<!-- Theme and layout services -->
<mbean
- code="org.jboss.portal.theme.impl.ThemeServiceImpl"
- name="portal:service=ThemeService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.theme.impl.ThemeServiceImpl"
+ name="portal:service=ThemeService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DefaultThemeName">renaissance</attribute>
</mbean>
<mbean
- code="org.jboss.portal.theme.impl.LayoutServiceImpl"
- name="portal:service=LayoutService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.theme.impl.LayoutServiceImpl"
+ name="portal:service=LayoutService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DefaultLayoutName">generic</attribute>
<attribute name="DefaultRenderSetName">divRenderer</attribute>
</mbean>
<mbean
- code="org.jboss.portal.theme.impl.PageServiceImpl"
- name="portal:service=PageService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.theme.impl.PageServiceImpl"
+ name="portal:service=PageService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="LayoutService"
- proxy-type="attribute">portal:service=LayoutService</depends>
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService
+ </depends>
<depends
- optional-attribute-name="ThemeService"
- proxy-type="attribute">portal:service=ThemeService</depends>
+ optional-attribute-name="ThemeService"
+ proxy-type="attribute">portal:service=ThemeService
+ </depends>
</mbean>
<!--
+ Node locking scheme possible values (NodeLockingScheme attribute):
+ OPTIMISTIC
+ PESSIMISTIC (default)
+
+
+ Isolation level possible values (IsolationLevel attribute):
+ SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+
+ Note that this attribute is IGNORED if your NodeLockingScheme attribute is set at OPTIMISTIC.
+
+ Cache modes possible values (CacheMode attribute):
+ LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+
+ If you use REPL_SYNC and a UDP-based ClusterConfig we recommend you comment out the FC (flow control)
+ protocol in the ClusterConfig section below.
+ --><!--
| Uncomment in clustered mode : replicated cache for hibernate
@portal.single.xml.close@
<mbean code="org.jboss.cache.TreeCache"
@@ -485,33 +525,9 @@
org.jboss.cache.JBossTransactionManagerLookup
</attribute>
- <!--
- Node locking scheme:
- OPTIMISTIC
- PESSIMISTIC (default)
- -->
- <!--<attribute name="NodeLockingScheme">OPTIMISTIC</attribute>-->
- <!--
- Note that this attribute is IGNORED if your NodeLockingScheme above is OPTIMISTIC.
- Isolation level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
+ <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- If you use REPL_SYNC and a UDP-based ClusterConfig
- we recommend you comment out the FC (flow control)
- protocol in the ClusterConfig section below.
- -->
<attribute name="CacheMode">REPL_ASYNC</attribute>
<attribute name="ClusterName">
@@ -594,10 +610,10 @@
<!-- Session factories -->
<mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
@@ -609,10 +625,10 @@
<attribute name="JNDIName">java:/portal/IdentitySessionFactory</attribute>
</mbean>
<mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=Instance"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate,type=Instance"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
@@ -624,10 +640,10 @@
<attribute name="JNDIName">java:/portal/InstanceSessionFactory</attribute>
</mbean>
<mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate,type=PortalObject"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
@@ -638,10 +654,10 @@
<attribute name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute>
</mbean>
<mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=Portlet"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate,type=Portlet"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
@@ -654,22 +670,23 @@
<!--Identity-->
<mbean
- code="org.jboss.portal.identity.service.IdentityEventManagerService"
- name="portal:service=IdentityEventManager"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.identity.service.IdentityEventManagerService"
+ name="portal:service=IdentityEventManager"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl"
- name="portal:service=Module,type=IdentityServiceController"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl"
+ name="portal:service=Module,type=IdentityServiceController"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<depends
- optional-attribute-name="IdentityEventBroadcaster"
- proxy-type="attribute">portal:service=IdentityEventManager</depends>
+ optional-attribute-name="IdentityEventBroadcaster"
+ proxy-type="attribute">portal:service=IdentityEventManager
+ </depends>
<attribute name="JndiName">java:/portal/IdentityServiceController</attribute>
<attribute name="RegisterMBeans">true</attribute>
<attribute name="ConfigFile">conf/identity/identity-config.xml</attribute>
@@ -677,10 +694,10 @@
</mbean>
<mbean
- code="org.jboss.portal.core.impl.mail.MailModuleImpl"
- name="portal:service=Module,type=Mail"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.mail.MailModuleImpl"
+ name="portal:service=Module,type=Mail"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss:service=Mail</depends>
<depends>portal:service=Module,type=IdentityServiceController</depends>
@@ -695,8 +712,8 @@
</mbean>
<mbean
- code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="portal:service=JAASLoginModule">
+ code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="portal:service=JAASLoginModule">
<depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
<depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
<attribute name="AuthConfig">conf/login-config.xml</attribute>
@@ -704,10 +721,10 @@
<!-- a service to schedule activity of the users -->
<mbean
- code="org.jboss.portal.core.identity.UsersActivityStatsServiceImpl"
- name="portal:service=Module,type=UsersActivityStatsService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.identity.UsersActivityStatsServiceImpl"
+ name="portal:service=Module,type=UsersActivityStatsService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!--
|Uncomment in clustered mode : broadcaster will spread info about user activity in cluster
@@ -723,7 +740,7 @@
|Uncomment in clustered mode : broadcaster will spread info about user activity in cluster
@portal.single.xml.close@
- <mbean code="org.jboss.portal.core.identity.UserActivityNotificationBroadcaster"
+ <mbean code="org.jboss.portal.core.identity.UserActivityNotificationBroadcaster"
name="portal:service=HAUserActivityNotificationBroadcaster">
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
</mbean>
@@ -733,29 +750,29 @@
<!-- Registries -->
<mbean
- code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"
- name="portal:service=WebAppRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"
+ name="portal:service=WebAppRegistry"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- Listener registry -->
<mbean
- code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
- name="portal:service=ListenerRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
+ name="portal:service=ListenerRegistry"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- The different containers -->
<mbean
- code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"
- name="portal:service=InstanceContainerContext"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"
+ name="portal:service=InstanceContainerContext"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Instance</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
@@ -763,542 +780,609 @@
</mbean>
<mbean
- code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"
- name="portal:container=Instance"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"
+ name="portal:container=Instance"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="ContainerContext"
- proxy-type="attribute">portal:service=InstanceContainerContext</depends>
+ optional-attribute-name="ContainerContext"
+ proxy-type="attribute">portal:service=InstanceContainerContext
+ </depends>
<depends
- optional-attribute-name="StackFactory"
- proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance
+ </depends>
<depends
- optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Federating
+ </depends>
<depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
<depends
- optional-attribute-name="AuthorizationDomainRegistry"
- proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ optional-attribute-name="AuthorizationDomainRegistry"
+ proxy-type="attribute">portal:service=AuthorizationDomainRegistry
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
- name="portal:container=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
+ name="portal:container=PortalObject"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=PortalObject</depends>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
<depends
- optional-attribute-name="AuthorizationDomainRegistry"
- proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
<depends
- optional-attribute-name="ContentProviderRegistry"
- proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ optional-attribute-name="AuthorizationDomainRegistry"
+ proxy-type="attribute">portal:service=AuthorizationDomainRegistry
+ </depends>
+ <depends
+ optional-attribute-name="ContentProviderRegistry"
+ proxy-type="attribute">portal:service=ContentProviderRegistry
+ </depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
<attribute name="CacheNaturalId">true</attribute>
</mbean>
<!-- Customization manager -->
<mbean
- code="org.jboss.portal.core.impl.model.CustomizationManagerService"
- name="portal:service=CustomizationManager"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.model.CustomizationManagerService"
+ name="portal:service=CustomizationManager"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance
+ </depends>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
<depends>portal:service=Module,type=IdentityServiceController</depends>
<attribute name="DashboardContextId">dashboard</attribute>
</mbean>
<!-- The content provider framework -->
<mbean
- code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
- name="portal:service=ContentProviderRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
+ name="portal:service=ContentProviderRegistry"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
- name="portal:service=ContentRenderer,type=portlet"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
+ name="portal:service=ContentRenderer,type=portlet"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ContentType">portlet</attribute>
<depends
- optional-attribute-name="Registry"
- proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ optional-attribute-name="Registry"
+ proxy-type="attribute">portal:service=ContentProviderRegistry
+ </depends>
<depends
- optional-attribute-name="CustomizationManager"
- proxy-type="attribute">portal:service=CustomizationManager</depends>
+ optional-attribute-name="CustomizationManager"
+ proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance
+ </depends>
<depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
</mbean>
<!-- Integrate identity -->
<mbean
- code="org.jboss.portal.core.identity.DashboardBridge"
- name="portal:service=IdentityDashboardBridge"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.identity.DashboardBridge"
+ name="portal:service=IdentityDashboardBridge"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="IdentityEventEmitter"
- proxy-type="attribute">portal:service=IdentityEventManager</depends>
+ optional-attribute-name="IdentityEventEmitter"
+ proxy-type="attribute">portal:service=IdentityEventManager
+ </depends>
<depends
- optional-attribute-name="CustomizationManager"
- proxy-type="attribute">portal:service=CustomizationManager</depends>
+ optional-attribute-name="CustomizationManager"
+ proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.identity.SecurityBridge"
- name="portal:service=IdentitySecurityBridge"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.identity.SecurityBridge"
+ name="portal:service=IdentitySecurityBridge"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="IdentityEventEmitter"
- proxy-type="attribute">portal:service=IdentityEventManager</depends>
+ optional-attribute-name="IdentityEventEmitter"
+ proxy-type="attribute">portal:service=IdentityEventManager
+ </depends>
<depends
- optional-attribute-name="DynamicLoginConfig"
- proxy-type="attribute">portal:service=JAASLoginModule</depends>
+ optional-attribute-name="DynamicLoginConfig"
+ proxy-type="attribute">portal:service=JAASLoginModule
+ </depends>
</mbean>
<!-- Command factories -->
<mbean
- code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
- name="portal:commandFactory=Delegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
+ name="portal:commandFactory=Delegating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
- name="portal:commandFactory=DefaultPortal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+ name="portal:commandFactory=DefaultPortal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="NextFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ optional-attribute-name="NextFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper"
- name="portal:service=PortalObjectPathMapper,type=Default"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper"
+ name="portal:service=PortalObjectPathMapper,type=Default"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
<attribute name="Namespace"><![CDATA[]]></attribute>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
- name="portal:commandFactory=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+ name="portal:commandFactory=PortalObject"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Mapper"
- proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
+ optional-attribute-name="Mapper"
+ proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=portal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=portal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/portal</attribute>
<depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=PortalObject
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.command.mapper.SignOutCommandFactoryService"
- name="portal:commandFactory=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.SignOutCommandFactoryService"
+ name="portal:commandFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=signout"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=signout"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/signout</attribute>
<depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=SignOut</depends>
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=SignOut
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper"
- name="portal:service=PortalObjectPathMapper,type=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper"
+ name="portal:service=PortalObjectPathMapper,type=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="CustomizationManager"
- proxy-type="attribute">portal:service=CustomizationManager</depends>
+ optional-attribute-name="CustomizationManager"
+ proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
<depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
- name="portal:commandFactory=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+ name="portal:commandFactory=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Mapper"
- proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
+ optional-attribute-name="Mapper"
+ proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/dashboard</attribute>
<depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=Dashboard</depends>
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=Dashboard
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory"
- name="portal:commandFactory=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory"
+ name="portal:commandFactory=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/ajax</attribute>
<depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=Ajax</depends>
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=Ajax
+ </depends>
</mbean>
<!-- URL factories -->
<mbean
- code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
- name="portal:urlFactory=Delegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
+ name="portal:urlFactory=Delegating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
- name="portal:urlFactory=PortalObject,type=Default"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+ name="portal:urlFactory=PortalObject,type=Default"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Namespace"><![CDATA[]]></attribute>
<attribute name="Path">/portal</attribute>
<depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="Mapper"
- proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
+ optional-attribute-name="Mapper"
+ proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.controller.command.mapper.SignOutURLFactory"
- name="portal:urlFactory=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.command.mapper.SignOutURLFactory"
+ name="portal:urlFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/signout</attribute>
<depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
- name="portal:urlFactory=PortalObject,type=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+ name="portal:urlFactory=PortalObject,type=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Namespace">dashboard</attribute>
<attribute name="Path">/dashboard</attribute>
<depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="Mapper"
- proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
+ optional-attribute-name="Mapper"
+ proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard
+ </depends>
</mbean>
<!-- The federating portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
- name="portal:service=PortletInvoker,type=Federating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
+ name="portal:service=PortletInvoker,type=Federating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- The portlet container invoker -->
<mbean
- code="org.jboss.portal.portlet.container.PortletContainerInvoker"
- name="portal:service=PortletInvoker,type=Container"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+ name="portal:service=PortletInvoker,type=Container"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="StackFactory"
- proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer
+ </depends>
<depends
- optional-attribute-name="Registry"
- proxy-type="attribute">portal:service=WebAppRegistry</depends>
+ optional-attribute-name="Registry"
+ proxy-type="attribute">portal:service=WebAppRegistry
+ </depends>
</mbean>
<!-- The producer portlet invoker -->
<mbean
- code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
- name="portal:service=PersistenceManager,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
+ name="portal:service=PersistenceManager,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Portlet</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
</mbean>
<mbean
- code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
- name="portal:service=StateManagementPolicy,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
+ name="portal:service=StateManagementPolicy,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="PersistLocally">true</attribute>
</mbean>
<mbean
- code="org.jboss.portal.portlet.impl.state.StateConverterV0"
- name="portal:service=StateConverter,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.impl.state.StateConverterV0"
+ name="portal:service=StateConverter,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
- name="portal:service=PortletInvoker,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
+ name="portal:service=PortletInvoker,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Container
+ </depends>
<depends
- optional-attribute-name="PersistenceManager"
- proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+ optional-attribute-name="PersistenceManager"
+ proxy-type="attribute">portal:service=PersistenceManager,type=Producer
+ </depends>
<depends
- optional-attribute-name="StateManagementPolicy"
- proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+ optional-attribute-name="StateManagementPolicy"
+ proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer
+ </depends>
<depends
- optional-attribute-name="StateConverter"
- proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
+ optional-attribute-name="StateConverter"
+ proxy-type="attribute">portal:service=StateConverter,type=Producer
+ </depends>
</mbean>
<!-- Register the state portlet invoker on the federating portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService"
- name="portal:service=PortletInvokerRegistration,id=local"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService"
+ name="portal:service=PortletInvokerRegistration,id=local"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Id">local</attribute>
<depends
- optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Producer
+ </depends>
<depends
- optional-attribute-name="FederatingPortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ optional-attribute-name="FederatingPortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Federating
+ </depends>
</mbean>
<!-- The classic response handler -->
<mbean
- code="org.jboss.portal.core.controller.classic.ClassicResponseHandler"
- name="portal:service=ResponseHandler,type=Classic"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.classic.ClassicResponseHandler"
+ name="portal:service=ResponseHandler,type=Classic"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- The ajax response handler -->
<mbean
- code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler"
- name="portal:service=ResponseHandler,type=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler"
+ name="portal:service=ResponseHandler,type=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PageService"
- proxy-type="attribute">portal:service=PageService</depends>
+ optional-attribute-name="PageService"
+ proxy-type="attribute">portal:service=PageService
+ </depends>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<!-- The response handler selector -->
<mbean
- code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
- name="portal:service=ResponseHandler,type=Selector"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
+ name="portal:service=ResponseHandler,type=Selector"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="ClassicResponseHandler"
- proxy-type="attribute">portal:service=ResponseHandler,type=Classic</depends>
+ optional-attribute-name="ClassicResponseHandler"
+ proxy-type="attribute">portal:service=ResponseHandler,type=Classic
+ </depends>
<depends
- optional-attribute-name="AjaxResponseHandler"
- proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends>
+ optional-attribute-name="AjaxResponseHandler"
+ proxy-type="attribute">portal:service=ResponseHandler,type=Ajax
+ </depends>
</mbean>
<!-- -->
<mbean
- code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
- name="portal:service=ControlPolicy,type=Page"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
+ name="portal:service=ControlPolicy,type=Page"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
- name="portal:service=ControlPolicy,type=Portal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
+ name="portal:service=ControlPolicy,type=Portal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<!-- The controller -->
<mbean
- code="org.jboss.portal.core.controller.Controller"
- name="portal:service=Controller"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.controller.Controller"
+ name="portal:service=Controller"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="PageService"
- proxy-type="attribute">portal:service=PageService</depends>
+ optional-attribute-name="PageService"
+ proxy-type="attribute">portal:service=PageService
+ </depends>
<depends
- optional-attribute-name="CommandFactory"
- proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+ optional-attribute-name="CommandFactory"
+ proxy-type="attribute">portal:commandFactory=DefaultPortal
+ </depends>
<depends
- optional-attribute-name="URLFactory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ optional-attribute-name="URLFactory"
+ proxy-type="attribute">portal:urlFactory=Delegating
+ </depends>
<depends
- optional-attribute-name="StackFactory"
- proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command
+ </depends>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance
+ </depends>
<depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory
+ </depends>
<depends
- optional-attribute-name="CustomizationManager"
- proxy-type="attribute">portal:service=CustomizationManager</depends>
+ optional-attribute-name="CustomizationManager"
+ proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
<depends
- optional-attribute-name="ContentRendererRegistry"
- proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ optional-attribute-name="ContentRendererRegistry"
+ proxy-type="attribute">portal:service=ContentProviderRegistry
+ </depends>
<depends
- optional-attribute-name="ResponseHandler"
- proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends>
+ optional-attribute-name="ResponseHandler"
+ proxy-type="attribute">portal:service=ResponseHandler,type=Selector
+ </depends>
<depends
- optional-attribute-name="PageControlPolicy"
- proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
+ optional-attribute-name="PageControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Page
+ </depends>
</mbean>
<!-- The controller factory -->
<mbean
- code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
- name="portal:service=ControllerFactory"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
+ name="portal:service=ControllerFactory"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Controller"
- proxy-type="attribute">portal:service=Controller</depends>
+ optional-attribute-name="Controller"
+ proxy-type="attribute">portal:service=Controller
+ </depends>
</mbean>
<!-- -->
<mbean
- code="org.jboss.portal.server.impl.ServerImpl"
- name="portal:service=Server"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.impl.ServerImpl"
+ name="portal:service=Server"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Config"
- proxy-type="attribute">portal:service=ServerConfig</depends>
+ optional-attribute-name="Config"
+ proxy-type="attribute">portal:service=ServerConfig
+ </depends>
<depends
- optional-attribute-name="ServletContainerFactory"
- proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+ optional-attribute-name="ServletContainerFactory"
+ proxy-type="attribute">portal:service=ServletContainerFactory
+ </depends>
</mbean>
<!-- -->
<mbean
- code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
- name="portal:deployer=PortalWebApp">
+ code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
+ name="portal:deployer=PortalWebApp">
<depends>jboss.system:service=MainDeployer</depends>
<depends>portal:container=PortalObject</depends>
<depends>portal:container=Instance</depends>
<depends
- optional-attribute-name="PortalServer"
- proxy-type="attribute">portal:service=Server</depends>
+ optional-attribute-name="PortalServer"
+ proxy-type="attribute">portal:service=Server
+ </depends>
</mbean>
- <!-- Portal object deployment factory -->
- <!--
+ <!-- Portal object deployment factory --><!--
| Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
@portal.single.xml.close@
<mbean
@@ -1317,30 +1401,33 @@
@portal.single.xml.open@
-->
<mbean
- code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
- name="portal:deploymentFactory=Object"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
+ name="portal:deploymentFactory=Object"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Deployer"
- proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp
+ </depends>
<depends
- optional-attribute-name="PortalObjectContainer"
- proxy-type="attribute">portal:container=PortalObject</depends>
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject
+ </depends>
<depends
- optional-attribute-name="ContentProviderRegistry"
- proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ optional-attribute-name="ContentProviderRegistry"
+ proxy-type="attribute">portal:service=ContentProviderRegistry
+ </depends>
<depends
- optional-attribute-name="PortalObjectEntityResolver"
- proxy-type="attribute">portal:service=EntityResolver</depends>
+ optional-attribute-name="PortalObjectEntityResolver"
+ proxy-type="attribute">portal:service=EntityResolver
+ </depends>
<attribute name="SetupLocation">conf/data/default-object.xml</attribute>
<!-- Set to false in clustered mode, otherwise set to true -->
<attribute name="RegistrationControlledByService">@portal.single@</attribute>
</mbean>
- <!-- -->
- <!--
+ <!-- --><!--
| Uncomment in cluster mode : have the creation of instances run as a clustered singleton
@portal.single.xml.close@
<mbean
@@ -1359,99 +1446,117 @@
@portal.single.xml.open@
-->
<mbean
- code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
- name="portal:deploymentFactory=PortletApp"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
+ name="portal:deploymentFactory=PortletApp"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!-- @portal.single.xml.close@
<depends>jboss.ha:service=HASingletonDeployer</depends>
@portal.single.xml.open@ -->
<depends>portal:service=PortletInvokerRegistration,id=local</depends>
<depends
- optional-attribute-name="Deployer"
- proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp
+ </depends>
<depends
- optional-attribute-name="WebAppRegistry"
- proxy-type="attribute">portal:service=WebAppRegistry</depends>
+ optional-attribute-name="WebAppRegistry"
+ proxy-type="attribute">portal:service=WebAppRegistry
+ </depends>
<depends
- optional-attribute-name="Config"
- proxy-type="attribute">portal:service=ServerConfig</depends>
+ optional-attribute-name="Config"
+ proxy-type="attribute">portal:service=ServerConfig
+ </depends>
<depends
- optional-attribute-name="PortletSecurityService"
- proxy-type="attribute">portal:service=PortletSecurityService</depends>
+ optional-attribute-name="PortletSecurityService"
+ proxy-type="attribute">portal:service=PortletSecurityService
+ </depends>
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance
+ </depends>
<depends
- optional-attribute-name="JBossPortletEntityResolver"
- proxy-type="attribute">portal:service=EntityResolver</depends>
+ optional-attribute-name="JBossPortletEntityResolver"
+ proxy-type="attribute">portal:service=EntityResolver
+ </depends>
<depends
- optional-attribute-name="PortalObjectEntityResolver"
- proxy-type="attribute">portal:service=EntityResolver</depends>
+ optional-attribute-name="PortalObjectEntityResolver"
+ proxy-type="attribute">portal:service=EntityResolver
+ </depends>
<depends
- optional-attribute-name="PortletInstancesEntityResolver"
- proxy-type="attribute">portal:service=EntityResolver</depends>
+ optional-attribute-name="PortletInstancesEntityResolver"
+ proxy-type="attribute">portal:service=EntityResolver
+ </depends>
<attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
<attribute name="PortletAPIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
<attribute
- name="PortletInfoFactoryClassName">org.jboss.portal.core.impl.portlet.info.CorePortletInfoFactory</attribute>
+ name="PortletInfoFactoryClassName">org.jboss.portal.core.impl.portlet.info.CorePortletInfoFactory
+ </attribute>
<!-- Set to false in clustered mode, otherwise set to true -->
<attribute name="CreateInstances">@portal.single@</attribute>
</mbean>
<mbean
- code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
- name="portal:deploymentFactory=Layout"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
+ name="portal:deploymentFactory=Layout"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Deployer"
- proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp
+ </depends>
<depends
- optional-attribute-name="LayoutService"
- proxy-type="attribute">portal:service=LayoutService</depends>
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
- name="portal:deploymentFactory=LayoutFeatures"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
+ name="portal:deploymentFactory=LayoutFeatures"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Deployer"
- proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp
+ </depends>
<depends
- optional-attribute-name="LayoutService"
- proxy-type="attribute">portal:service=LayoutService</depends>
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
- name="portal:deploymentFactory=Theme"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
+ name="portal:deploymentFactory=Theme"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Deployer"
- proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp
+ </depends>
<depends
- optional-attribute-name="ThemeService"
- proxy-type="attribute">portal:service=ThemeService</depends>
+ optional-attribute-name="ThemeService"
+ proxy-type="attribute">portal:service=ThemeService
+ </depends>
</mbean>
<mbean
- code="org.jboss.portal.server.deployment.WebAppAdapter"
- name="portal:deployer=Adapter"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ code="org.jboss.portal.server.deployment.WebAppAdapter"
+ name="portal:deployer=Adapter"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+ optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer
+ </depends>
<depends
- optional-attribute-name="Deployer"
- proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp
+ </depends>
<depends
- optional-attribute-name="JBossAppEntityResolver"
- proxy-type="attribute">portal:service=EntityResolver</depends>
+ optional-attribute-name="JBossAppEntityResolver"
+ proxy-type="attribute">portal:service=EntityResolver
+ </depends>
</mbean>
</server>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11258 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-07-02 04:18:37 -0400 (Wed, 02 Jul 2008)
New Revision: 11258
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
Log:
- Improved logic in status handling: tests should now pass.
- A RegistrationRefreshResult now only affects the total refresh result if it wasn't bypassed.
- Cleaned-up code somewhat.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2008-07-02 08:18:20 UTC (rev 11257)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2008-07-02 08:18:37 UTC (rev 11258)
@@ -303,8 +303,8 @@
if (forceRefresh || isRefreshNeeded(true))
{
log.debug("Refreshing info for producer '" + getId() + "'");
-// RefreshResult result = new RefreshResult(true, REFRESH_MEANING);
- RefreshResult result = new RefreshResult();
+ // Refresh occurs until proven otherwise! :)
+ RefreshResult result = new RefreshResult(RefreshResult.Status.SUCCESS);
try
{
persistentEndpointInfo.refresh();
@@ -312,13 +312,12 @@
catch (InvokerUnavailableException e)
{
log.debug("Couldn't refresh endpoint information: " + e);
-// result.appendToStatus("Couldn't refresh endpoint information: ").append(e.getLocalizedMessage());
+ // todo: should we fail fast here?
// throw new PortletInvokerException("Couldn't refresh endpoint information: " + e.getLocalizedMessage());
}
// save changes to endpoint
registry.updateProducerInfo(this);
- boolean registeredSDSucceeded = true;
try
{
// if we don't yet have registration information, get an unregistered service description
@@ -330,7 +329,6 @@
if (hasLocalRegistrationInfo())
{
log.debug("OperationFailedFault occurred, might indicate a need to modify registration");
- registeredSDSucceeded = false;
// attempt to get unregistered service description
serviceDescription = getServiceDescription(true);
result.setServiceDescription(serviceDescription);
@@ -344,8 +342,6 @@
}
result.setRegistrationResult(registrationResult);
- /*result.appendToStatus(registrationResult.getStatus(), false);
- result.setHasIssues(registrationResult.hasIssues());*/
return result;
}
else
@@ -367,16 +363,15 @@
if (serviceDescription.isRequiresRegistration())
{
// refresh and force check for extra props if the registered SD failed
- RefreshResult registrationResult = internalRefreshRegistration(serviceDescription, true, forceRefresh, !registeredSDSucceeded);
+ // todo: deal with forcing check of extra registration properties properly (if needed)
+ RefreshResult registrationResult = internalRefreshRegistration(serviceDescription, true, forceRefresh, false);
registry.updateProducerInfo(this);
-// result.appendToStatus(registrationResult.getStatus());
-
// attempt to register and determine if the current service description can be used to extract POPs
- if (registeredSDSucceeded && !registrationResult.hasIssues())
+ if (!registrationResult.hasIssues())
{
registrationResult = register(serviceDescription, false);
- if (RefreshResult.Status.SUCCESS.equals(registrationResult.getStatus()))
+ if (!registrationResult.hasIssues())
{
// registration occurred, so we should ask for a new service description
serviceDescription = getServiceDescription(false);
@@ -386,10 +381,7 @@
extractOfferedPortlets(serviceDescription);
}
-// result.appendToStatus(registrationResult.getStatus());
-// result.setHasIssues(registrationResult.hasIssues());
result.setRegistrationResult(registrationResult);
-// result.appendToStatus("Producer information successfully refreshed");
return result;
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java 2008-07-02 08:18:20 UTC (rev 11257)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java 2008-07-02 08:18:37 UTC (rev 11258)
@@ -62,7 +62,13 @@
if (registrationResult != null)
{
this.registrationResult = registrationResult;
- status = registrationResult.getStatus();
+
+ // result of registration only impacts the result of the total refresh if it wasn't bypassed
+ RefreshResult.Status regStatus = registrationResult.getStatus();
+ if (!BYPASSED.equals(regStatus))
+ {
+ status = regStatus;
+ }
}
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-07-02 08:18:20 UTC (rev 11257)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-07-02 08:18:37 UTC (rev 11258)
@@ -407,9 +407,7 @@
if (serviceDescription.isRequiresRegistration())
{
requiresRegistration = Boolean.TRUE;
- StringBuffer message = new StringBuffer("Producer '").append(producerId).append("' requires registration");
-// result.appendToStatus(message.toString());
- log.debug(message);
+ log.debug("Producer '" + producerId + "' requires registration");
// check if the configured registration properties match the producer expectations
ModelDescription regPropDescs = serviceDescription.getRegistrationPropertyDescription();
@@ -452,7 +450,6 @@
}
log.debug("Missing value for property '" + name + "'");
-// result.appendToStatus("Missing value for property '" + name + "'");
result.setStatus(RefreshResult.Status.FAILURE);
}
}
@@ -471,7 +468,6 @@
{
String msg = "Producer '" + producerId + "' doesn't require registration";
log.debug(msg);
-// result.appendToStatus(msg);
requiresRegistration = Boolean.FALSE;
result.setStatus(RefreshResult.Status.SUCCESS);
}
@@ -488,7 +484,6 @@
consistentWithProducerExpectations = !result.hasIssues();
String msg = "Registration configuration is " + (consistentWithProducerExpectations ? "" : "NOT ") + "valid";
-// result.appendToStatus(msg);
log.debug(msg);
return result;
}
@@ -566,7 +561,6 @@
}
}
log.debug(message);
-// result.appendToStatus(message.toString());
result.setStatus(RefreshResult.Status.FAILURE);
}
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11257 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-07-02 04:18:20 -0400 (Wed, 02 Jul 2008)
New Revision: 11257
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
Log:
- Improved logic in status handling: tests should now pass.
- A RegistrationRefreshResult now only affects the total refresh result if it wasn't bypassed.
- Cleaned-up code somewhat.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2008-07-02 07:18:28 UTC (rev 11256)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2008-07-02 08:18:20 UTC (rev 11257)
@@ -303,8 +303,8 @@
if (forceRefresh || isRefreshNeeded(true))
{
log.debug("Refreshing info for producer '" + getId() + "'");
-// RefreshResult result = new RefreshResult(true, REFRESH_MEANING);
- RefreshResult result = new RefreshResult();
+ // Refresh occurs until proven otherwise! :)
+ RefreshResult result = new RefreshResult(RefreshResult.Status.SUCCESS);
try
{
persistentEndpointInfo.refresh();
@@ -312,13 +312,12 @@
catch (InvokerUnavailableException e)
{
log.debug("Couldn't refresh endpoint information: " + e);
-// result.appendToStatus("Couldn't refresh endpoint information: ").append(e.getLocalizedMessage());
+ // todo: should we fail fast here?
// throw new PortletInvokerException("Couldn't refresh endpoint information: " + e.getLocalizedMessage());
}
// save changes to endpoint
registry.updateProducerInfo(this);
- boolean registeredSDSucceeded = true;
try
{
// if we don't yet have registration information, get an unregistered service description
@@ -330,7 +329,6 @@
if (hasLocalRegistrationInfo())
{
log.debug("OperationFailedFault occurred, might indicate a need to modify registration");
- registeredSDSucceeded = false;
// attempt to get unregistered service description
serviceDescription = getServiceDescription(true);
result.setServiceDescription(serviceDescription);
@@ -344,8 +342,6 @@
}
result.setRegistrationResult(registrationResult);
- /*result.appendToStatus(registrationResult.getStatus(), false);
- result.setHasIssues(registrationResult.hasIssues());*/
return result;
}
else
@@ -367,16 +363,15 @@
if (serviceDescription.isRequiresRegistration())
{
// refresh and force check for extra props if the registered SD failed
- RefreshResult registrationResult = internalRefreshRegistration(serviceDescription, true, forceRefresh, !registeredSDSucceeded);
+ // todo: deal with forcing check of extra registration properties properly (if needed)
+ RefreshResult registrationResult = internalRefreshRegistration(serviceDescription, true, forceRefresh, false);
registry.updateProducerInfo(this);
-// result.appendToStatus(registrationResult.getStatus());
-
// attempt to register and determine if the current service description can be used to extract POPs
- if (registeredSDSucceeded && !registrationResult.hasIssues())
+ if (!registrationResult.hasIssues())
{
registrationResult = register(serviceDescription, false);
- if (RefreshResult.Status.SUCCESS.equals(registrationResult.getStatus()))
+ if (!registrationResult.hasIssues())
{
// registration occurred, so we should ask for a new service description
serviceDescription = getServiceDescription(false);
@@ -386,10 +381,7 @@
extractOfferedPortlets(serviceDescription);
}
-// result.appendToStatus(registrationResult.getStatus());
-// result.setHasIssues(registrationResult.hasIssues());
result.setRegistrationResult(registrationResult);
-// result.appendToStatus("Producer information successfully refreshed");
return result;
}
@@ -492,8 +484,8 @@
if (info.isUsesMethodGet())
{
log.warn("Portlet '" + portletHandle
- + "' uses the GET method in forms. Since we don't handle this, this portlet will be excluded from " +
- "the list of offered portlets for producer " + persistentId);
+ + "' uses the GET method in forms. Since we don't handle this, this portlet will be excluded from " +
+ "the list of offered portlets for producer " + persistentId);
}
else
{
@@ -566,7 +558,7 @@
catch (Exception e)
{
log.debug("Couldn't get portlet via getPortletDescription for producer '" + persistentId
- + "'. Attempting to retrieve it from the service description as this producer might not support the PortletManagement interface.", e);
+ + "'. Attempting to retrieve it from the service description as this producer might not support the PortletManagement interface.", e);
justRefreshed = refresh(true);
portlet = getPortletFromCaches(portletHandle, justRefreshed);
@@ -637,7 +629,7 @@
private boolean isCacheExpired()
{
boolean result = !useCache() || System.currentTimeMillis() > expirationTimeMillis || popsMap == null
- || portletGroups == null;
+ || portletGroups == null;
if (result)
{
log.debug("Cache expired or not used");
@@ -710,7 +702,7 @@
{
Throwable cause = e.getCause();
throw new InvokerUnavailableException("Problem getting service description for producer "
- + persistentId + ", please see the logs for more information.", cause == null ? e : cause);
+ + persistentId + ", please see the logs for more information.", cause == null ? e : cause);
}
private GetServiceDescription getServiceDescriptionRequest(boolean asUnregistred) throws PortletInvokerException
@@ -779,7 +771,7 @@
throw new RuntimeException("Couldn't reset registration", e);
}
throw new IllegalArgumentException("Couldn't get property descriptions for portlet '" + portletHandle
- + "' because the provided registration is invalid!");
+ + "' because the provided registration is invalid!");
}
catch (Exception e)
{
@@ -831,7 +823,7 @@
{
log.debug("Attempting registration");
RegistrationContext registrationContext = persistentEndpointInfo.getRegistrationService()
- .register(persistentRegistrationInfo.getRegistrationData());
+ .register(persistentRegistrationInfo.getRegistrationData());
if (registrationContext == null)
{
@@ -841,7 +833,7 @@
persistentRegistrationInfo.setRegistrationContext(registrationContext);
String msg = "Consumer with id '" + persistentId + "' successfully registered with handle: '"
- + registrationContext.getRegistrationHandle() + "'";
+ + registrationContext.getRegistrationHandle() + "'";
log.debug(msg);
// result.appendToStatus(msg);
RefreshResult res = new RefreshResult();
@@ -912,7 +904,7 @@
{
RegistrationContext registrationContext = getRegistrationContext();
ModifyRegistration modifyRegistration = WSRPTypeFactory.createModifyRegistration(registrationContext,
- persistentRegistrationInfo.getRegistrationData());
+ persistentRegistrationInfo.getRegistrationData());
RegistrationState state = persistentEndpointInfo.getRegistrationService().modifyRegistration(modifyRegistration);
// force refresh of internal RegistrationInfo state
@@ -942,7 +934,7 @@
else
{
throw new IllegalStateException("Cannot modify registration for producer '" + persistentId
- + "' as it's not registered");
+ + "' as it's not registered");
}
}
@@ -962,7 +954,7 @@
}
RefreshResult result =
- persistentRegistrationInfo.refresh(serviceDescription, persistentId, mergeWithLocalInfo, forceRefresh, forceCheckOfExtraProps);
+ persistentRegistrationInfo.refresh(serviceDescription, persistentId, mergeWithLocalInfo, forceRefresh, forceCheckOfExtraProps);
log.debug("Refreshed registration information for consumer with id '" + persistentId + "'");
@@ -972,9 +964,9 @@
public boolean isRefreshNeeded(boolean considerCache)
{
boolean result = (considerCache && isCacheExpired())
- || persistentRegistrationInfo == null
- || persistentRegistrationInfo.isRefreshNeeded()
- || persistentEndpointInfo.isRefreshNeeded();
+ || persistentRegistrationInfo == null
+ || persistentRegistrationInfo.isRefreshNeeded()
+ || persistentEndpointInfo.isRefreshNeeded();
if (result)
{
log.debug("Refresh needed for producer '" + persistentId + "'");
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java 2008-07-02 07:18:28 UTC (rev 11256)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java 2008-07-02 08:18:20 UTC (rev 11257)
@@ -33,7 +33,10 @@
*/
public class RefreshResult
{
- public enum Status { SUCCESS, FAILURE, UNAVAILABLE, BYPASSED, UNKNOWN }
+ public enum Status
+ {
+ SUCCESS, FAILURE, UNAVAILABLE, BYPASSED, UNKNOWN
+ }
private ServiceDescription serviceDescription;
private Status status;
@@ -59,7 +62,13 @@
if (registrationResult != null)
{
this.registrationResult = registrationResult;
- status = registrationResult.getStatus();
+
+ // result of registration only impacts the result of the total refresh if it wasn't bypassed
+ RefreshResult.Status regStatus = registrationResult.getStatus();
+ if (!BYPASSED.equals(regStatus))
+ {
+ status = regStatus;
+ }
}
}
@@ -70,7 +79,7 @@
public boolean hasIssues()
{
- return !(SUCCESS.equals(status) || BYPASSED.equals(status)) ;
+ return !(SUCCESS.equals(status) || BYPASSED.equals(status));
}
public Status getStatus()
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-07-02 07:18:28 UTC (rev 11256)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-07-02 08:18:20 UTC (rev 11257)
@@ -321,14 +321,14 @@
return persistentRegistrationProperties;
}
- public Map<String,RegistrationProperty> getRegistrationProperties()
+ public Map<String, RegistrationProperty> getRegistrationProperties()
{
return getRegistrationProperties(true);
}
- private Map<String,RegistrationProperty> getRegistrationProperties(boolean immutable)
+ private Map<String, RegistrationProperty> getRegistrationProperties(boolean immutable)
{
- Map<String,RegistrationProperty> properties = getOrCreateRegistrationPropertiesMap(false);
+ Map<String, RegistrationProperty> properties = getOrCreateRegistrationPropertiesMap(false);
if (properties != null)
{
if (immutable)
@@ -400,16 +400,14 @@
// if we're not merging, we need to copy the current properties so that we can collect validation results.
if (!mergeWithLocalInfo)
{
- result.setRegistrationProperties(new HashMap<String,RegistrationProperty>(persistentRegistrationProperties));
+ result.setRegistrationProperties(new HashMap<String, RegistrationProperty>(persistentRegistrationProperties));
}
dirty = false;
if (serviceDescription.isRequiresRegistration())
{
requiresRegistration = Boolean.TRUE;
- StringBuffer message = new StringBuffer("Producer '").append(producerId).append("' requires registration");
-// result.appendToStatus(message.toString());
- log.debug(message);
+ log.debug("Producer '" + producerId + "' requires registration");
// check if the configured registration properties match the producer expectations
ModelDescription regPropDescs = serviceDescription.getRegistrationPropertyDescription();
@@ -419,7 +417,7 @@
PropertyDescription[] propertyDescriptions = regPropDescs.getPropertyDescriptions();
if (propertyDescriptions != null && propertyDescriptions.length > 0)
{
- Map<String,RegistrationProperty> descriptionsMap = getRegistrationPropertyDescriptionsFromWSRP(propertyDescriptions);
+ Map<String, RegistrationProperty> descriptionsMap = getRegistrationPropertyDescriptionsFromWSRP(propertyDescriptions);
// check that we don't have unexpected registration properties and if so, mark them as invalid or remove them
Set<String> expectedNames = descriptionsMap.keySet();
@@ -452,7 +450,6 @@
}
log.debug("Missing value for property '" + name + "'");
-// result.appendToStatus("Missing value for property '" + name + "'");
result.setStatus(RefreshResult.Status.FAILURE);
}
}
@@ -471,7 +468,6 @@
{
String msg = "Producer '" + producerId + "' doesn't require registration";
log.debug(msg);
-// result.appendToStatus(msg);
requiresRegistration = Boolean.FALSE;
result.setStatus(RefreshResult.Status.SUCCESS);
}
@@ -488,7 +484,6 @@
consistentWithProducerExpectations = !result.hasIssues();
String msg = "Registration configuration is " + (consistentWithProducerExpectations ? "" : "NOT ") + "valid";
-// result.appendToStatus(msg);
log.debug(msg);
return result;
}
@@ -566,7 +561,6 @@
}
}
log.debug(message);
-// result.appendToStatus(message.toString());
result.setStatus(RefreshResult.Status.FAILURE);
}
}
@@ -575,7 +569,7 @@
* @param descriptions
* @return
*/
- private Map<String,RegistrationProperty> getRegistrationPropertyDescriptionsFromWSRP(PropertyDescription[] descriptions)
+ private Map<String, RegistrationProperty> getRegistrationPropertyDescriptionsFromWSRP(PropertyDescription[] descriptions)
{
if (descriptions != null)
{
@@ -673,10 +667,10 @@
return registrationProperties;
}
- public void setRegistrationProperties(Map<String,RegistrationProperty> registrationProperties)
+ public void setRegistrationProperties(Map<String, RegistrationProperty> registrationProperties)
{
this.registrationProperties = registrationProperties;
- }
+ }
}
private String modifyIfNeeded(String oldValue, String newValue)
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11256 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 03:18:28 -0400 (Wed, 02 Jul 2008)
New Revision: 11256
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
Log:
adding trademarks that I removed for database setup section
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 07:09:34 UTC (rev 11255)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 07:18:28 UTC (rev 11256)
@@ -89,7 +89,7 @@
<sect3>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4 and 5, Microsoft SQL Server, PostgreSQL 8, and Oracle Database 9 and 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: <trademark class="registered">MySQL</trademark> 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, and <trademark class="registered">Oracle</trademark> Database 9 and 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -384,7 +384,7 @@
<sect2>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: <trademark class="registered">MySQL</trademark> 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4 and 5, Microsoft SQL Server, PostgreSQL 8, and Oracle Database 9 and 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11255 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 03:09:34 -0400 (Wed, 02 Jul 2008)
New Revision: 11255
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
Log:
more changes from 2.6 that were missed for 2.7
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 07:01:58 UTC (rev 11254)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 07:09:34 UTC (rev 11255)
@@ -403,7 +403,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Deploy a RDBMS JDBC connector:</emphasis> a RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, a RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
+ <emphasis role="bold">Deploy an RDBMS JDBC connector:</emphasis> an RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, an RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
</para>
</listitem>
</orderedlist>
@@ -412,7 +412,7 @@
<sect2>
<title>Datasource Configuration</title>
<para>
- The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the <trademark class="registered">MySQL</trademark> 4 and 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
+ The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4 and 5, PostgreSQL, Microsoft SQL Server, and Oracle databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
</para>
<mediaobject>
<imageobject>
@@ -456,7 +456,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On <trademark class="registered">Windows</trademark>, execute <command>run.bat</command>. On <trademark class="registered">Linux</trademark>, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On Windows, execute <command>run.bat</command>. On Linux, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
</para>
</listitem>
<listitem>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11254 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 03:01:58 -0400 (Wed, 02 Jul 2008)
New Revision: 11254
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
Log:
manually merging changes from 2.6 that are missing
in 2.7
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 06:24:02 UTC (rev 11253)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 07:01:58 UTC (rev 11254)
@@ -20,12 +20,12 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Extract the bundle:</emphasis> extract the ZIP archive. It does not matter which directory is used. On <trademark class="registered">Windows</trademark>, the recommended directory is <filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
+ <emphasis role="bold">Extract the bundle:</emphasis> extract the ZIP archive. It does not matter which directory is used. On Windows, the recommended directory is <filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename> directory. On <trademark class="registered">Windows</trademark>, execute <command>run.bat</command>. On <trademark class="registered">Linux</trademark>, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename> directory. On Windows, execute <command>run.bat</command>. On Linux, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -89,7 +89,7 @@
<sect3>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: <trademark class="registered">MySQL</trademark> 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4 and 5, Microsoft SQL Server, PostgreSQL 8, and Oracle Database 9 and 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -117,7 +117,7 @@
<sect3>
<title>Datasource Descriptors</title>
<para>
- The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the <trademark class="registered">MySQL</trademark> 4 and 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
+ The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4 and 5, PostgreSQL, Microsoft SQL Server, and Oracle databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
</para>
<mediaobject>
<imageobject>
@@ -161,7 +161,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On <trademark class="registered">Windows</trademark>, execute <command>run.bat</command>. On <trademark class="registered">Linux</trademark>, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On Windows, execute <command>run.bat</command>. On Linux, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -327,7 +327,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, Windows, users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>sh build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>sh build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -348,7 +348,7 @@
</note>
</para>
<para>
- To build the clustered version on <trademark class="registered">Linux</trademark> operating systems:
+ To build the clustered version on Linux operating systems:
</para>
<para>
<orderedlist>
@@ -378,7 +378,7 @@
</orderedlist>
</para>
<para>
- To build the clustered version on <trademark class="registered">Windows</trademark>, repeat the previous steps, replacing <command>sh build.sh</command> with <command>build.bat</command>.
+ To build the clustered version on Windows, repeat the previous steps, replacing <command>sh build.sh</command> with <command>build.bat</command>.
</para>
</sect2>
<sect2>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11253 - docs/branches/JBoss_Portal_Branch_2_7/common/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 02:24:02 -0400 (Wed, 02 Jul 2008)
New Revision: 11253
Modified:
docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml
Log:
applying Thomas' fixes to the overview section
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-02 06:14:35 UTC (rev 11252)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml 2008-07-02 06:24:02 UTC (rev 11253)
@@ -17,17 +17,7 @@
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>,
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"><trademark class="registered">Red Hat</trademark> Middleware, LLC 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 <trademark class="registered">Red Hat</trademark> Middleware, LLC 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 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
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11252 - in docs/branches/JBoss_Portal_Branch_2_7: referenceGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 02:14:35 -0400 (Wed, 02 Jul 2008)
New Revision: 11252
Modified:
docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml
Log:
- I used the wrong case/wording for "Single Sign On". This commit
fixes this issue.
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-02 05:05:02 UTC (rev 11251)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml 2008-07-02 06:14:35 UTC (rev 11252)
@@ -44,10 +44,10 @@
</itemizedlist>
</para>
<para>
- <emphasis role="bold">Single Sign-on</emphasis>
+ <emphasis role="bold">Single Sign On</emphasis>
<itemizedlist>
<listitem>
- <emphasis role="bold">Leverages Apache Tomcat and JBoss Single sign-on (SSO) solutions.</emphasis>
+ <emphasis role="bold">Leverages Apache Tomcat and JBoss Single Sign On (SSO) solutions.</emphasis>
</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>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml 2008-07-02 05:05:02 UTC (rev 11251)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml 2008-07-02 06:14:35 UTC (rev 11252)
@@ -9,7 +9,7 @@
<surname>Shah</surname>
</author>
</chapterinfo>
- <title>Single Sign ON</title>
+ <title>Single Sign On</title>
<para>This chapter describes how to setup SSO in JBoss Portal</para>
<sect1>
<title>Overview of SSO in portal</title>
@@ -268,7 +268,7 @@
</sect2>
</sect1>
<sect1>
- <title>JOSSO - <trademark class="trade">Java</trademark> Open Single SignOn</title>
+ <title><trademark class="trade">Java</trademark> Open Single Sign-On (JOSSO)</title>
<para>JBoss Portal enables seamless integration with JOSSO server. More details on JOSSO can be found
<ulink url="http://www.josso.org/">here</ulink></para>
<note>The steps below assume that JOSS server and JBoss Portal will be deployed on the same JBoss Application Server instance.
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11251 - in docs/branches/JBoss_Portal_Branch_2_7: referenceGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 01:05:02 -0400 (Wed, 02 Jul 2008)
New Revision: 11251
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/referenceGuide/en/modules/xmldescriptors.xml
Log:
- trademark fixes from 2.6
- minor corrections
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-02 04:34:13 UTC (rev 11250)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml 2008-07-02 05:05:02 UTC (rev 11251)
@@ -1,14 +1,14 @@
<preface id="acknowledgements">
- <title>Acknowledgements</title>
- <para>We would like to thank the developers that participate in the JBoss Portal project effort.</para>
- <para>Specifically,</para>
+ <title>Acknowledgments</title>
+ <para>We would like to thank the developers that participate in the JBoss Portal project.</para>
+ <para>Specifically:</para>
<para>
<itemizedlist>
<listitem>
Luca Stancapiano and Luc Boudreau for their localization contributions.
</listitem>
<listitem>
- Antoine Herzog for his feedback, for writing Wikis and helping in the forums.
+ Antoine Herzog for his feedback, writing Wikis, and helping in the forums.
</listitem>
<listitem>
Mark Fernandes and Paul Tamaro from Novell, for their hard work in supplying the
@@ -19,27 +19,25 @@
</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 Portlet.
+ frameworks in to the portal: Sun JSF-RI and Spring MVC portlets.
</listitem>
<listitem>
Swarn "sdhaliwal" Dhaliwal for supplying us with the Struts-Bridge, that will allow
- for existing struts applications to work with the Portal.
+ for existing Apache Struts applications to work with JBoss Portal.
</listitem>
<listitem>
- A few Red Hat employees, Remy Maucherat for Apache Tomcat configuration, Magesh Kumar Bojan and Martin Putz always there to help our customers,
- Prabhat Jha for making sure that JBoss Portal runs great everywhere. Noel Rocher for his early feedback on JBoss Portal 2.6
- and contributions. James Cobb for the Renaissance theme.
+ 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.
</listitem>
<listitem>
- The JBoss Labs (http://www.JBoss.org) team for building a great infrastructure on top of JBoss Portal 2.6, providing very useful feedback and
+ 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.
</listitem>
<listitem>
- Everyone participating in the forums and Wiki in general.
+ Everyone in general who participates in the forums and on the Wiki.
</listitem>
</itemizedlist>
</para>
- <para>Contributions of any kind are always welcome, you can contribute by providing ideas,
- filling bug reports, producing some code, designing a theme, writing some documentation,
- etc... If you think your name is missing from this page, please let us know.</para>
+ <para>Contributions of any kind are always welcome. You can contribute by providing ideas,
+ filing bug reports, producing code, designing a theme, writing documentation, and so on. If you think your name is missing from this page, please let us know.</para>
</preface>
\ No newline at end of file
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-02 04:34:13 UTC (rev 11250)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml 2008-07-02 05:05:02 UTC (rev 11251)
@@ -1,7 +1,7 @@
<preface id="features">
<title>Feature List</title>
<para>The following list details features found in this release of JBoss Portal. For a
- technical view of the JBoss Portal features, view the
+ technical view of the JBoss Portal features, refer to the
<ulink
url="http://jira.jboss.com/jira/browse/JBPORTAL">Project Roadmap and Task List</ulink>
.
@@ -229,12 +229,12 @@
</listitem>
<listitem>
<emphasis role="bold">Content Serving Search-engine-friendly URLS:</emphasis>
- http://<replaceable>yourdomain</replaceable>/portal/content/index.html (does not apply to portlet actions).
+ http://<replaceable>your-domain</replaceable>/portal/content/index.html (does not apply to portlet actions).
</listitem>
<listitem>
<emphasis role="bold">No Long Portal URLS:</emphasis>
serve binaries with simple URLs
- (http://<replaceable>yourdomain</replaceable>/files/products.pdf).
+ (http://<replaceable>your-domain</replaceable>/files/products.pdf).
</listitem>
<listitem>
<emphasis role="bold">Multiple HTML Portlet Instance Support:</emphasis>
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-02 04:34:13 UTC (rev 11250)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml 2008-07-02 05:05:02 UTC (rev 11251)
@@ -15,19 +15,19 @@
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,
+ 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>,
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">Red Hat Middleware, LLC Professional Support
+ <ulink url="http://www.jboss.com/services/index"><trademark class="registered">Red Hat</trademark> Middleware, LLC 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 Red Hat Middleware, LLC developers, and community contributors.
+ currently developed by <trademark class="registered">Red Hat</trademark> Middleware, LLC 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
@@ -61,7 +61,7 @@
</listitem>
<listitem>
<para>
- <ulink url="http://www.portletswap.com">PortletSwap.com portlet exchange</ulink>
+ <ulink url="http://www.portletswap.com">PortletSwap.com Portlet Exchange</ulink>
</para>
</listitem>
<listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-07-02 04:34:13 UTC (rev 11250)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-07-02 05:05:02 UTC (rev 11251)
@@ -8,7 +8,7 @@
</chapterinfo>
<title>XML Descriptors</title>
<sect1>
- <title>Changes from previous releases</title>
+ <title>Changes from previous Releases</title>
<para>The previous releases of JBoss Portal did not have an external schema to validate XML descriptors; however, they were internally validated by the portal. Since JBoss Portal 2.6, a Document Type Definition (DTD) has been provided to validate descriptors.
</para>
<para>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11250 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 00:34:13 -0400 (Wed, 02 Jul 2008)
New Revision: 11250
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
Log:
adding some trademark changes from 2.6 branch
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 02:14:42 UTC (rev 11249)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02 04:34:13 UTC (rev 11250)
@@ -107,8 +107,8 @@
</para>
</listitem>
<listitem>
- <para>
- <emphasis role="bold">Deploy a RDBMS JDBC connector:</emphasis> a RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, a RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
+ <para>
+ <emphasis role="bold">Deploy an RDBMS <trademark class="trade">JDBC</trademark> connector:</emphasis> an RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, an RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
</para>
</listitem>
</orderedlist>
@@ -265,7 +265,7 @@
<title>Operating System Environment Settings</title>
<para>For build targets to work, you must configure a <filename>JBOSS_HOME</filename> environment variable. This environment variable must point to the root directory of the JBoss EAP or JBoss AS installation directory, which is the directory where the JBoss EAP or JBoss AS files were extracted to.
</para>
- <para>On <trademark class="registered">Windows</trademark>, this is accomplished by going to
+ <para>On Windows, this is accomplished by going to
<emphasis>Start > Settings > Control Panel > System > Advanced > Environment Variables</emphasis>. Under the
<emphasis>System Variables</emphasis>
section, click
@@ -278,7 +278,7 @@
</mediaobject>
</para>
<para>
- To configure the <filename>JBOSS_HOME</filename> environment variable on <trademark class="registered">Linux</trademark>:
+ To configure the <filename>JBOSS_HOME</filename> environment variable on Linux:
</para>
<para>
<orderedlist>
@@ -327,7 +327,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, <trademark class="registered">Windows</trademark>, users need to run the <command>build.bat deploy</command> command, and <trademark class="registered">Linux</trademark> users need to run the <command>sh build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, Windows, users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>sh build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -343,7 +343,7 @@
<note>
<title>Portal Modules</title>
<para>
- The previous steps install a bare version of JBoss Portal. In previous versions, several additional modules were deployed as well, but this has since been modularized to provide greater flexibility. To deploy additional modules, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">Portal's module list</ulink> for more information. To deploy all modules at once, change into the <filename>build</filename> directory. If you are running <trademark class="registered">Linux</trademark>, run the <command>sh build.sh deploy-all</command> command. On <trademark class="registered">Windows</trademark>, run the <command>build.bat deploy-all</command> command.
+ The previous steps install a bare version of JBoss Portal. In previous versions, several additional modules were deployed as well, but this has since been modularized to provide greater flexibility. To deploy additional modules, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">Portal's module list</ulink> for more information. To deploy all modules at once, change into the <filename>build</filename> directory. If you are running Linux, run the <command>sh build.sh deploy-all</command> command. On Windows, run the <command>build.bat deploy-all</command> command.
</para>
</note>
</para>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml 2008-07-02 02:14:42 UTC (rev 11249)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml 2008-07-02 04:34:13 UTC (rev 11250)
@@ -1,7 +1,7 @@
<preface id="target" revision="1">
<title>Target Audience</title>
<para>
- This guide is aimed towards Portlet developers, Portal administrators, and those wishing to
+ This guide is aimed towards portlet developers, portal administrators, and those wishing to
implement and extend the JBoss Portal framework. For end-user documentation, please refer to the JBoss Portal User Manual from the <ulink url="http://labs.jboss.com/portal/jbossportal/docs/index.html">JBoss Portal Documentation Library</ulink>
.</para>
</preface>
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-02 02:14:42 UTC (rev 11249)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-02 04:34:13 UTC (rev 11250)
@@ -16,7 +16,7 @@
<title>Portlet Primer</title>
<sect1 id="portlet_primer">
<title>JSR-168 Overview</title>
- <para>The JSR-168 Portlet Specification aims at defining portlets that can be used by any JSR-168 portlet container, also known as a portal. There are different portals with commercial and non-commercial licenses. This chapter gives a brief overview of the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>. Portlet developers are strongly encouraged to read the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>.
+ <para>The <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink> aims at defining portlets that can be used by any JSR-168 portlet container, also known as a portal. There are different portals with commercial and non-commercial licenses. This chapter gives a brief overview of the JSR-168 Portlet Specification. Portlet developers are strongly encouraged to read the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>.
</para>
<para>
JBoss Portal is fully JSR-168 compliant, which means any JSR-168 portlet behaves as it should inside the portal.
17 years, 10 months
- 1
- 0