Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r595741 - in
 /cocoon/branches/BRANCH_2_1_X/src/blocks/portal:
 WEB-INF/ conf/ samples/ samples/coplets/docs/ samples/profiles/
 samples/profiles/copletbasedata/ samples/profiles/copletdata/
 samples/profiles/copletinstancedata/ samples/profile...
Date: Fri, 16 Nov 2007 17:07:10 -0000
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
Message-Id: <20071116170720.CAAEA1A9832@eris.apache.org>

Author: cziegeler
Date: Fri Nov 16 09:07:09 2007
New Revision: 595741

URL: http://svn.apache.org/viewvc?rev=595741&view=rev
Log:
Start removing dependency to wsrp4j as actually we are not allowed to distribute wsrp4j for now. As soon as the issue is resolved we can readd the support.

Removed:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/WEB-INF/portlet.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.xconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/WEB-INF/portlet.xml?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/WEB-INF/portlet.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/WEB-INF/portlet.xml Fri Nov 16 09:07:09 2007
@@ -197,7 +197,7 @@
     <portlet-info>
       <title>JSR-168 Cocoon Portlet</title>
       <short-title>Cocoon Portlet</short-title>
-      <keywords>Apache, Cocoon, XML, Jakarta, Pluto, Portlet, WSRP, WSRP4J, JSR-168</keywords>
+      <keywords>Apache, Cocoon, XML, Jakarta, Pluto, Portlet, JSR-168</keywords>
     </portlet-info>
   </portlet>
 

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=595741&r1=595740&r2=595741&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 Fri Nov 16 09:07:09 2007
@@ -42,8 +42,6 @@
       <!-- 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"/>
@@ -77,15 +75,12 @@
        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>
@@ -306,25 +301,6 @@
                  <parameter name="tag-name" value="window"/>
              </aspect>
              <aspect type="portlet-window">
-                 <parameter name="root-tag" value="false"/>
-             </aspect>
-             <aspect type="coplet-removing"/>
-             <aspect type="history"/>
-             <aspect type="basket"/>
-             <aspect type="coplet-cinclude"/>
-         </aspects>
-    </renderer>
-    <renderer name="wsrp-window"
-              class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
-              logger="portal">
-         <aspects>
-             <aspect type="xslt">
-                 <parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
-             </aspect>
-             <aspect type="parameter">
-                 <parameter name="tag-name" value="window"/>
-             </aspect>
-             <aspect type="wsrp-window">
                  <parameter name="root-tag" value="false"/>
              </aspect>
              <aspect type="coplet-removing"/>

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=595741&r1=595740&r2=595741&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 Fri Nov 16 09:07:09 2007
@@ -30,8 +30,6 @@
 
     <!-- This aspect sets headers on the response that tell the client to not cache the response: -->
     <aspect logger="portal" name="no-client-caching" class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"/>
-    <!-- This aspect is required for wsrp: -->
-    <aspect logger="portal" name="wsrp" class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"/>
   </component>
 
   <!-- Portal Manager Aspect Configuration -->
@@ -69,13 +67,6 @@
     <coplet-adapter name="application"
                     class="org.apache.cocoon.portal.coplet.adapter.impl.ApplicationCopletAdapter"
                     logger="portal"/>
-    <!-- This is the wsrp adapter -->
-    <coplet-adapter name="wsrp"
-                    class="org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter"
-                    logger="portal">
-      <!-- This is the wsrp configuration containing the producers etc. -->
-      <parameter name="wsrp-config" value="profiles/wsrp-config.xml"/>
-    </coplet-adapter>
  </component>
 
 
@@ -86,8 +77,6 @@
     <aspect logger="portal" name="window" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
     <aspect logger="portal" name="portlet-window"
             class="org.apache.cocoon.portal.layout.renderer.aspect.impl.PortletWindowAspect"/>
-    <aspect logger="portal" name="wsrp-window"
-            class="org.apache.cocoon.portal.wsrp.adapter.WSRPPortletWindowAspect"/>
 
     <!-- This aspect can be used to render the minimize/maximize buttons -->
     <aspect logger="portal" name="coplet-sizing" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
@@ -129,11 +118,6 @@
  <component class="org.apache.cocoon.portal.profile.impl.MapProfileLS" role="org.apache.cocoon.portal.profile.ProfileLS" logger="portal"/>
 
  <component class="org.apache.cocoon.components.variables.DefaultVariableResolverFactory" role="org.apache.cocoon.components.variables.VariableResolverFactory" logger="portal"/>
-
- <!--  User Context Provider for WSRP -->
- <component role="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"
-            class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl"
-            logger="portal"/>
 
  <!-- This is the basket manager -->
  <component class="org.apache.cocoon.portal.coplets.basket.BasketManagerImpl" 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml Fri Nov 16 09:07:09 2007
@@ -34,7 +34,6 @@
           <li>The TabDemo2 shows the same content as TabDemo2 but with just a different stylesheet for the tab.</li>
           <li>The Gallery tab shows some more coplets.</li>
           <li>The JSR-168 tab demonstrates the integration of Portlets (read more below).</li>
-          <li>The WSRP tab demonstrates the integration of WSRP portlets (read more below).</li>
         </ul>
         <p><strong>THIS IS A SAMPLE PORTAL!</strong></p>
         <p>It demonstrates several features of 
@@ -60,15 +59,6 @@
         <p>The current implementation searches for portlets in all directories that are next to
          the Cocoon webapp directory. So, if you put Cocoon into the webapps directory of Tomcat,
          you should put your portlets there as well.</p>
-     </section>
-     <section title="WSRP">
-        <p>The Cocoon portal supports portlets conforming to the WSRP. The WSRP tab contains 
-           a sample using the testsuite from the <fork href="http://ws.apache.org/wsrp4j">WSRP4J project</fork>.</p>
-        <p>These samples only work if you follow these installation instructions:</p>
-        <ul>
-         <li>Get the WSRP4J project and install it into Tomcat (Test WSRP using the SwingConsumer now).</li>
-         <li>Start up Tomcat (with the WSRP producer) and Cocoon (using Jetty) and run the Cocoon portal demo. You should see the WSRP portlets now.</li>
-        </ul>
      </section>
   </body>
 </document>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml Fri Nov 16 09:07:09 2007
@@ -29,12 +29,5 @@
    <coplet-base-data id="Application">
       <coplet-adapter>application</coplet-adapter>
    </coplet-base-data>
-   <coplet-base-data id="WSRP">
-      <coplet-adapter>wsrp</coplet-adapter>
-      <configuration>
-      	<name>buffer</name>
-      	<value xsi:type="java:java.lang.Boolean">true</value>
-      </configuration>
-   </coplet-base-data>
 </coplets>
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml Fri Nov 16 09:07:09 2007
@@ -530,35 +530,4 @@
       </attribute>
    </coplet-data>
 
-   <!-- Example for the wsrp portlet -->
-   <coplet-data id="wsrp-calc-portlet" name="standard">
-      <title>WSRP-Calc-Portlet</title>
-      <coplet-base-data>WSRP</coplet-base-data>
-      <attribute>
-         <name>producer-id</name>
-         <value xsi:type="java:java.lang.String">prod_localhost_8081</value>
-      </attribute>
-      <attribute>
-         <name>portlet-handle</name>
-         <value xsi:type="java:java.lang.String">calc_1.1</value>
-      </attribute>
-   </coplet-data>
-
-   <coplet-data id="wsrp-test-portlet" name="standard">
-      <title>WSRP-Test-Portlet</title>
-      <coplet-base-data>WSRP</coplet-base-data>
-      <attribute>
-         <name>producer-id</name>
-         <value xsi:type="java:java.lang.String">prod_localhost_8081</value>
-      </attribute>
-      <attribute>
-         <name>portlet-handle</name>
-         <value xsi:type="java:java.lang.String">0.1</value>
-      </attribute>
-      <attribute>
-         <name>use-pipeline</name>
-         <value xsi:type="java:java.lang.Boolean">true</value>
-      </attribute>
-   </coplet-data>
-
 </coplets>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml Fri Nov 16 09:07:09 2007
@@ -195,12 +195,4 @@
       <coplet-data>Google</coplet-data>
    </coplet-instance-data>
 
-   <!-- wsrp example -->
-   <coplet-instance-data id="WSRP-Calc-1" name="standard">
-      <coplet-data>wsrp-calc-portlet</coplet-data>
-   </coplet-instance-data>
-   <coplet-instance-data id="WSRP-Test-1" name="standard">
-      <coplet-data>wsrp-test-portlet</coplet-data>
-   </coplet-instance-data>
-
 </coplets>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml Fri Nov 16 09:07:09 2007
@@ -254,21 +254,6 @@
     </composite-layout>
   </named-item>
 
-  <named-item name="WSRP">
-    <composite-layout name="column">
-      <item>
-        <coplet-layout name="coplet" layout-renderer-name="wsrp-window">
-          <coplet-instance-data>WSRP-Calc-1</coplet-instance-data>
-      </coplet-layout>
-      </item>
-      <item>
-        <coplet-layout name="coplet" layout-renderer-name="wsrp-window">
-          <coplet-instance-data>WSRP-Test-1</coplet-instance-data>
-      </coplet-layout>
-      </item>
-    </composite-layout>
-  </named-item>
-
   <named-item name="Basket">
     <!-- This is the basket demo. Usually you would only have the user
     tab for users and the admin tab for the admin and not both at

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap Fri Nov 16 09:07:09 2007
@@ -185,10 +185,6 @@
       <map:match pattern="proxy-**">
         <map:read type="portal-proxy"/>
       </map:match>
-      <!--  WSRP Resources -->
-      <map:match pattern="wsrprsc">
-        <map:read src="{request-param:wsrp-url}"/>
-      </map:match>
       <map:match pattern="images/*.gif">
         <map:read mime-type="image/gif" src="{portal-skin:skin.basepath}/images/{1}.gif"/>
       </map:match>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap Fri Nov 16 09:07:09 2007
@@ -182,10 +182,6 @@
       <map:match pattern="proxy-**">
         <map:read type="portal-proxy"/>
       </map:match>
-      <!--  WSRP Resources -->
-      <map:match pattern="wsrprsc">
-        <map:read src="{request-param:wsrp-url}"/>
-      </map:match>
       <map:match pattern="images/*.gif">
         <map:read mime-type="image/gif" src="{portal-skin:skin.basepath}/images/{1}.gif"/>
       </map:match>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl Fri Nov 16 09:07:09 2007
@@ -28,7 +28,6 @@
 	<head>
 		<title><xsl:value-of select="$title"/></title>
 		<link type="text/css" rel="stylesheet" href="{$base}css/page.css"/>
-		<link type="text/css" rel="stylesheet" href="{$base}css/wsrp.css"/>
 	</head>
 	<body>
 	<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%">

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl?rev=595741&r1=595740&r2=595741&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl Fri Nov 16 09:07:09 2007
@@ -28,7 +28,6 @@
     <head>
 			<title><xsl:value-of select="$title"/></title>
       <link type="text/css" rel="stylesheet" href="{$base}css/page.css"/>
-      <link type="text/css" rel="stylesheet" href="{$base}css/wsrp.css"/>
     </head>
     <body>
       <table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody>