Author: chris.laprun(a)jboss.com Date: 2008-01-08 18:59:27 -0500 (Tue, 08 Jan 2008) New Revision: 9460 Added: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-consumer_2_6.xsd Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd Log: - JBPORTAL-1835: Created XML schema for -wsrp.xml format. - Use elementFormDefault="qualified" for easier use in instance documents (the only thing that is needed is an anonymous namespace and the schema location). Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2008-01-08 16:07:37 UTC (rev 9459) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2008-01-08 23:59:27 UTC (rev 9460) @@ -21,11 +21,13 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- <!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> +--> <!-- Configuration using registration with default registration property validator. --> -<producer-configuration> +<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_6"> <registration-configuration fullServiceDescriptionRequiresRegistration="true"> <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator </registration-property-validator> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2008-01-08 16:07:37 UTC (rev 9459) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2008-01-08 23:59:27 UTC (rev 9460) @@ -23,10 +23,10 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN" - "http://www.jboss.org/portal/dtd/jboss-wsrp-consumer_2_6.dtd"> +<!--<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-consumer_2_6.dtd">--> -<deployments> +<deployments xmlns="urn:jboss:portal:wsrp:consumer:v2_6"> <deployment> <wsrp-producer id="self" expiration-cache="300"> <!-- Added: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-consumer_2_6.xsd =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-consumer_2_6.xsd (rev 0) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-consumer_2_6.xsd 2008-01-08 23:59:27 UTC (rev 9460) @@ -0,0 +1,194 @@ +<?xml version="1.0"?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:jboss:portal:wsrp:consumer:v2_6" + xmlns="urn:jboss:portal:wsrp:consumer:v2_6" + xmlns:xml="http://www.w3.org/XML/1998/namespace" + xmlns:wcc="urn:jboss:portal:wsrp:consumer:v2_6" + elementFormDefault="qualified"> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace"/> + + <xs:element name="deployments"> + <xs:annotation> + <xs:documentation>Root element. Contains deployment elements.</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element name="deployment" type="wcc:Deployment" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:complexType name="Deployment"> + <xs:annotation> + <xs:documentation>Deployment related information. As of Portal 2.6, the only deployment information relates to + WSRP remote producers.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="wsrp-producer" type="wcc:WSRPProducer" maxOccurs="1" minOccurs="1"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="WSRPProducer"> + <xs:annotation> + <xs:documentation>Information on a remote WSRP producer identified by the mandatory id attribute.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:choice> + <xs:element name="endpoint-config" type="wcc:EndpointConfig"> + <xs:annotation> + <xs:documentation> + WSRP endpoints configuration information by interface URL. Mutually exclusive with endpoint-wsdl-url. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="endpoint-wsdl-url" type="xs:anyURI"> + <xs:annotation> + <xs:documentation> + The URL of the WSDL description of the producer's WSRP services. Mutally exclusive with endpoint-config. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:choice> + <xs:element name="registration-data" type="wcc:RegistrationData" minOccurs="0"> + <xs:annotation> + <xs:documentation> + Container for registration information. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + <xs:attribute name="id" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation> + The producer identifier. This should be unique for a given Portal deployment. The identifier is used to + identify the portlet provider in the management interface. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="expiration-cache" type="wcc:cacheValue" use="required"> + <xs:annotation> + <xs:documentation>The period of producer information (such as list of offered portlets) cache refreshing in seconds.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + + <xs:simpleType name="cacheValue" id="cacheValue"> + <xs:annotation> + <xs:documentation> + Type for cache information. Positive or null integer, allowing -1 as a value to indicate that cache should not + be used. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <xs:minInclusive value="-1"/> + </xs:restriction> + </xs:simpleType> + + <xs:complexType name="EndpointConfig"> + <xs:sequence> + <xs:element name="service-description-url" type="xs:anyURI"> + <xs:annotation> + <xs:documentation> + The mandatory URL for the service description interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="markup-url" type="xs:anyURI"> + <xs:annotation> + <xs:documentation> + The madatory URL for the markup interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="registration-url" type="xs:anyURI" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:documentation> + The optional URL for the registration interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="portlet-management-url" type="xs:anyURI" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:documentation> + The optional URL for the portlet management interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="RegistrationData"> + <xs:sequence> + <xs:element name="consumer-name" type="xs:string" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:documentation> + 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. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="property" type="wcc:Property" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + Optional registration properties required by the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="Property"> + <xs:annotation> + <xs:documentation> + Registration property. + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="name" type="xs:string"> + <xs:annotation> + <xs:documentation> + Name of the property. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="lang" type="xs:language"> + <xs:annotation> + <xs:documentation> + Language the property is in. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="value" type="xs:string"> + <xs:annotation> + <xs:documentation> + Value of the property. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> +</xs:schema> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2008-01-08 16:07:37 UTC (rev 9459) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2008-01-08 23:59:27 UTC (rev 9460) @@ -26,7 +26,7 @@ targetNamespace="urn:jboss:portal:wsrp:producer:v2_6" xmlns="urn:jboss:portal:wsrp:producer:v2_6" xmlns:xml="http://www.w3.org/XML/1998/namespace" - xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_6"> + xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_6" elementFormDefault="qualified"> <xs:import namespace="http://www.w3.org/XML/1998/namespace"/>