[portal-commits] JBoss Portal SVN: r10609 - in branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar: META-INF and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2008-04-16 16:31:54 -0400 (Wed, 16 Apr 2008) New Revision: 10609 Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/portal-aop.xml Log: - Minor reformat. Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-04-16 16:47:31 UTC (rev 10608) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-04-16 20:31:54 UTC (rev 10609) @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?><!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~ JBoss, a division of Red Hat ~ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ ~ contributors as indicated by the @authors tag. See the ~ @@ -936,17 +937,31 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <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="CommandFactory" proxy-type="attribute">portal:commandFactory=DefaultPortal + </depends> <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> - <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends> + <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> <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends> - <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends optional-attribute-name="CustomizationManager" proxy-type="attribute">portal:service=CustomizationManager</depends> - <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> - <depends optional-attribute-name="PageControlPolicy" proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends> - <depends optional-attribute-name="ContentProviderRegistry" proxy-type="attribute">portal:service=ContentProviderRegistry</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="CustomizationManager" proxy-type="attribute">portal:service=CustomizationManager + </depends> + <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> + <depends optional-attribute-name="PageControlPolicy" proxy-type="attribute">portal:service=ControlPolicy,type=Page + </depends> + <depends optional-attribute-name="ContentProviderRegistry" proxy-type="attribute"> + portal:service=ContentProviderRegistry + </depends> </mbean> <!-- The controller factory --> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/portal-aop.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/portal-aop.xml 2008-04-16 16:47:31 UTC (rev 10608) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/portal-aop.xml 2008-04-16 20:31:54 UTC (rev 10609) @@ -22,16 +22,12 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <aop> - <metadata - tag="transaction" - class="org.jboss.portal.core.aspects.server.TransactionInterceptor"> + <metadata tag="transaction" class="org.jboss.portal.core.aspects.server.TransactionInterceptor"> <method name="invoke"> <trans-attribute>RequiresNew</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"> + <metadata tag="transaction" class="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"> <method name="invokeNotSupported"> <trans-attribute>NotSupported</trans-attribute> </method> @@ -51,16 +47,12 @@ <trans-attribute>RequiresNew</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.aspects.server.UserInterceptor$UserFinalizer"> + <metadata tag="transaction" class="org.jboss.portal.core.aspects.server.UserInterceptor$UserFinalizer"> <method name="finalizeUser"> <trans-attribute>Required</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.jems.hibernate.SessionFactoryBinder"> + <metadata tag="transaction" class="org.jboss.portal.jems.hibernate.SessionFactoryBinder"> <method name="createSchema"> <trans-attribute>NotSupported</trans-attribute> </method> @@ -71,36 +63,29 @@ <trans-attribute>NotSupported</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.deployment.jboss.ObjectDeployment"> + <metadata tag="transaction" class="org.jboss.portal.core.deployment.jboss.ObjectDeployment"> <method name="doStart"> <trans-attribute>Required</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"> + <metadata tag="transaction" class="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"> <method name="createRootIfNotExist"> <trans-attribute>Required</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.deployment.jboss.PortletAppDeployment"> + <metadata tag="transaction" class="org.jboss.portal.core.deployment.jboss.PortletAppDeployment"> <method name="handleInstance"> <trans-attribute>RequiresNew</trans-attribute> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"> + <metadata tag="transaction" class="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"> <method name="getDefinition"> <trans-attribute>Required</trans-attribute> </method> <method name="createDefinition"> <trans-attribute>Required</trans-attribute> - <application-exceptions>org.jboss.portal.core.model.instance.DuplicateInstanceException</application-exceptions> + <application-exceptions>org.jboss.portal.core.model.instance.DuplicateInstanceException + </application-exceptions> </method> <method name="destroyDefinition"> <trans-attribute>Required</trans-attribute> @@ -113,9 +98,7 @@ <application-exceptions>org.jboss.portal.portlet.InvalidPortletIdException</application-exceptions> </method> </metadata> - <metadata - tag="transaction" - class="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"> + <metadata tag="transaction" class="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"> <method name="createClone"> <trans-attribute>Required</trans-attribute> </method>