[jboss-cvs] jboss-portal/core/src/resources/portal-core-sar/META-INF ...
Julien Viet
julien at jboss.com
Mon Jul 10 18:51:46 EDT 2006
User: julien
Date: 06/07/10 18:51:46
Modified: core/src/resources/portal-core-sar/META-INF
jboss-service.xml
Log:
make instance preferences work from xml deployment descriptor
Revision Changes Path
1.127 +160 -65 jboss-portal/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-service.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-core-sar/META-INF/jboss-service.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- jboss-service.xml 4 Jul 2006 10:07:50 -0000 1.126
+++ jboss-service.xml 10 Jul 2006 22:51:46 -0000 1.127
@@ -25,7 +25,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ <depends
+ optional-attribute-name="AuthorizationDomainRegistry"
+ proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
</mbean>
<mbean
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
@@ -33,8 +35,12 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.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>
+ <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>
<!-- Portlet state -->
@@ -69,7 +75,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="UserModule" proxy-type="attribute">portal:service=Module,type=User</depends>
+ <depends
+ optional-attribute-name="UserModule"
+ proxy-type="attribute">portal:service=Module,type=User</depends>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
@@ -307,8 +315,12 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
- <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
+ <depends
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends
+ optional-attribute-name="ThemeService"
+ proxy-type="attribute">portal:service=ThemeService</depends>
</mbean>
<!--
@@ -465,7 +477,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=ListenerRegistry</depends>
+ <depends
+ optional-attribute-name="Registry"
+ proxy-type="attribute">portal:service=ListenerRegistry</depends>
<attribute name="RegistryId">test_listener</attribute>
<attribute name="ListenerClassName">org.jboss.portal.core.portlet.test.event.PortletB$Listener</attribute>
</mbean>
@@ -478,9 +492,15 @@
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Instance</depends>
- <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Instance</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>
+ <depends
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Instance</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>
<attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
</mbean>
<mbean
@@ -490,9 +510,15 @@
xmbean-code="org.jboss.portal.common.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>
- <depends optional-attribute-name="PortalEventListenerRegistry" proxy-type="attribute">portal:service=ListenerRegistry</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>
+ <depends
+ optional-attribute-name="PortalEventListenerRegistry"
+ proxy-type="attribute">portal:service=ListenerRegistry</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
<attribute name="CreateRootOnStartup">true</attribute>
</mbean>
@@ -511,8 +537,12 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="NextFactory" proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="NextFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
@@ -521,8 +551,12 @@
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Prefix">portal</attribute>
- <depends optional-attribute-name="Factory" proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
<!-- URL factories -->
@@ -540,29 +574,33 @@
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Prefix">portal</attribute>
- <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
- <!-- The instance portlet invoker -->
+ <!-- The federating portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.test.TestPortletInvoker"
- name="portal:service=PortletInvoker,type=Instance"
+ code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
+ name="portal:service=PortletInvoker,type=Federating"
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Producer"
- proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
- <depends optional-attribute-name="Stack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Instance</depends>
</mbean>
- <!-- The federating portlet invoker -->
+ <!-- The portlet container invoker -->
<mbean
- code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
- name="portal:service=PortletInvoker,type=Federating"
+ code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+ name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
+ <depends
+ optional-attribute-name="Stack"
+ proxy-type="attribute">portal:service=InterceptorStack,type=Producer</depends>
+ <depends
+ optional-attribute-name="Registry"
+ proxy-type="attribute">portal:service=WebAppRegistry</depends>
</mbean>
<!-- The stateful portlet invoker -->
@@ -572,10 +610,15 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
- <depends optional-attribute-name="StateStore"
+ <depends
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+ <depends
+ optional-attribute-name="StateStore"
proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
</mbean>
+
+ <!-- Register the stateful portlet invoker on the federating portlet invoker -->
<mbean
code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
name="portal:service=PortletInvokerRegistration,id=local"
@@ -583,22 +626,30 @@
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Id">local</attribute>
- <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
- <depends optional-attribute-name="FederatingPortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ <depends
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
+ <depends
+ optional-attribute-name="FederatingPortletInvoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
</mbean>
- <!-- The portlet container invoker -->
+ <!-- The instance portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.container.PortletContainerInvoker"
- name="portal:service=PortletInvoker,type=Container"
+ code="org.jboss.portal.portlet.test.TestPortletInvoker"
+ name="portal:service=PortletInvoker,type=Instance"
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Stack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Producer</depends>
- <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
+ <depends
+ optional-attribute-name="Producer"
+ proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ <depends
+ optional-attribute-name="Stack"
+ proxy-type="attribute">portal:service=InterceptorStack,type=Instance</depends>
</mbean>
+
<!-- The core controller -->
<mbean
code="org.jboss.portal.core.CoreController"
@@ -606,14 +657,24 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="PageService" proxy-type="attribute">portal:service=PageService</depends>
- <depends optional-attribute-name="CommandFactory"
+ <depends
+ optional-attribute-name="PageService"
+ proxy-type="attribute">portal:service=PageService</depends>
+ <depends
+ optional-attribute-name="CommandFactory"
proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
- <depends optional-attribute-name="URLFactory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends optional-attribute-name="CommandStack" proxy-type="attribute">portal:service=InterceptorStack,type=Command</depends>
- <depends optional-attribute-name="PortalObjectContainer"
+ <depends
+ optional-attribute-name="URLFactory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="CommandStack"
+ proxy-type="attribute">portal:service=InterceptorStack,type=Command</depends>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject</depends>
- <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
</mbean>
<!-- -->
@@ -623,7 +684,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends
+ optional-attribute-name="Config"
+ proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
<!-- -->
@@ -633,7 +696,9 @@
<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>
+ <depends
+ optional-attribute-name="PortalServer"
+ proxy-type="attribute">portal:service=Server</depends>
</mbean>
<!-- Deployment factories -->
@@ -643,10 +708,15 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends optional-attribute-name="PortalObjectContainer"
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject</depends>
- <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
<attribute name="SetupLocation">conf/data/default-object.xml</attribute>
</mbean>
<mbean
@@ -655,11 +725,22 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
- <depends optional-attribute-name="PortletSecurityService" proxy-type="attribute">portal:service=PortletSecurityService</depends>
- <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends>
+ <depends>portal:service=PortletInvokerRegistration,id=local</depends>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="WebAppRegistry"
+ proxy-type="attribute">portal:service=WebAppRegistry</depends>
+ <depends
+ optional-attribute-name="Config"
+ proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends
+ optional-attribute-name="PortletSecurityService"
+ proxy-type="attribute">portal:service=PortletSecurityService</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
<attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
<attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
</mbean>
@@ -669,8 +750,12 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService</depends>
</mbean>
<mbean
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
@@ -678,8 +763,12 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService</depends>
</mbean>
<mbean
code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
@@ -687,8 +776,12 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="ThemeService"
+ proxy-type="attribute">portal:service=ThemeService</depends>
</mbean>
<mbean
code="org.jboss.portal.server.deployment.WebAppAdapter"
@@ -704,8 +797,10 @@
<depends>portal:service=Module,type=User</depends>
<depends>portal:service=Module,type=Role</depends>
<depends>portal:service=Module,type=Mail</depends>
- <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
</mbean>
<!--
More information about the jboss-cvs-commits
mailing list