cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r264757 [4/4] - in /cocoon: blocks/portal/trunk/WEB-INF/xconf/ blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/ blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/ blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/co...
Date Tue, 30 Aug 2005 11:11:20 GMT
Modified: cocoon/blocks/portal/trunk/samples/profiles/copletdata/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/profiles/copletdata/portal.xml?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/profiles/copletdata/portal.xml (original)
+++ cocoon/blocks/portal/trunk/samples/profiles/copletdata/portal.xml Tue Aug 30 04:10:28 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!-- SVN $Id$ -->
-<coplets>
+<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <!--
      + Different news coplets
      + Read content from a file - for offline presentation
@@ -25,7 +25,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/newsweek.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/newsweek.rss</value>
       </attribute>
    </coplet-data>
 
@@ -34,7 +34,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/nyt_business.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/nyt_business.rss</value>
       </attribute>
    </coplet-data>
 
@@ -43,7 +43,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/bbc_news.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/bbc_news.rss</value>
       </attribute>
    </coplet-data>
 
@@ -52,7 +52,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnet_news.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnet_news.rss</value>
       </attribute>
    </coplet-data>
 
@@ -61,7 +61,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnet_business.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnet_business.rss</value>
       </attribute>
    </coplet-data>
 
@@ -70,7 +70,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cst_news.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cst_news.rss</value>
       </attribute>
    </coplet-data>
 
@@ -79,7 +79,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnn_europe.rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnn_europe.rss</value>
       </attribute>
    </coplet-data>
 
@@ -88,7 +88,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/ml_weblog.weblog-rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/ml_weblog.weblog-rss</value>
       </attribute>
    </coplet-data>
 
@@ -97,7 +97,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/nn_weblog.weblog-rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/nn_weblog.weblog-rss</value>
       </attribute>
    </coplet-data>
 
@@ -111,15 +111,15 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/live.weblog-rss?feed=http://www.osoco.org/weblogs/rael/index.xml</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/live.weblog-rss?feed=http://www.osoco.net/weblogs/rael/index.xml</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>error-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cz_weblog.weblog-rss</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cz_weblog.weblog-rss</value>
       </attribute>
    </coplet-data>
 
@@ -131,11 +131,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-intro.html</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-intro.html</value>
       </attribute>
       <aspect>
         <name>mandatory</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </aspect>
    </coplet-data>
    <coplet-data id="Portal-Demo" name="standard">
@@ -143,15 +143,15 @@
       <coplet-base-data>CachingURICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-demo.html</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-demo.html</value>
       </attribute>
       <attribute>
         <name>cache-global</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <aspect>
         <name>mandatory</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </aspect>
    </coplet-data>
    <coplet-data id="Portal-Right" name="standard">
@@ -159,11 +159,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-right.html</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-right.html</value>
       </attribute>
       <aspect>
         <name>mandatory</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </aspect>
    </coplet-data>
    <coplet-data id="Portal-Left" name="standard">
@@ -171,11 +171,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-left.html</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-left.html</value>
       </attribute>
       <aspect>
         <name>mandatory</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </aspect>
    </coplet-data>
    <coplet-data id="Portal-Bottom" name="standard">
@@ -183,11 +183,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-bottom.html</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-bottom.html</value>
       </attribute>
       <aspect>
         <name>mandatory</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </aspect>
    </coplet-data>
 
@@ -199,19 +199,19 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/gallery/browser</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/gallery/browser</value>
       </attribute>
       <attribute>
          <name>image-dir</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">samplepics</value>
+         <value xsi:type="java:java.lang.String">samplepics</value>
       </attribute>
       <attribute>
          <name>image-include</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">.jpg</value>
+         <value xsi:type="java:java.lang.String">.jpg</value>
       </attribute>
       <attribute>
          <name>image-uri-prefix</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">coplets/gallery/images</value>
+         <value xsi:type="java:java.lang.String">coplets/gallery/images</value>
       </attribute>
    </coplet-data>
    <coplet-data id="GalleryViewer" name="standard">
@@ -219,7 +219,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/gallery/viewer</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/gallery/viewer</value>
       </attribute>
    </coplet-data>
 
@@ -231,11 +231,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/login/coplet</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/login/coplet</value>
       </attribute>
       <aspect>
         <name>mandatory</name>
-        <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+        <value xsi:type="java:java.lang.Boolean">true</value>
       </aspect>
    </coplet-data>
 
@@ -248,7 +248,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/content</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/content</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketAdmin" name="standard">
@@ -256,7 +256,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/basket-admin</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket-admin</value>
       </attribute>
    </coplet-data>
    <coplet-data id="Basket" name="standard">
@@ -264,7 +264,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/basket</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket</value>
       </attribute>
    </coplet-data>
    <coplet-data id="Basket.admin" name="standard">
@@ -272,7 +272,7 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/basket.admin</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket.admin</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleStaticCoplet" name="standard">
@@ -280,11 +280,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">document</value>
+         <value xsi:type="java:java.lang.String">document</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/staticcoplet.add.preflow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/staticcoplet.add.preflow</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletWithAttribute" name="standard">
@@ -292,11 +292,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">document</value>
+         <value xsi:type="java:java.lang.String">document</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithattr.add.preflow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithattr.add.preflow</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletWithInlineProcess" name="standard">
@@ -304,11 +304,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">document</value>
+         <value xsi:type="java:java.lang.String">document</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithinline.add.preflow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinline.add.preflow</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletWithInputProcess" name="standard">
@@ -316,23 +316,23 @@
       <coplet-base-data>CachingURICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">notepad</value>
+         <value xsi:type="java:java.lang.String">notepad</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>handleParameters</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/application</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
       </attribute>
       <attribute>
          <name>temporary:application-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithinput.add.flow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinput.add.flow</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletWithInputProcessShow" name="standard">
@@ -340,11 +340,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">notepad</value>
+         <value xsi:type="java:java.lang.String">notepad</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletWithApp" name="standard">
@@ -352,23 +352,23 @@
       <coplet-base-data>CachingURICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">request</value>
+         <value xsi:type="java:java.lang.String">request</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>handleParameters</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/application</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
       </attribute>
       <attribute>
          <name>temporary:application-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithapp.add.flow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithapp.add.flow</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletList" name="standard">
@@ -376,23 +376,23 @@
       <coplet-base-data>CachingURICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">request</value>
+         <value xsi:type="java:java.lang.String">request</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>handleParameters</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/application</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
       </attribute>
       <attribute>
          <name>temporary:application-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletlist</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletlist</value>
       </attribute>
    </coplet-data>
    <coplet-data id="BasketSampleCopletWithUpload" name="standard">
@@ -400,11 +400,11 @@
       <coplet-base-data>URICoplet</coplet-base-data>
       <attribute>
          <name>group</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">folder</value>
+         <value xsi:type="java:java.lang.String">folder</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithupload.add.preflow</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithupload.add.preflow</value>
       </attribute>
    </coplet-data>
 
@@ -417,11 +417,11 @@
       <coplet-base-data>Portlet</coplet-base-data>
       <attribute>
          <name>portlet</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">testsuite.TestPortlet1</value>
+         <value xsi:type="java:java.lang.String">testsuite.TestPortlet1</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
    </coplet-data>
    <coplet-data id="Portlet2" name="standard">
@@ -429,11 +429,11 @@
       <coplet-base-data>Portlet</coplet-base-data>
       <attribute>
          <name>portlet</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">testsuite.TestPortlet2</value>
+         <value xsi:type="java:java.lang.String">testsuite.TestPortlet2</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
    </coplet-data>
    <coplet-data id="TestPortlet1" name="standard">
@@ -441,11 +441,11 @@
       <coplet-base-data>Portlet</coplet-base-data>
       <attribute>
          <name>portlet</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">webapp.TestPortlet1</value>
+         <value xsi:type="java:java.lang.String">webapp.TestPortlet1</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
    </coplet-data>
    <coplet-data id="CocoonPortlet" name="standard">
@@ -453,11 +453,11 @@
       <coplet-base-data>Portlet</coplet-base-data>
       <attribute>
          <name>portlet</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">webapp.CocoonPortlet</value>
+         <value xsi:type="java:java.lang.String">webapp.CocoonPortlet</value>
       </attribute>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
    </coplet-data>
 
@@ -471,19 +471,19 @@
       <coplet-base-data>CachingURICoplet</coplet-base-data>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>handleParameters</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/html/application</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/html/application</value>
       </attribute>
       <attribute>
          <name>temporary:application-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/samples/form</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/samples/form</value>
       </attribute>
    </coplet-data>
    <coplet-data id="app-test-two" name="standard">
@@ -491,19 +491,19 @@
       <coplet-base-data>CachingURICoplet</coplet-base-data>
       <attribute>
          <name>buffer</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>handleParameters</name>
-         <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+         <value xsi:type="java:java.lang.Boolean">true</value>
       </attribute>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/html/application</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/html/application</value>
       </attribute>
       <attribute>
          <name>temporary:application-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/flow/jxcalc/</value>
+         <value xsi:type="java:java.lang.String">cocoon://samples/flow/jxcalc/</value>
       </attribute>
    </coplet-data>
 
@@ -513,11 +513,43 @@
       <coplet-base-data>Application</coplet-base-data>
       <attribute>
          <name>uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/html/app-coplet</value>
+         <value xsi:type="java:java.lang.String">cocoon:/coplets/html/app-coplet</value>
       </attribute>
       <attribute>
          <name>start-uri</name>
-         <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://www.google.com/index.html</value>
+         <value xsi:type="java:java.lang.String">http://www.google.com/index.html</value>
       </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/blocks/portal/trunk/samples/profiles/copletinstancedata/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/profiles/copletinstancedata/portal.xml?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/profiles/copletinstancedata/portal.xml (original)
+++ cocoon/blocks/portal/trunk/samples/profiles/copletinstancedata/portal.xml Tue Aug 30 04:10:28 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id:$ -->
+<!-- SVN $Id$ -->
 <coplets>
    <coplet-instance-data id="Newsweek-1" name="standard">
       <coplet-data>Newsweek</coplet-data>
@@ -192,6 +192,14 @@
    </coplet-instance-data>
    <coplet-instance-data id="Google-1" name="standard">
       <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/blocks/portal/trunk/samples/profiles/layout/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/profiles/layout/portal.xml?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/profiles/layout/portal.xml (original)
+++ cocoon/blocks/portal/trunk/samples/profiles/layout/portal.xml Tue Aug 30 04:10:28 2005
@@ -14,8 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id:$ -->
+<!-- SVN $Id$ -->
 <composite-layout name="tab" id="maintab">
+
   <named-item name="Main">
     <coplet-layout name="coplet">
       <coplet-instance-data>Portal-Demo-1</coplet-instance-data>
@@ -212,6 +213,21 @@
             </coplet-layout>
           </item>
         </composite-layout>
+      </item>
+    </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>

Added: cocoon/blocks/portal/trunk/samples/profiles/wsrp-config.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/profiles/wsrp-config.xml?rev=264757&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/samples/profiles/wsrp-config.xml (added)
+++ cocoon/blocks/portal/trunk/samples/profiles/wsrp-config.xml Tue Aug 30 04:10:28 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- @version $Id$ -->
+<wsrp-config>
+  <producers>
+    <producer id="prod_localhost_8081">
+      <markup-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPBaseService</markup-interface-url>
+      <service-description-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPServiceDescriptionService</service-description-interface-url>
+      <registration-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPRegistrationService</registration-interface-url>
+      <portlet-management-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPPortletManagementService</portlet-management-interface-url>
+      <name>WSRP4j</name>
+      <description>This is the test producer from the WSRP4J project.</description>
+    </producer>
+  </producers>
+</wsrp-config>

Propchange: cocoon/blocks/portal/trunk/samples/profiles/wsrp-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal/trunk/samples/profiles/wsrp-config.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/portal/trunk/samples/sitemap-auth.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/sitemap-auth.xmap?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/sitemap-auth.xmap (original)
+++ cocoon/blocks/portal/trunk/samples/sitemap-auth.xmap Tue Aug 30 04:10:28 2005
@@ -184,6 +184,10 @@
       <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/blocks/portal/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/sitemap.xmap?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/portal/trunk/samples/sitemap.xmap Tue Aug 30 04:10:28 2005
@@ -157,6 +157,10 @@
       <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>

Added: cocoon/blocks/portal/trunk/samples/skins/basic/css/wsrp.css
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/skins/basic/css/wsrp.css?rev=264757&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/samples/skins/basic/css/wsrp.css (added)
+++ cocoon/blocks/portal/trunk/samples/skins/basic/css/wsrp.css Tue Aug 30 04:10:28 2005
@@ -0,0 +1,65 @@
+/*
+* Copyright 2005 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+<!-- all css-specification of an (wsrp-)portlet -->
+
+<!-- Fonts -->
+portlet-font                { font-size:10pt;}
+portlet-font-dim            { }
+
+<!-- Messages -->
+portlet-msg-status          { }
+portlet-msg-info            { } 
+portlet-msg-error           { }
+portlet-msg-alert           { }
+portlet-msg-success         { }
+
+<!-- Sections -->
+portlet-section-header      { }
+portlet-section-body        { }
+portlet-section-alternate   { }
+portlet-section-selected    { }
+portlet-section-subheader   { }
+portlet-section-footer      { }
+portlet-section-text        { }
+
+<!-- Tables -->
+portlet-table-header        { }
+portlet-table-body          { }
+portlet-table-alternate     { }
+portlet-table-selected      { }
+portlet-table-subheader     { }
+portlet-table-footer        { }
+portlet-table-text          { }
+
+<!-- Forms -->
+portlet-form-label          { }
+portlet-form-input-field    { }
+portlet-form-button         { }
+portlet-icon-label          { }
+portlet-dlg-icon-label      { }
+portlet-form-field-label    { }
+portlet-form-field          { }
+
+<!-- Menus -->
+portlet-menu                { }
+portlet-menu-item           { }
+portlet-menu-item-selected  { }
+portlet-menu-item-hover     { }
+portlet-menu-item-hover-selected { }
+portlet-menu-cascade-item   { }
+portlet-menu-cascade-item-selected { }
+portlet-menu-description    { }
+portlet-menu-caption        { }
\ No newline at end of file

Propchange: cocoon/blocks/portal/trunk/samples/skins/basic/css/wsrp.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal/trunk/samples/skins/basic/css/wsrp.css
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/portal/trunk/samples/skins/basic/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/skins/basic/styles/portal-page.xsl?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/skins/basic/styles/portal-page.xsl (original)
+++ cocoon/blocks/portal/trunk/samples/skins/basic/styles/portal-page.xsl Tue Aug 30 04:10:28 2005
@@ -27,6 +27,7 @@
 	<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%">

Added: cocoon/blocks/portal/trunk/samples/skins/common/css/wsrp.css
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/skins/common/css/wsrp.css?rev=264757&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/samples/skins/common/css/wsrp.css (added)
+++ cocoon/blocks/portal/trunk/samples/skins/common/css/wsrp.css Tue Aug 30 04:10:28 2005
@@ -0,0 +1,65 @@
+/*
+* Copyright 2005 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+<!-- all css-specification of an (wsrp-)portlet -->
+
+<!-- Fonts -->
+portlet-font                { font-size:10pt;}
+portlet-font-dim            { }
+
+<!-- Messages -->
+portlet-msg-status          { }
+portlet-msg-info            { } 
+portlet-msg-error           { }
+portlet-msg-alert           { }
+portlet-msg-success         { }
+
+<!-- Sections -->
+portlet-section-header      { }
+portlet-section-body        { }
+portlet-section-alternate   { }
+portlet-section-selected    { }
+portlet-section-subheader   { }
+portlet-section-footer      { }
+portlet-section-text        { }
+
+<!-- Tables -->
+portlet-table-header        { }
+portlet-table-body          { }
+portlet-table-alternate     { }
+portlet-table-selected      { }
+portlet-table-subheader     { }
+portlet-table-footer        { }
+portlet-table-text          { }
+
+<!-- Forms -->
+portlet-form-label          { }
+portlet-form-input-field    { }
+portlet-form-button         { }
+portlet-icon-label          { }
+portlet-dlg-icon-label      { }
+portlet-form-field-label    { }
+portlet-form-field          { }
+
+<!-- Menus -->
+portlet-menu                { }
+portlet-menu-item           { }
+portlet-menu-item-selected  { }
+portlet-menu-item-hover     { }
+portlet-menu-item-hover-selected { }
+portlet-menu-cascade-item   { }
+portlet-menu-cascade-item-selected { }
+portlet-menu-description    { }
+portlet-menu-caption        { }
\ No newline at end of file

Propchange: cocoon/blocks/portal/trunk/samples/skins/common/css/wsrp.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal/trunk/samples/skins/common/css/wsrp.css
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/portal/trunk/samples/skins/common/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/skins/common/styles/portal-page.xsl?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/skins/common/styles/portal-page.xsl (original)
+++ cocoon/blocks/portal/trunk/samples/skins/common/styles/portal-page.xsl Tue Aug 30 04:10:28 2005
@@ -27,6 +27,7 @@
     <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> 

Modified: cocoon/blocks/portal/trunk/samples/skins/common/styles/window.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/samples/skins/common/styles/window.xsl?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/samples/skins/common/styles/window.xsl (original)
+++ cocoon/blocks/portal/trunk/samples/skins/common/styles/window.xsl Tue Aug 30 04:10:28 2005
@@ -85,6 +85,9 @@
 	  			</a>
             </td>
 			</xsl:if>
+          <xsl:if test="edit-uri or view-uri or help-uri">
+			  <td width="15">&#160;</td>
+          </xsl:if>
 			<xsl:if test="fullscreen-uri and not(maximize-uri)">
             <td width="15">
 				<a href="{fullscreen-uri}">

Modified: cocoon/trunk/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Tue Aug 30 04:10:28 2005
@@ -928,6 +928,10 @@
     <depend project="portals-pluto" inherit="runtime"/>
     <depend project="portals-bridges-common"/>
     <depend project="cowarp"/>
+    <depend project="ws-axis"/>
+    <depend project="wsdl4j"/>
+    <depend project="wsrp4j"/>
+    <depend project="commons-discovery"/>
 
     <library name="jtidy"/>
     <library name="nekohtml"/>
@@ -937,6 +941,13 @@
     <library name="portlet-api"/>
     <library name="portals-bridges-common"/>
     <library name="cowarp"/>
+    <library name="axis"/>
+    <library name="axis-saaj"/>
+    <library name="axis-jaxrpc"/>
+    <library name="wsdl4j"/>
+    <library name="commons-discovery"/>
+    <library name="wsrp4j-shared"/>
+    <library name="wsrp4j-consumer"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
@@ -1570,5 +1581,12 @@
     <!-- It would be better to *build* Garbage actually. -->
     <package>org.apache.garbage</package>
     <jar name="lib/optional/apache-garbage-0.0.jar"/>
+  </project>
+
+  <project name="wsrp4j">
+    <url href="http://ws.apache.org/wsrp4j/"/>
+    <package>org.apache.wsrp4j</package>
+    <jar name="lib/optional/wsrp4j-shared-0.3-dev.jar"/>
+    <jar name="lib/optional/wsrp4j-consumer-0.3-dev.jar"/>
   </project>
 </module>

Added: cocoon/trunk/legal/wsrp4j-consumer-0.3-dev.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/wsrp4j-consumer-0.3-dev.jar.license.txt?rev=264757&view=auto
==============================================================================
--- cocoon/trunk/legal/wsrp4j-consumer-0.3-dev.jar.license.txt (added)
+++ cocoon/trunk/legal/wsrp4j-consumer-0.3-dev.jar.license.txt Tue Aug 30 04:10:28 2005
@@ -0,0 +1,190 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2004 The Apache Software Foundation
+

Propchange: cocoon/trunk/legal/wsrp4j-consumer-0.3-dev.jar.license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/legal/wsrp4j-consumer-0.3-dev.jar.license.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/legal/wsrp4j-shared-0.3-dev.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/wsrp4j-shared-0.3-dev.jar.license.txt?rev=264757&view=auto
==============================================================================
--- cocoon/trunk/legal/wsrp4j-shared-0.3-dev.jar.license.txt (added)
+++ cocoon/trunk/legal/wsrp4j-shared-0.3-dev.jar.license.txt Tue Aug 30 04:10:28 2005
@@ -0,0 +1,190 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2004 The Apache Software Foundation
+

Propchange: cocoon/trunk/legal/wsrp4j-shared-0.3-dev.jar.license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/legal/wsrp4j-shared-0.3-dev.jar.license.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Tue Aug 30 04:10:28 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -1270,6 +1270,26 @@
     <lib>core/knopflerfish-logcommands-1.0.0.jar</lib>
     <homepage>http://www.knopflerfish.org/</homepage>
   </file>   
+
+  <file id="wsrp4j-shared">
+    <title>WSRP4J Shared</title>
+    <description>
+      WSRP implementation from the WSRP4J project.
+    </description>
+    <used-by>Portal block</used-by>
+    <lib>optional/wsrp4j-shared-0.3-dev.jar</lib>
+    <homepage>http://ws.apache.org/wsrp4j/</homepage>
+  </file>
+
+  <file id="wsrp-consumer">
+    <title>WSRP4J Consumer</title>
+    <description>
+      WSRP implementation from the WSRP4J project.
+    </description>
+    <used-by>Portal block</used-by>
+    <lib>optional/wsrp4j-consumer-0.3-dev.jar</lib>
+    <homepage>http://ws.apache.org/wsrp4j/</homepage>
+  </file>
 
 </jars>
 

Added: cocoon/trunk/lib/optional/wsrp4j-consumer-0.3-dev.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/wsrp4j-consumer-0.3-dev.jar?rev=264757&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/optional/wsrp4j-consumer-0.3-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/trunk/lib/optional/wsrp4j-shared-0.3-dev.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/wsrp4j-shared-0.3-dev.jar?rev=264757&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/optional/wsrp4j-shared-0.3-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=264757&r1=264756&r2=264757&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Tue Aug 30 04:10:28 2005
@@ -531,6 +531,9 @@
   </release>
   <release version="2.1.8" date="TBD">
     <action dev="CZ" type="add">
+      Portal block: Add WSRP consumer support (through WSRP4J).
+    </action>
+    <action dev="CZ" type="add">
       Add possibility to remove comments to all text based serializers and to cinclude transformer.
     </action>
     <action dev="AG" type="update">



Mime
View raw message