svn commit: r1413781 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf: portal.samplesxconf portal.xconf
| Newsgroups | gmane.text.xml.cocoon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: cdamioli
Date: Mon Nov 26 18:58:26 2012
New Revision: 1413781
URL: http://svn.apache.org/viewvc?rev=1413781&view=rev
Log:
COCOON-2069 Cocoon 2.1 is not initialized when building without samples
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf?rev=1413781&r1=1413780&r2=1413781&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf Mon Nov 26 18:58:26 2012
@@ -24,102 +24,6 @@
if you use the portal for your own projects that you
remove all unused stuff from the configuration!
-->
-
- <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal"
- role="org.apache.cocoon.portal.event.EventManager">
- <event-aspects>
- <!-- The client should not cache the page. -->
- <aspect type="no-client-caching"/>
- <!-- Uncomment this aspect when marshalling JSR168 portlet events
- <aspect type="convertable"/>
- -->
- <!-- Use the action counter with great care. We recommend turning it off. -->
- <!-- Remove action-counter when using PageLabels -->
- <!-- aspect type="action-counter"/ -->
- <aspect type="frame"/>
- <aspect type="link"/>
- <aspect type="full-screen-coplet"/>
- <!-- Uncomment the following when using PageLabels
- <aspect type="page-label"/>
- -->
- <aspect type="request-parameter">
- <!-- Uncomment the following when marshalling JSR168 portlet events
- <parameter name="parameter-name" value="cocoon-portal-event,url"/>
- -->
- </aspect>
- </event-aspects>
- <!-- add a new instance of each class as a subscriber: -->
- <subscriber-classes>
- <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
- <!-- class name="CLASSNAME"/> -->
- </subscriber-classes>
- <!-- add each component as a subscriber (the component should be thread safe): -->
- <subscriber-roles>
- <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
- <!-- <role name="AVALON-ROLE"/> -->
- </subscriber-roles>
- <!-- add a new instance of each class as a receiver: -->
- <receiver-classes>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
- <class
- name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
- </receiver-classes>
- <!-- add each component as a receiver (the component should be thread safe): -->
- <receiver-roles>
- <!-- <role name="AVALON-ROLE"/> -->
- </receiver-roles>
- </component>
-
- <!-- This is the portal manager.
- The portal manager can be extended with different aspects.
- Currently the JSR-168 aspect is configured/activated.
- If you don't need the JSR-168 support uncomment the aspect.
- -->
- <component class="org.apache.cocoon.portal.impl.PortalManagerImpl"
- logger="portal" role="org.apache.cocoon.portal.PortalManager">
- <aspects>
- <!-- JSR-168 support: -->
- <aspect adapter="portlet"/>
- </aspects>
- <fullScreenNav>true</fullScreenNav>
- </component>
-
-
- <!-- This is the portal service -->
- <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal"
- role="org.apache.cocoon.portal.PortalService">
- <portals>
- <!-- Configure your portals here: -->
- </portals>
- </component>
-
- <!-- To enable PageLabels change DefaultLinkService to PageLabelLinkService -->
- <component class="org.apache.cocoon.portal.impl.DefaultLinkService"
- logger="portal"
- role="org.apache.cocoon.portal.LinkService">
- <parameter name="defaultPort" value="8888"/>
- <parameter name="defaultSecurePort" value="443"/>
- </component>
-
- <!-- To enable PageLabels change DefaultEventConverter to PageLabelEventConverter -->
- <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal"
- role="org.apache.cocoon.portal.event.EventConverter">
- </component>
-
- <!-- Page Label Manager -->
- <component class="org.apache.cocoon.portal.impl.PageLabelManager" logger="portal"
- role="org.apache.cocoon.portal.impl.PageLabelManager">
- <!-- Uncomment to marshall JSR-168 portlet events
- <marshallEvents>true</marshallEvents>
- -->
- <!-- Uncomment to enable non sticky tabs
- <nonStickyTabs>true</nonStickyTabs>
- -->
- <!-- Uncomment to have the label appear in the path instead of as a request parameter
- <urlPath>true</urlPath>
- -->
- </component>
<!-- This security handler makes use of a pipeline for the authentication: -->
<component role="org.apache.cocoon.auth.SecurityHandler/portal"
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf?rev=1413781&r1=1413780&r2=1413781&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf Mon Nov 26 18:58:26 2012
@@ -130,5 +130,107 @@
<parameter name="briefcase:action:email" value="cocoon://email-briefcase"/>
<parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
</component>
+
+ <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal"
+ role="org.apache.cocoon.portal.event.EventManager">
+ <event-aspects>
+ <!-- The client should not cache the page. -->
+ <aspect type="no-client-caching"/>
+ <!-- Uncomment this aspect when marshalling JSR168 portlet events
+ <aspect type="convertable"/>
+ -->
+ <!-- Use the action counter with great care. We recommend turning it off. -->
+ <!-- Remove action-counter when using PageLabels -->
+ <!-- aspect type="action-counter"/ -->
+ <aspect type="frame"/>
+ <aspect type="link"/>
+ <aspect type="full-screen-coplet"/>
+ <!-- Uncomment the following when using PageLabels
+ <aspect type="page-label"/>
+ -->
+ <!-- Comment the following out if you don't need WSRP: -->
+ <aspect type="wsrp"/>
+ <aspect type="request-parameter">
+ <!-- Uncomment the following when marshalling JSR168 portlet events
+ <parameter name="parameter-name" value="cocoon-portal-event,url"/>
+ -->
+ </aspect>
+ </event-aspects>
+ <!-- add a new instance of each class as a subscriber: -->
+ <subscriber-classes>
+ <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
+ <!-- class name="CLASSNAME"/> -->
+ </subscriber-classes>
+ <!-- add each component as a subscriber (the component should be thread safe): -->
+ <subscriber-roles>
+ <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
+ <!-- <role name="AVALON-ROLE"/> -->
+ </subscriber-roles>
+ <!-- add a new instance of each class as a receiver: -->
+ <receiver-classes>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
+ <class
+ name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
+ </receiver-classes>
+ <!-- add each component as a receiver (the component should be thread safe): -->
+ <receiver-roles>
+ <!-- <role name="AVALON-ROLE"/> -->
+ </receiver-roles>
+ </component>
+
+ <!-- This is the portal manager.
+ The portal manager can be extended with different aspects.
+ Currently the JSR-168 aspect is configured/activated.
+ If you don't need the JSR-168 support uncomment the aspect.
+ In a similar manner the wsrp support works.
+ -->
+ <component class="org.apache.cocoon.portal.impl.PortalManagerImpl"
+ logger="portal" role="org.apache.cocoon.portal.PortalManager">
+ <aspects>
+ <!-- JSR-168 support: -->
+ <aspect adapter="portlet"/>
+ <!-- wsrp support: -->
+ <aspect adapter="wsrp"/>
+ </aspects>
+ <fullScreenNav>true</fullScreenNav>
+ </component>
+
+
+ <!-- This is the portal service -->
+ <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal"
+ role="org.apache.cocoon.portal.PortalService">
+ <portals>
+ <!-- Configure your portals here: -->
+ </portals>
+ </component>
+
+ <!-- To enable PageLabels change DefaultLinkService to PageLabelLinkService -->
+ <component class="org.apache.cocoon.portal.impl.DefaultLinkService"
+ logger="portal"
+ role="org.apache.cocoon.portal.LinkService">
+ <parameter name="defaultPort" value="8888"/>
+ <parameter name="defaultSecurePort" value="443"/>
+ </component>
+
+ <!-- To enable PageLabels change DefaultEventConverter to PageLabelEventConverter -->
+ <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal"
+ role="org.apache.cocoon.portal.event.EventConverter">
+ </component>
+
+ <!-- Page Label Manager -->
+ <component class="org.apache.cocoon.portal.impl.PageLabelManager" logger="portal"
+ role="org.apache.cocoon.portal.impl.PageLabelManager">
+ <!-- Uncomment to marshall JSR-168 portlet events
+ <marshallEvents>true</marshallEvents>
+ -->
+ <!-- Uncomment to enable non sticky tabs
+ <nonStickyTabs>true</nonStickyTabs>
+ -->
+ <!-- Uncomment to have the label appear in the path instead of as a request parameter
+ <urlPath>true</urlPath>
+ -->
+ </component>
+
</xconf>