svn commit: r1418605 - /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf

Author: crossley
Date: Sat Dec  8 05:37:04 2012
New Revision: 1418605

URL: http://svn.apache.org/viewvc?rev=1418605&view=rev
Log:
Some misconfiguration with portals wsrp was stopping the default samples servletfrom initializing. Now commented-out until solved.
Issue: COCOON-2069

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf

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=1418605&r1=1418604&r2=1418605&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 Sat Dec  8 05:37:04 2012
@@ -148,8 +148,11 @@
       <!-- Uncomment the following when using PageLabels
       <aspect type="page-label"/>
       -->
-      <!-- Comment the following out if you don't need WSRP: -->
+      <!-- Uncomment the following if need WSRP: -->
+      <!-- (and see COCOON-2069) -->
+      <!--
       <aspect type="wsrp"/>
+      -->
       <aspect type="request-parameter">
         <!-- Uncomment the following when marshalling JSR168 portlet events
         <parameter name="parameter-name" value="cocoon-portal-event,url"/>
@@ -191,7 +194,11 @@
       <!-- JSR-168 support: -->
       <aspect adapter="portlet"/>
       <!-- wsrp support: -->
+      <!-- Uncomment the following if need WSRP: -->
+      <!-- (and see COCOON-2069) -->
+      <!--
       <aspect adapter="wsrp"/>
+      -->
     </aspects>
     <fullScreenNav>true</fullScreenNav>
   </component>