Author: emuckenhuber Date: 2007-12-14 08:53:40 -0500 (Fri, 14 Dec 2007) New Revision: 9344 Added: modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_1_0.xml modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_2_0.xml Modified: modules/portlet/trunk/test/src/resources/metadata/customPortletMode/portlet2.xml modules/portlet/trunk/test/src/resources/metadata/general/portlet2-jsr286.xml modules/portlet/trunk/test/src/resources/metadata/portlet-app_2_0.xsd modules/portlet/trunk/test/src/resources/metadata/portlet/portlet2-jsr286.xml modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml Log: - xsd update to rev.30 and xml updates Modified: modules/portlet/trunk/test/src/resources/metadata/customPortletMode/portlet2.xml =================================================================== --- modules/portlet/trunk/test/src/resources/metadata/customPortletMode/portlet2.xml 2007-12-14 13:51:58 UTC (rev 9343) +++ modules/portlet/trunk/test/src/resources/metadata/customPortletMode/portlet2.xml 2007-12-14 13:53:40 UTC (rev 9344) @@ -31,14 +31,11 @@ <description xml:lang="de">eigener portlet modus</description> <portlet-mode>Custom</portlet-mode> <portal-managed>true</portal-managed> - <decoration-name>Portlet Mode One</decoration-name> - <decoration-name xml:lang="de">Eigener Portlet Modus Eins</decoration-name> </custom-portlet-mode> <custom-portlet-mode> <portlet-mode>Custom2</portlet-mode> <portal-managed>false</portal-managed> - <decoration-name>Portlet Mode One</decoration-name> </custom-portlet-mode> <custom-portlet-mode> Added: modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_1_0.xml =================================================================== --- modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_1_0.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_1_0.xml 2007-12-14 13:53:40 UTC (rev 9344) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + version="1.0" + id="id"> + <portlet id="id"> + <description xml:lang="en">description</description> + <portlet-name>portlet-name</portlet-name> + <display-name xml:lang="en">display-name</display-name> + <portlet-class>portlet-class</portlet-class> + <init-param id="id"> + <description xml:lang="en">description</description> + <name>name</name> + <value>value</value> + </init-param> + <expiration-cache>0</expiration-cache> + <supports id="id"> + <mime-type>mime-type</mime-type> + <portlet-mode>portlet-mode</portlet-mode> + </supports> + <supported-locale>supported-locale</supported-locale> + <resource-bundle>resource-bundle</resource-bundle> + <portlet-info id="id"> + <title>title</title> + <short-title>short-title</short-title> + <keywords>keywords</keywords> + </portlet-info> + <portlet-preferences id="id"> + <preference id="id"> + <name>name</name> + <value>value</value> + <read-only>true</read-only> + </preference> + <preferences-validator>preferences-validator</preferences-validator> + </portlet-preferences> + <security-role-ref id="id"> + <description xml:lang="">description</description> + <role-name>NMTOKEN</role-name> + <role-link>role-link</role-link> + </security-role-ref> + </portlet> + <custom-portlet-mode id="id"> + <description xml:lang="en">description</description> + <portlet-mode>portlet-mode</portlet-mode> + </custom-portlet-mode> + <custom-window-state id="id"> + <description xml:lang="en">description</description> + <window-state>window-state</window-state> + </custom-window-state> + <user-attribute id=""> + <description xml:lang="en">description</description> + <name>name</name> + </user-attribute> + <security-constraint id="id"> + <display-name xml:lang="en">display-name</display-name> + <portlet-collection> + <portlet-name>portlet-name</portlet-name> + </portlet-collection> + <user-data-constraint id=""> + <description xml:lang="">description</description> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> +</portlet-app> Added: modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_2_0.xml =================================================================== --- modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_2_0.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/metadata/general/portlet-app_2_0.xml 2007-12-14 13:53:40 UTC (rev 9344) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0" + id="id"> + <portlet id="id"> + <description xml:lang="en">description</description> + <portlet-name>portlet-name</portlet-name> + <display-name xml:lang="en">display-name</display-name> + <portlet-class>portlet-class</portlet-class> + <init-param id="id"> + <description xml:lang="en">description</description> + <name>name</name> + <value>value</value> + </init-param> + <expiration-cache>0</expiration-cache> + <cache-scope>PRIVATE</cache-scope> + <supports id="id"> + <mime-type>mime-type</mime-type> + <portlet-mode>portlet-mode</portlet-mode> + <window-state>window-state</window-state> + </supports> + <supported-locale>supported-locale</supported-locale> + <resource-bundle>resource-bundle</resource-bundle> + <portlet-info id="id"> + <title>title</title> + <short-title>short-title</short-title> + <keywords>keywords</keywords> + </portlet-info> + <portlet-preferences id="id"> + <preference id="id"> + <name>name</name> + <value>value</value> + <read-only>true</read-only> + </preference> + <preferences-validator>preferences-validator</preferences-validator> + </portlet-preferences> + <security-role-ref id="id"> + <description xml:lang="en">description</description> + <role-name>NMTOKEN</role-name> + <role-link>role-link</role-link> + </security-role-ref> + <supported-processing-event id="id"> + <qname>QName</qname> + </supported-processing-event> + <supported-publishing-event id="id"> + <qname>QName</qname> + </supported-publishing-event> + <supported-public-render-parameter>supported-public-render-parameter</supported-public-render-parameter> + <container-runtime-option> + <name>name</name> + <value>value</value> + </container-runtime-option> + </portlet> + <custom-portlet-mode id="id"> + <description xml:lang="en">description</description> + <portlet-mode>portlet-mode</portlet-mode> + <portal-managed>true</portal-managed> + </custom-portlet-mode> + <custom-window-state id="id"> + <description xml:lang="en">description</description> + <window-state>window-state</window-state> + </custom-window-state> + <user-attribute id="id"> + <description xml:lang="en">description</description> + <name>name</name> + </user-attribute> + <security-constraint id="id"> + <display-name xml:lang="en">display-name</display-name> + <portlet-collection> + <portlet-name>portlet-name</portlet-name> + </portlet-collection> + <user-data-constraint id="id"> + <description xml:lang="en">description</description> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> + <resource-bundle>resource-bundle</resource-bundle> + <filter> + <description xml:lang="en">description</description> + <display-name xml:lang="en">display-name</display-name> + <filter-name>filter-name</filter-name> + <filter-class>filter-class</filter-class> + <lifecycle>lifecycle</lifecycle> + <init-param id=""> + <description xml:lang="en">description</description> + <name>name</name> + <value>value</value> + </init-param> + </filter> + <filter-mapping> + <filter-name>filter-name</filter-name> + <portlet-name>portlet-name</portlet-name> + </filter-mapping> + <default-namespace>http://tempuri.org</default-namespace> + <event-definition id="id"> + <description xml:lang="en">description</description> + <qname>QName</qname> + <alias>QName</alias> + <value-type>value-type</value-type> + </event-definition> + <public-render-parameter id="id"> + <description xml:lang="en">description</description> + <identifier>identifier</identifier> + <qname>QName</qname> + <alias>QName</alias> + </public-render-parameter> + <listener id="id"> + <description xml:lang="en">description</description> + <display-name xml:lang="en">display-name</display-name> + <listener-class>listener-class</listener-class> + </listener> + <container-runtime-option> + <name>name</name> + <value>value</value> + </container-runtime-option> +</portlet-app> Modified: modules/portlet/trunk/test/src/resources/metadata/general/portlet2-jsr286.xml =================================================================== --- modules/portlet/trunk/test/src/resources/metadata/general/portlet2-jsr286.xml 2007-12-14 13:51:58 UTC (rev 9343) +++ modules/portlet/trunk/test/src/resources/metadata/general/portlet2-jsr286.xml 2007-12-14 13:53:40 UTC (rev 9344) @@ -344,6 +344,19 @@ <alias>Parameter1</alias> <alias>Parameter2</alias> </public-render-parameter> + + <listener id="myListener1"> + <description>Description EN</description> + <description xml:lang="de">Beschreibung</description> + <display-name>My Listener One</display-name> + <display-name xml:lang="de">Mein Zuhörer Eins</display-name> + <listener-class>org.jboss.portal.portlet.test.listener.MyListener</listener-class> + </listener> + + <listener id="myListener2"> + <display-name>My Listener Two</display-name> + <listener-class>org.jboss.portal.portlet.test.listener.MyListenerTwo</listener-class> + </listener> <container-runtime-option> <name>foo</name> Modified: modules/portlet/trunk/test/src/resources/metadata/portlet/portlet2-jsr286.xml =================================================================== --- modules/portlet/trunk/test/src/resources/metadata/portlet/portlet2-jsr286.xml 2007-12-14 13:51:58 UTC (rev 9343) +++ modules/portlet/trunk/test/src/resources/metadata/portlet/portlet2-jsr286.xml 2007-12-14 13:53:40 UTC (rev 9344) @@ -93,14 +93,6 @@ <supported-public-render-parameter>bar</supported-public-render-parameter> <supported-public-render-parameter>foo2</supported-public-render-parameter> <supported-public-render-parameter>foo2bar</supported-public-render-parameter> - - <url-generation-listener> - org.jboss.portal.test.url.generation.listener - </url-generation-listener> - <url-generation-listener> - org.jboss.portal.test.url.generation.listener.foo - </url-generation-listener> - <container-runtime-option> <name>option1</name> <value>value1</value> Modified: modules/portlet/trunk/test/src/resources/metadata/portlet-app_2_0.xsd =================================================================== --- modules/portlet/trunk/test/src/resources/metadata/portlet-app_2_0.xsd 2007-12-14 13:51:58 UTC (rev 9343) +++ modules/portlet/trunk/test/src/resources/metadata/portlet-app_2_0.xsd 2007-12-14 13:53:40 UTC (rev 9344) @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xs... - xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.... - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="2.0" - xml:lang="en"> - +<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xs... xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.... elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xml:lang="en"> <annotation> <documentation> This is the XML Schema for the Portlet 2.0 deployment descriptor. @@ -144,10 +136,11 @@ <element name="default-namespace" type="xs:anyURI" minOccurs="0"/> <element name="event-definition" type="portlet:event-definitionType" minOccurs="0" maxOccurs="unbounded"/> <element name="public-render-parameter" type="portlet:public-render-parameterType" minOccurs="0" maxOccurs="unbounded"/> + <element name="listener" type="portlet:listenerType" minOccurs="0" maxOccurs="unbounded"/> <element name="container-runtime-option" type="portlet:container-runtime-optionType" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="version" type="string" use="required"/> - <attribute name="id" type="string" use="optional"/> + <attribute name="version" type="portlet:string" use="required"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="cache-scopeType"> <annotation> @@ -159,7 +152,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="custom-portlet-modeType"> @@ -170,12 +163,6 @@ If the portal does not need to provide some management functionality for this portlet mode, the portal-managed element needs to be set to "false", otherwise to "true". Default is "true". - If the portlet provides a decoration-name for this portlet mode the portal is - encouraged to use the provided name as key under which in the portlet - resource bundle the localized value of the decoration name is available. - If the portlet does not provide a resource bundle the portal should use - the name provided with the decoration-name tag. - decorations. Used in: portlet-app </documentation> </annotation> @@ -183,9 +170,8 @@ <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <element name="portlet-mode" type="portlet:portlet-modeType"/> <element name="portal-managed" type="portlet:portal-managedType" minOccurs="0"/> - <element name="decoration-name" type="portlet:display-nameType" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="custom-window-stateType"> <annotation> @@ -199,12 +185,12 @@ <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <element name="window-state" type="portlet:window-stateType"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="expiration-cacheType"> <annotation> <documentation> - Expriation-time defines the time in seconds after which the portlet output expires. + Expiration-time defines the time in seconds after which the portlet output expires. -1 indicates that the output never expires. Used in: portlet </documentation> @@ -226,7 +212,7 @@ <element name="name" type="portlet:nameType"/> <element name="value" type="portlet:valueType"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="keywordsType"> <annotation> @@ -237,7 +223,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="mime-typeType"> @@ -250,7 +236,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="nameType"> @@ -261,7 +247,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="portletType"> @@ -281,22 +267,16 @@ <element name="cache-scope" type="portlet:cache-scopeType" minOccurs="0"/> <element name="supports" type="portlet:supportsType" maxOccurs="unbounded"/> <element name="supported-locale" type="portlet:supported-localeType" minOccurs="0" maxOccurs="unbounded"/> - <choice> - <sequence> - <element name="resource-bundle" type="portlet:resource-bundleType"/> - <element name="portlet-info" type="portlet:portlet-infoType" minOccurs="0"/> - </sequence> - <element name="portlet-info" type="portlet:portlet-infoType"/> - </choice> + <element name="resource-bundle" type="portlet:resource-bundleType" minOccurs="0"/> + <element name="portlet-info" type="portlet:portlet-infoType" minOccurs="0"/> <element name="portlet-preferences" type="portlet:portlet-preferencesType" minOccurs="0"/> <element name="security-role-ref" type="portlet:security-role-refType" minOccurs="0" maxOccurs="unbounded"/> <element name="supported-processing-event" type="portlet:event-definition-referenceType" minOccurs="0" maxOccurs="unbounded"/> <element name="supported-publishing-event" type="portlet:event-definition-referenceType" minOccurs="0" maxOccurs="unbounded"/> - <element name="supported-public-render-parameter" type="string" minOccurs="0" maxOccurs="unbounded"/> - <element name="url-generation-listener" type="portlet:fully-qualified-classType" minOccurs="0" maxOccurs="unbounded"/> + <element name="supported-public-render-parameter" type="portlet:string" minOccurs="0" maxOccurs="unbounded"/> <element name="container-runtime-option" type="portlet:container-runtime-optionType" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <simpleType name="portlet-classType"> <annotation> @@ -368,7 +348,7 @@ <element name="display-name" type="portlet:display-nameType" minOccurs="0" maxOccurs="unbounded"/> <element name="filter-name" type="portlet:filter-nameType"/> <element name="filter-class" type="portlet:fully-qualified-classType"/> - <element name="lifecycle" type="string" maxOccurs="unbounded"/> + <element name="lifecycle" type="portlet:string" maxOccurs="unbounded"/> <element name="init-param" type="portlet:init-paramType" minOccurs="0" maxOccurs="unbounded"/> </sequence> </complexType> @@ -399,34 +379,48 @@ <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <choice> <element name="qname" type="xs:QName"/> - <element name="name" type="string"/> + <element name="name" type="xs:NCName"/> </choice> <element name="alias" type="xs:QName" minOccurs="0" maxOccurs="unbounded"/> <element name="value-type" type="portlet:fully-qualified-classType" minOccurs="0"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="event-definition-referenceType"> <annotation> <documentation> - The event-definition-referenceType is used to refernece events - declared with the event-definition element on application level. + The event-definition-referenceType is used to reference events + declared with the event-definition element at application level. Used in: portlet </documentation> </annotation> <choice> <element name="qname" type="xs:QName"/> - <element name="name" type="string"/> + <element name="name" type="xs:NCName"/> </choice> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> + <complexType name="listenerType"> + <annotation> + <documentation> + The listenerType is used to declare listeners for this portlet application. + Used in: portlet-app + </documentation> + </annotation> + <sequence> + <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> + <element name="display-name" type="portlet:display-nameType" minOccurs="0" maxOccurs="unbounded"/> + <element name="listener-class" type="portlet:fully-qualified-classType"/> + </sequence> + <attribute name="id" type="portlet:string" use="optional"/> + </complexType> <complexType name="portlet-infoType"> <sequence> <element name="title" type="portlet:titleType" minOccurs="0"/> <element name="short-title" type="portlet:short-titleType" minOccurs="0"/> <element name="keywords" type="portlet:keywordsType" minOccurs="0"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <simpleType name="portal-managedType"> <annotation> @@ -456,7 +450,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="portlet-nameType"> @@ -469,7 +463,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="portlet-preferencesType"> @@ -483,7 +477,7 @@ <element name="preference" type="portlet:preferenceType" minOccurs="0" maxOccurs="unbounded"/> <element name="preferences-validator" type="portlet:preferences-validatorType" minOccurs="0"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="preferenceType"> <annotation> @@ -498,7 +492,7 @@ <element name="value" type="portlet:valueType" minOccurs="0" maxOccurs="unbounded"/> <element name="read-only" type="portlet:read-onlyType" minOccurs="0"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <simpleType name="preferences-validatorType"> <annotation> @@ -539,7 +533,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="role-linkType"> @@ -552,7 +546,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="security-constraintType"> @@ -568,7 +562,7 @@ <element name="portlet-collection" type="portlet:portlet-collectionType"/> <element name="user-data-constraint" type="portlet:user-data-constraintType"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="security-role-refType"> <annotation> @@ -591,7 +585,7 @@ <element name="role-name" type="portlet:role-nameType"/> <element name="role-link" type="portlet:role-linkType" minOccurs="0"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="public-render-parameterType"> <annotation> @@ -604,14 +598,14 @@ </annotation> <sequence> <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> - <element name="identifier" type="string"/> + <element name="identifier" type="portlet:string"/> <choice> <element name="qname" type="xs:QName"/> - <element name="name" type="string"/> + <element name="name" type="xs:NCName"/> </choice> <element name="alias" type="xs:QName" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="short-titleType"> <annotation> @@ -621,7 +615,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="supportsType"> @@ -638,7 +632,7 @@ <element name="portlet-mode" type="portlet:portlet-modeType" minOccurs="0" maxOccurs="unbounded"/> <element name="window-state" type="portlet:window-stateType" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="supported-localeType"> <annotation> @@ -648,7 +642,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="titleType"> @@ -659,7 +653,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <simpleType name="transport-guaranteeType"> @@ -703,7 +697,7 @@ <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <element name="name" type="portlet:nameType"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="user-data-constraintType"> <annotation> @@ -718,7 +712,7 @@ <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <element name="transport-guarantee" type="portlet:transport-guaranteeType"/> </sequence> - <attribute name="id" type="string" use="optional"/> + <attribute name="id" type="portlet:string" use="optional"/> </complexType> <complexType name="valueType"> <annotation> @@ -728,7 +722,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <complexType name="window-stateType"> @@ -739,7 +733,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"/> + <extension base="portlet:string"/> </simpleContent> </complexType> <!--- everything below is copied from j2ee_1_4.xsd --> @@ -761,7 +755,7 @@ </documentation> </annotation> <simpleContent> - <extension base="string"> + <extension base="portlet:string"> <attribute ref="xml:lang"/> </extension> </simpleContent> @@ -810,7 +804,7 @@ <simpleType name="string"> <annotation> <documentation> - This is a special string datatype that is defined by J2EE + This is a special string datatype that is defined by JavaEE as a base type for defining collapsed strings. When schemas require trailing/leading space elimination as well as collapsing the existing whitespace, this base Modified: modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml =================================================================== --- modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml 2007-12-14 13:51:58 UTC (rev 9343) +++ modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml 2007-12-14 13:53:40 UTC (rev 9344) @@ -21,30 +21,66 @@ </test> <test> <class name="org.jboss.portal.portlet.test.metadata.CustomPortletModeTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.CustomWindowStateTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.EventTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.FilterTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.GeneralMetaDataTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.PortletTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.RenderParameterTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.SecurityConstraintTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> <test> <class name="org.jboss.portal.portlet.test.metadata.UserAttributeTestEverythingTestCase" /> + <parameter name="parser"> + <value>annotation</value> + <value>factory</value> + </parameter> </test> </pojo> </jboss-unit>