[jboss-svn-commits] JBoss Portal SVN: r5560 - in branches/JBoss_Portal_Branch_2_4/wsrp/src/resources: . portal-wsrp-sar

[jboss-svn-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-11-02 12:32:22 -0500 (Thu, 02 Nov 2006)
New Revision: 5560

Modified:
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd
   branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
Log:
- Removed optional consumer-name: if none is provided, one is generated by Portal.
- Updated DTD.

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd	2006-11-02 17:29:35 UTC (rev 5559)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/jboss-portal-wsrp.dtd	2006-11-02 17:32:22 UTC (rev 5560)
@@ -26,7 +26,7 @@
 able to consume WSRP portlets exposed by a remote producer.
 author: <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
 version: 1.0 (Portal 2.4)
-revision: $Revision: 5309 $
+revision: $Revision: 5440 $
 -->
 
 <!-- The root element. Contains deployment elements. -->
@@ -64,9 +64,12 @@
 <!ELEMENT endpoint-wsdl-url ( #PCDATA )>
 
 <!-- Container for registration information. -->
-<!ELEMENT registration-data ( consumer-name, property* )>
+<!ELEMENT registration-data ( consumer-name?, property* )>
 
-<!-- A name (preferably unique) that identifies the Consumer. An example of such a name would be the Consumer's URL. -->
+<!--
+An optional name (preferably unique) that identifies the Consumer. An example of such a name would be the Consumer's URL.
+If no consumer-name is provided, one will be automatically generated by JBoss Portal.
+-->
 <!ELEMENT consumer-name ( #PCDATA )>
 
 <!-- A registration property. -->

Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml	2006-11-02 17:29:35 UTC (rev 5559)
+++ branches/JBoss_Portal_Branch_2_4/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml	2006-11-02 17:32:22 UTC (rev 5560)
@@ -23,6 +23,9 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
+<!--<!DOCTYPE deployments PUBLIC "-//JBoss//DTD WSRP Remote Producer Configuration 1.0//EN"
+   "http://www.jboss.org/portal/dtd/jboss-portal-wsrp.dtd">-->
+
 <deployments>
    <deployment>
       <wsrp-producer>
@@ -41,9 +44,7 @@
          <producer-id>NetUnity</producer-id>
          <expiration-cache>120</expiration-cache>
          <endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSRPTestService.asmx?Operation=WSDL</endpoint-wsdl-url>
-         <registration-data>
-            <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
-         </registration-data>
+         <registration-data/>
       </wsrp-producer>
    </deployment>-->
    <!--<deployment>
@@ -52,7 +53,6 @@
       <expiration-cache>120</expiration-cache>
       <endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url>
       <registration-data>
-         <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
          <property>
             <name>com.vignette.wsrp.registration.username</name>
             <lang>en</lang>
@@ -72,7 +72,6 @@
          <expiration-cache>120</expiration-cache>
          <endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
          <registration-data>
-            <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
             <property>
                <name>registration/consumerRole</name>
                <lang>en</lang>
@@ -86,9 +85,7 @@
          <producer-id>oracle</producer-id>
          <expiration-cache>120</expiration-cache>
          <endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url>
-         <registration-data>
-            <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
-         </registration-data>
+         <registration-data/>
       </wsrp-producer>
    </deployment>-->
 </deployments>
\ No newline at end of file