portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [34/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/etc/xsd/examples/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/examples/j2-seed.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/examples/j2-seed.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/examples/j2-seed.xml Fri Dec 12 04:06:29 2008
@@ -1,711 +1,711 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You 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.
--->
-<Snapshot name="standard-jetspeed2.xml" 
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/j2-seed.xsd">
-	<softwareVersion value="1"/>
-	<softwareSubVersion value="0"/>
-	<default_rule value="j2"/>
-	<encryption value=""/>
-	<MimeTypes>
-		<MimeType>application/xhtml+xml</MimeType>
-		<MimeType>text/html</MimeType>
-		<MimeType>text/vnd.wap.wml</MimeType>
-		<MimeType>text/vxml</MimeType>
-		<MimeType>text/xhtml</MimeType>
-		<MimeType>text/xml</MimeType>
-	</MimeTypes>
-	<MediaTypes>
-		<MediaType name="html">
-			<charcterSet value="UTF-8"/>
-			<title value="HTML"/>
-			<description value="Rich HTML for HTML 4.0 compliants browsers"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/html</mimeTypes>
-		</MediaType>
-		<MediaType name="vxml">
-			<charcterSet value="UTF-8"/>
-			<title value="VoiceXML"/>
-			<description value="Format suitable for use with an audio VoiceXML server"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vxml</mimeTypes>
-		</MediaType>
-		<MediaType name="wml">
-			<charcterSet value="UTF-8"/>
-			<title value="WML"/>
-			<description value="Format for mobile phones and PDAs compatible with WML 1.1"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</MediaType>
-		<MediaType name="xhtml-basic">
-			<charcterSet value="UTF-8"/>
-			<title value="XHTML"/>
-			<description value="XHTML Basic"/>
-			<capabilities></capabilities>
-			<mimeTypes>application/xhtml+xml</mimeTypes>
-		</MediaType>
-		<MediaType name="xml">
-			<charcterSet value=""/>
-			<title value="XML"/>
-			<description value="XML 1.0"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/xml</mimeTypes>
-		</MediaType>
-	</MediaTypes>
-	<Capabilities>
-		<Capability>HTML_3_2</Capability>
-		<Capability>HTML_4_0</Capability>
-		<Capability>HTML_ACTIVEX</Capability>
-		<Capability>HTML_CSS1</Capability>
-		<Capability>HTML_CSS2</Capability>
-		<Capability>HTML_CSSP</Capability>
-		<Capability>HTML_DOM</Capability>
-		<Capability>HTML_DOM_1</Capability>
-		<Capability>HTML_DOM_2</Capability>
-		<Capability>HTML_DOM_IE</Capability>
-		<Capability>HTML_DOM_NS4</Capability>
-		<Capability>HTML_FORM</Capability>
-		<Capability>HTML_FRAME</Capability>
-		<Capability>HTML_IFRAME</Capability>
-		<Capability>HTML_IMAGE</Capability>
-		<Capability>HTML_JAVA</Capability>
-		<Capability>HTML_JAVA1_0</Capability>
-		<Capability>HTML_JAVA1_1</Capability>
-		<Capability>HTML_JAVA1_2</Capability>
-		<Capability>HTML_JAVASCRIPT</Capability>
-		<Capability>HTML_JAVASCRIPT_1_0</Capability>
-		<Capability>HTML_JAVASCRIPT_1_1</Capability>
-		<Capability>HTML_JAVASCRIPT_1_2</Capability>
-		<Capability>HTML_JAVA_JRE</Capability>
-		<Capability>HTML_JSCRIPT</Capability>
-		<Capability>HTML_JSCRIPT1_0</Capability>
-		<Capability>HTML_JSCRIPT1_1</Capability>
-		<Capability>HTML_JSCRIPT1_2</Capability>
-		<Capability>HTML_LAYER</Capability>
-		<Capability>HTML_NESTED_TABLE</Capability>
-		<Capability>HTML_PLUGIN</Capability>
-		<Capability>HTML_TABLE</Capability>
-		<Capability>HTML_XML</Capability>
-		<Capability>HTML_XSL</Capability>
-		<Capability>HTTP_1_1</Capability>
-		<Capability>HTTP_COOKIE</Capability>
-		<Capability>WML_1_0</Capability>
-		<Capability>WML_1_1</Capability>
-		<Capability>WML_TABLE</Capability>
-		<Capability>XML_XINCLUDE</Capability>
-		<Capability>XML_XPATH</Capability>
-		<Capability>XML_XSLT</Capability>
-	</Capabilities>
-	<Clients>
-		<Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*MSIE 5.*Mac.*"/>
-			<version value="5.*"/>
-			<model value="None"/>
-			<manufacturer value="Microsoft"/>
-			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html</mimeTypes>
-		</Client>
-		<Client name="safari" evalOrder="2" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*Mac.*Safari.*"/>
-			<version value="5.*"/>
-			<model value="None"/>
-			<manufacturer value="Apple"/>
-			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
-		</Client>
-		<Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*MSIE 6.*"/>
-			<version value="6.0"/>
-			<model value="None"/>
-			<manufacturer value="Microsoft"/>
-			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
-		</Client>
-		<Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*MSIE 5.*"/>
-			<version value="5.5"/>
-			<model value="None"/>
-			<manufacturer value="Microsoft"/>
-			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html,text/xml</mimeTypes>
-		</Client>
-		<Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*Mozilla/4.*"/>
-			<version value="4.75"/>
-			<model value="None"/>
-			<manufacturer value="Netscape"/>
-			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html</mimeTypes>
-		</Client>
-		<Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*Mozilla/5.*"/>
-			<version value="1.x"/>
-			<model value="Mozilla"/>
-			<manufacturer value="Mozilla"/>
-			<capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html,text/xhtml,text/xml</mimeTypes>
-		</Client>
-		<Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html">
-			<userAgentPattern value="Lynx.*"/>
-			<version value=""/>
-			<model value="None"/>
-			<manufacturer value="GNU"/>
-			<capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities>
-			<mimeTypes>text/html</mimeTypes>
-		</Client>
-		<Client name="nokia_generic" evalOrder="8" preferredMimeTypeID="text/vnd.wap.wml">
-			<userAgentPattern value="Nokia.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Nokia"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</Client>
-		<Client name="xhtml-basic" evalOrder="9" preferredMimeTypeID="application/xhtml+xml">
-			<userAgentPattern value="DoCoMo/2.0.*|KDDI-.*UP.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="WAP"/>
-			<capabilities></capabilities>
-			<mimeTypes>application/xhtml+xml</mimeTypes>
-		</Client>
-		<Client name="up" evalOrder="10" preferredMimeTypeID="text/vnd.wap.wml">
-			<userAgentPattern value="UP.*|.*UP.Browser.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="United Planet"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</Client>
-		<Client name="sonyericsson" evalOrder="11" preferredMimeTypeID="text/vnd.wap.wml">
-			<userAgentPattern value="Ercis.*|SonyE.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="SonyEricsson"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</Client>
-		<Client name="wapalizer" evalOrder="12" preferredMimeTypeID="text/vnd.wap.wml">
-			<userAgentPattern value="Wapalizer.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Wapalizer"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</Client>
-		<Client name="klondike" evalOrder="13" preferredMimeTypeID="text/vnd.wap.wml">
-			<userAgentPattern value="Klondike.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Klondike"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</Client>
-		<Client name="wml_generic" evalOrder="14" preferredMimeTypeID="text/vnd.wap.wml">
-			<userAgentPattern value=".*WML.*|.*WAP.*|.*Wap.*|.*wml.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Generic"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vnd.wap.wml</mimeTypes>
-		</Client>
-		<Client name="vxml_generic" evalOrder="15" preferredMimeTypeID="text/vxml">
-			<userAgentPattern value=".*VoiceXML.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Generic"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vxml</mimeTypes>
-		</Client>
-		<Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml">
-			<userAgentPattern value="Nuance.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Nuance"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/vxml</mimeTypes>
-		</Client>
-		<Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml">
-			<userAgentPattern value="agentxml/1.0.*"/>
-			<version value=""/>
-			<model value="Generic"/>
-			<manufacturer value="Unknown"/>
-			<capabilities></capabilities>
-			<mimeTypes>text/xml</mimeTypes>
-		</Client>
-		<Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html">
-			<userAgentPattern value=".*Opera/7.*"/>
-			<version value="7.x"/>
-			<model value="Opera7"/>
-			<manufacturer value="Opera"/>
-			<capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities>
-			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
-		</Client>
-	</Clients>
-	<Roles>
-		<Role>admin</Role>
-		<Role>manager</Role>
-		<Role>user</Role>
-		<Role>guest</Role>
-		<Role>subsite</Role>
-		<Role>subsite2</Role>
-	</Roles>
-	<Groups>
-		<Group>accounting</Group>
-		<Group>engineering</Group>
-		<Group>marketing</Group>
-	</Groups>
-	<Users>
-		<User name="admin">
-			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
-			<roles>user,manager,admin</roles>
-			<groups></groups>
-			<preferences org.apache.jetspeed.prefered.locale="en,,"/>
-			<userinfo user.name.given="Test Dude" user.name.family="Dudley"/>
-			<Rules/>
-		</User>
-		<User name="manager">
-			<credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
-			<roles>user,manager</roles>
-			<groups></groups>
-			<preferences/>
-			<userinfo/>
-			<Rules/>
-		</User>
-		<User name="user">
-			<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
-			<roles>user</roles>
-			<groups>accounting</groups>
-			<preferences/>
-			<userinfo/>
-			<Rules>
-				<Rule locator="menu" rule="role-group"/>
-				<Rule locator="page" rule="j2"/>
-			</Rules>
-		</User>
-		<User name="tomcat">
-			<credentials password="tomcat" enabled="TRUE" requiresUpdate="FALSE"/>
-			<roles></roles>
-			<groups></groups>
-			<preferences/>
-			<userinfo/>
-			<Rules/>
-		</User>
-		<User name="jetspeed">
-			<credentials password="jetspeed" enabled="TRUE" requiresUpdate="FALSE"/>
-			<roles>manager</roles>
-			<groups>engineering</groups>
-			<preferences/>
-			<userinfo/>
-			<Rules>
-				<Rule locator="menu" rule="role-group"/>
-				<Rule locator="page" rule="role-fallback"/>
-			</Rules>
-		</User>
-		<User name="guest">
-			<Null/>
-			<roles>guest</roles>
-			<groups></groups>
-			<preferences/>
-			<userinfo/>
-			<Rules>
-				<Rule locator="page" rule="j2"/>
-			</Rules>
-		</User>
-		<User name="subsite">
-			<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
-			<roles>subsite,subsite2</roles>
-			<groups></groups>
-			<preferences/>
-			<userinfo/>
-			<Rules>
-				<Rule locator="page" rule="subsite-role-fallback-home"/>
-			</Rules>
-		</User>
-		<User name="subsite2">
-			<credentials password="subsite2" enabled="TRUE" requiresUpdate="FALSE"/>
-			<roles>subsite,subsite2</roles>
-			<groups></groups>
-			<preferences/>
-			<userinfo/>
-			<Rules>
-				<Rule locator="page" rule="subsite2-role-fallback-home"/>
-			</Rules>
-		</User>
-	</Users>
-	<Permissions>
-		<Permission type="folder" resource="/" actions="view">
-			<roles>user,guest,subsite,subsite2</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/*" actions="view">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/anotherdir/-" actions="view">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/non-java/-" actions="view">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/Public" actions="view, edit">
-			<roles>guest</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/Public/-" actions="view, edit">
-			<roles>user,guest</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/third-party/-" actions="view">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/top-links/-" actions="view">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/_user/user" actions="view, edit">
-			<roles></roles>
-			<groups></groups>
-			<users>user</users>
-		</Permission>
-		<Permission type="folder" resource="/_user/user/-" actions="view, edit">
-			<roles></roles>
-			<groups></groups>
-			<users>user</users>
-		</Permission>
-		<Permission type="folder" resource="/__subsite-root" actions="view">
-			<roles>subsite,subsite2</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/__subsite-root/-" actions="view">
-			<roles>subsite,subsite2</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="/__subsite-root/_role/subsite" actions="view, edit">
-			<roles></roles>
-			<groups></groups>
-			<users>subsite</users>
-		</Permission>
-		<Permission type="folder" resource="/__subsite-root/_role/subsite/-" actions="view, edit">
-			<roles></roles>
-			<groups></groups>
-			<users>subsite</users>
-		</Permission>
-		<Permission type="folder" resource="/__subsite-root/_role/subsite2" actions="view, edit">
-			<roles></roles>
-			<groups></groups>
-			<users>subsite2</users>
-		</Permission>
-		<Permission type="folder" resource="/__subsite-root/_role/subsite2/-" actions="view, edit">
-			<roles></roles>
-			<groups></groups>
-			<users>subsite2</users>
-		</Permission>
-		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
-			<roles>admin</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view">
-			<roles>manager</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="page" resource="/default-page.psml" actions="view">
-			<roles>guest</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="page" resource="/rss.psml" actions="view">
-			<roles>guest</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="portal" resource="demo::*" actions="view, edit">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
-			<roles>admin</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-		<Permission type="portal" resource="rss::*" actions="view, edit">
-			<roles>user</roles>
-			<groups></groups>
-			<users></users>
-		</Permission>
-	</Permissions>
-	<ProfilingRules>
-		<ProfilingRule id="group-fallback" standardRule="false">
-			<description value="A role based fallback algorithm based on Jetspeed-1 group-based fallback"/>
-			<Criteria>
-				<Criterion name="group">
-					<type value="group"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="page">
-					<type value="path.session"/>
-					<value value="default-page"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="ip-address" standardRule="true">
-			<description value="Resolves pages based on the clients remote IP address."/>
-			<Criteria>
-				<Criterion name="ip">
-					<type value="ip"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="j1" standardRule="true">
-			<description value="The default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm."/>
-			<Criteria>
-				<Criterion name="page">
-					<type value="path.session"/>
-					<value value="default-page"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="0"/>
-				</Criterion>
-				<Criterion name="user">
-					<type value="group.role.user"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="0"/>
-				</Criterion>
-				<Criterion name="mediatype">
-					<type value="mediatype"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="1"/>
-				</Criterion>
-				<Criterion name="language">
-					<type value="language"/>
-					<fallBackOrder value="3"/>
-					<fallBackType value="1"/>
-				</Criterion>
-				<Criterion name="country">
-					<type value="country"/>
-					<fallBackOrder value="4"/>
-					<fallBackType value="1"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="j2" standardRule="true">
-			<description value="The default profiling rule for users and mediatype minus language and country."/>
-			<Criteria>
-				<Criterion name="user">
-					<type value="group.role.user"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="0"/>
-				</Criterion>
-				<Criterion name="mediatype">
-					<type value="mediatype"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="1"/>
-				</Criterion>
-				<Criterion name="page">
-					<type value="path.session"/>
-					<value value="default-page"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="path" standardRule="true">
-			<description value="use a path to locate."/>
-			<Criteria>
-				<Criterion name="path">
-					<type value="path"/>
-					<value value="/"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="role-fallback" standardRule="false">
-			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
-			<Criteria>
-				<Criterion name="role">
-					<type value="role"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="page">
-					<type value="path.session"/>
-					<value value="default-page"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="role-group" standardRule="false">
-			<description value="A role based fallback algorithm that searches all groups and roles for a user"/>
-			<Criteria>
-				<Criterion name="role">
-					<type value="role"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="navigation">
-					<type value="navigation"/>
-					<value value="/"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="group">
-					<type value="group"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="2"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="security" standardRule="true">
-			<description value="The security profiling rule needed for credential change requirements."/>
-			<Criteria>
-				<Criterion name="page">
-					<type value="hard.coded"/>
-					<value value="/my-account.psml"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="subsite-role-fallback-home" standardRule="false">
-			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
-			<Criteria>
-				<Criterion name="navigation">
-					<type value="navigation"/>
-					<value value="subsite-root"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="role">
-					<type value="role"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="path">
-					<type value="path"/>
-					<value value="subsite-default-page"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="subsite2-role-fallback-home" standardRule="false">
-			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
-			<Criteria>
-				<Criterion name="navigation">
-					<type value="navigation"/>
-					<value value="subsite-root"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="role">
-					<type value="role"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="path">
-					<type value="path"/>
-					<value value="subsite2-default-page"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="0"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="user-role-fallback" standardRule="false">
-			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
-			<Criteria>
-				<Criterion name="user">
-					<type value="user"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="navigation">
-					<type value="navigation"/>
-					<value value="/"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="role">
-					<type value="role"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="page">
-					<type value="path.session"/>
-					<value value="default-page"/>
-					<fallBackOrder value="3"/>
-					<fallBackType value="1"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-		<ProfilingRule id="user-rolecombo-fallback" standardRule="false">
-			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
-			<Criteria>
-				<Criterion name="user">
-					<type value="user"/>
-					<fallBackOrder value="0"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="navigation">
-					<type value="navigation"/>
-					<value value="/"/>
-					<fallBackOrder value="1"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="role">
-					<type value="rolecombo"/>
-					<fallBackOrder value="2"/>
-					<fallBackType value="2"/>
-				</Criterion>
-				<Criterion name="page">
-					<type value="path.session"/>
-					<value value="default-page"/>
-					<fallBackOrder value="3"/>
-					<fallBackType value="1"/>
-				</Criterion>
-			</Criteria>
-		</ProfilingRule>
-	</ProfilingRules>
-</Snapshot>
+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.
+-->
+<Snapshot name="standard-jetspeed2.xml" 
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/j2-seed.xsd">
+	<softwareVersion value="1"/>
+	<softwareSubVersion value="0"/>
+	<default_rule value="j2"/>
+	<encryption value=""/>
+	<MimeTypes>
+		<MimeType>application/xhtml+xml</MimeType>
+		<MimeType>text/html</MimeType>
+		<MimeType>text/vnd.wap.wml</MimeType>
+		<MimeType>text/vxml</MimeType>
+		<MimeType>text/xhtml</MimeType>
+		<MimeType>text/xml</MimeType>
+	</MimeTypes>
+	<MediaTypes>
+		<MediaType name="html">
+			<charcterSet value="UTF-8"/>
+			<title value="HTML"/>
+			<description value="Rich HTML for HTML 4.0 compliants browsers"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
+		<MediaType name="vxml">
+			<charcterSet value="UTF-8"/>
+			<title value="VoiceXML"/>
+			<description value="Format suitable for use with an audio VoiceXML server"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</MediaType>
+		<MediaType name="wml">
+			<charcterSet value="UTF-8"/>
+			<title value="WML"/>
+			<description value="Format for mobile phones and PDAs compatible with WML 1.1"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</MediaType>
+		<MediaType name="xhtml-basic">
+			<charcterSet value="UTF-8"/>
+			<title value="XHTML"/>
+			<description value="XHTML Basic"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="xml">
+			<charcterSet value=""/>
+			<title value="XML"/>
+			<description value="XML 1.0"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</MediaType>
+	</MediaTypes>
+	<Capabilities>
+		<Capability>HTML_3_2</Capability>
+		<Capability>HTML_4_0</Capability>
+		<Capability>HTML_ACTIVEX</Capability>
+		<Capability>HTML_CSS1</Capability>
+		<Capability>HTML_CSS2</Capability>
+		<Capability>HTML_CSSP</Capability>
+		<Capability>HTML_DOM</Capability>
+		<Capability>HTML_DOM_1</Capability>
+		<Capability>HTML_DOM_2</Capability>
+		<Capability>HTML_DOM_IE</Capability>
+		<Capability>HTML_DOM_NS4</Capability>
+		<Capability>HTML_FORM</Capability>
+		<Capability>HTML_FRAME</Capability>
+		<Capability>HTML_IFRAME</Capability>
+		<Capability>HTML_IMAGE</Capability>
+		<Capability>HTML_JAVA</Capability>
+		<Capability>HTML_JAVA1_0</Capability>
+		<Capability>HTML_JAVA1_1</Capability>
+		<Capability>HTML_JAVA1_2</Capability>
+		<Capability>HTML_JAVASCRIPT</Capability>
+		<Capability>HTML_JAVASCRIPT_1_0</Capability>
+		<Capability>HTML_JAVASCRIPT_1_1</Capability>
+		<Capability>HTML_JAVASCRIPT_1_2</Capability>
+		<Capability>HTML_JAVA_JRE</Capability>
+		<Capability>HTML_JSCRIPT</Capability>
+		<Capability>HTML_JSCRIPT1_0</Capability>
+		<Capability>HTML_JSCRIPT1_1</Capability>
+		<Capability>HTML_JSCRIPT1_2</Capability>
+		<Capability>HTML_LAYER</Capability>
+		<Capability>HTML_NESTED_TABLE</Capability>
+		<Capability>HTML_PLUGIN</Capability>
+		<Capability>HTML_TABLE</Capability>
+		<Capability>HTML_XML</Capability>
+		<Capability>HTML_XSL</Capability>
+		<Capability>HTTP_1_1</Capability>
+		<Capability>HTTP_COOKIE</Capability>
+		<Capability>WML_1_0</Capability>
+		<Capability>WML_1_1</Capability>
+		<Capability>WML_TABLE</Capability>
+		<Capability>XML_XINCLUDE</Capability>
+		<Capability>XML_XPATH</Capability>
+		<Capability>XML_XSLT</Capability>
+	</Capabilities>
+	<Clients>
+		<Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*Mac.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="safari" evalOrder="2" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mac.*Safari.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Apple"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 6.*"/>
+			<version value="6.0"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*"/>
+			<version value="5.5"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml</mimeTypes>
+		</Client>
+		<Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/4.*"/>
+			<version value="4.75"/>
+			<model value="None"/>
+			<manufacturer value="Netscape"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/5.*"/>
+			<version value="1.x"/>
+			<model value="Mozilla"/>
+			<manufacturer value="Mozilla"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xhtml,text/xml</mimeTypes>
+		</Client>
+		<Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html">
+			<userAgentPattern value="Lynx.*"/>
+			<version value=""/>
+			<model value="None"/>
+			<manufacturer value="GNU"/>
+			<capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="nokia_generic" evalOrder="8" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Nokia.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nokia"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="xhtml-basic" evalOrder="9" preferredMimeTypeID="application/xhtml+xml">
+			<userAgentPattern value="DoCoMo/2.0.*|KDDI-.*UP.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</Client>
+		<Client name="up" evalOrder="10" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="UP.*|.*UP.Browser.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="United Planet"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="sonyericsson" evalOrder="11" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Ercis.*|SonyE.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="SonyEricsson"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="wapalizer" evalOrder="12" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Wapalizer.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Wapalizer"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="klondike" evalOrder="13" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Klondike.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Klondike"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="wml_generic" evalOrder="14" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value=".*WML.*|.*WAP.*|.*Wap.*|.*wml.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="vxml_generic" evalOrder="15" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value=".*VoiceXML.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value="Nuance.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nuance"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml">
+			<userAgentPattern value="agentxml/1.0.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Unknown"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</Client>
+		<Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Opera/7.*"/>
+			<version value="7.x"/>
+			<model value="Opera7"/>
+			<manufacturer value="Opera"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+	</Clients>
+	<Roles>
+		<Role>admin</Role>
+		<Role>manager</Role>
+		<Role>user</Role>
+		<Role>guest</Role>
+		<Role>subsite</Role>
+		<Role>subsite2</Role>
+	</Roles>
+	<Groups>
+		<Group>accounting</Group>
+		<Group>engineering</Group>
+		<Group>marketing</Group>
+	</Groups>
+	<Users>
+		<User name="admin">
+			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
+			<roles>user,manager,admin</roles>
+			<groups></groups>
+			<preferences org.apache.jetspeed.prefered.locale="en,,"/>
+			<userinfo user.name.given="Test Dude" user.name.family="Dudley"/>
+			<Rules/>
+		</User>
+		<User name="manager">
+			<credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user,manager</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules/>
+		</User>
+		<User name="user">
+			<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user</roles>
+			<groups>accounting</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="menu" rule="role-group"/>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+		<User name="tomcat">
+			<credentials password="tomcat" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles></roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules/>
+		</User>
+		<User name="jetspeed">
+			<credentials password="jetspeed" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>manager</roles>
+			<groups>engineering</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="menu" rule="role-group"/>
+				<Rule locator="page" rule="role-fallback"/>
+			</Rules>
+		</User>
+		<User name="guest">
+			<Null/>
+			<roles>guest</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+		<User name="subsite">
+			<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite-role-fallback-home"/>
+			</Rules>
+		</User>
+		<User name="subsite2">
+			<credentials password="subsite2" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite2-role-fallback-home"/>
+			</Rules>
+		</User>
+	</Users>
+	<Permissions>
+		<Permission type="folder" resource="/" actions="view">
+			<roles>user,guest,subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/*" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/anotherdir/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/non-java/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/Public" actions="view, edit">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/Public/-" actions="view, edit">
+			<roles>user,guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/third-party/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/top-links/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/_user/user" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>user</users>
+		</Permission>
+		<Permission type="folder" resource="/_user/user/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>user</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root" actions="view">
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/-" actions="view">
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite2" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite2</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite2/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite2</users>
+		</Permission>
+		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view">
+			<roles>manager</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="page" resource="/default-page.psml" actions="view">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="page" resource="/rss.psml" actions="view">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="demo::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="rss::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+	</Permissions>
+	<ProfilingRules>
+		<ProfilingRule id="group-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 group-based fallback"/>
+			<Criteria>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="ip-address" standardRule="true">
+			<description value="Resolves pages based on the clients remote IP address."/>
+			<Criteria>
+				<Criterion name="ip">
+					<type value="ip"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j1" standardRule="true">
+			<description value="The default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="language">
+					<type value="language"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="country">
+					<type value="country"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j2" standardRule="true">
+			<description value="The default profiling rule for users and mediatype minus language and country."/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="path" standardRule="true">
+			<description value="use a path to locate."/>
+			<Criteria>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="/"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-group" standardRule="false">
+			<description value="A role based fallback algorithm that searches all groups and roles for a user"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="security" standardRule="true">
+			<description value="The security profiling rule needed for credential change requirements."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="hard.coded"/>
+					<value value="/my-account.psml"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite-role-fallback-home" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="subsite-default-page"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite2-role-fallback-home" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="subsite2-default-page"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-rolecombo-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="rolecombo"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+	</ProfilingRules>
+</Snapshot>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/examples/j2-seed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/examples/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/examples/jetspeed-portlet.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/examples/jetspeed-portlet.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/examples/jetspeed-portlet.xml Fri Dec 12 04:06:29 2008
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You 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.
--->
-<portlet-app id="j2-admin" version="1.0"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:js="http://portals.apache.org/jetspeed"
-    xmlns:dc="http://www.purl.org/dc"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/jetspeed-portlet.xsd">
-     
-    <js:security-constraint-ref>admin-only</js:security-constraint-ref>      
-
-    <dc:creator>J2 Team</dc:creator>
-    <dc:title>Jetspeed-2 Administration Portlets</dc:title>
-    <dc:title xml:lang="en">Jetspeed-2 Administration Portlets</dc:title>
-    
-    <custom-portlet-mode>
-      <name>mycustom</name>
-      <mapped-name>mymap</mapped-name>
-    </custom-portlet-mode>
-    
-    <custom-window-state>
-      <name>popup</name>
-      <mapped-name>solo</mapped-name> 
-    </custom-window-state>
-
-	<portlet>
-        <portlet-name>LoginPortlet</portlet-name>
-        <js:security-constraint-ref>users-1</js:security-constraint-ref>                                        
-        <dc:creator>J2 Team</dc:creator>
-        <dc:title>Login Portlet</dc:title>
-    </portlet>
-
-    <portlet>
-        <portlet-name>LocaleSelector</portlet-name>
-        <js:security-constraint-ref>users-1</js:security-constraint-ref>                                        
-        <dc:creator>J2 Team</dc:creator>        
-        <dc:title>Locale Selector Portlet</dc:title>
-    </portlet>
-
-	<js:services>        
-        <js:service name='ApplicationServerManager'/>
-        <js:service name='DeploymentManager'/>
-		<js:service name='EntityAccessor'/>
-        <js:service name='GroupManager'/>    
-        <js:service name='PageManager'/>    
-        <js:service name='PermissionManager'/>        
-        <js:service name='PortalAdministration'/>        
-        <js:service name='PortletFactory'/>        
-        <js:service name='PortalAdministration'/>
-        <js:service name='PortletRegistryComponent'/>
-        <js:service name='PortalStatistics'/>        
-        <js:service name="Profiler" />         
-        <js:service name='RoleManager'/>
-	    <js:service name='SearchComponent'/>                
-        <js:service name="SSO" />                 
-        <js:service name='UserManager'/>     
-        <js:service name='DecorationFactory'/>        
-	</js:services>
-	
-	<user-attribute-ref>
-	  <js:name>my name</js:name>
-	  <js:name-link>my link</js:name-link>
-	  <js:description>my description</js:description>
-	</user-attribute-ref>
-
+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.
+-->
+<portlet-app id="j2-admin" version="1.0"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:js="http://portals.apache.org/jetspeed"
+    xmlns:dc="http://www.purl.org/dc"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/jetspeed-portlet.xsd">
+     
+    <js:security-constraint-ref>admin-only</js:security-constraint-ref>      
+
+    <dc:creator>J2 Team</dc:creator>
+    <dc:title>Jetspeed-2 Administration Portlets</dc:title>
+    <dc:title xml:lang="en">Jetspeed-2 Administration Portlets</dc:title>
+    
+    <custom-portlet-mode>
+      <name>mycustom</name>
+      <mapped-name>mymap</mapped-name>
+    </custom-portlet-mode>
+    
+    <custom-window-state>
+      <name>popup</name>
+      <mapped-name>solo</mapped-name> 
+    </custom-window-state>
+
+	<portlet>
+        <portlet-name>LoginPortlet</portlet-name>
+        <js:security-constraint-ref>users-1</js:security-constraint-ref>                                        
+        <dc:creator>J2 Team</dc:creator>
+        <dc:title>Login Portlet</dc:title>
+    </portlet>
+
+    <portlet>
+        <portlet-name>LocaleSelector</portlet-name>
+        <js:security-constraint-ref>users-1</js:security-constraint-ref>                                        
+        <dc:creator>J2 Team</dc:creator>        
+        <dc:title>Locale Selector Portlet</dc:title>
+    </portlet>
+
+	<js:services>        
+        <js:service name='ApplicationServerManager'/>
+        <js:service name='DeploymentManager'/>
+		<js:service name='EntityAccessor'/>
+        <js:service name='GroupManager'/>    
+        <js:service name='PageManager'/>    
+        <js:service name='PermissionManager'/>        
+        <js:service name='PortalAdministration'/>        
+        <js:service name='PortletFactory'/>        
+        <js:service name='PortalAdministration'/>
+        <js:service name='PortletRegistryComponent'/>
+        <js:service name='PortalStatistics'/>        
+        <js:service name="Profiler" />         
+        <js:service name='RoleManager'/>
+	    <js:service name='SearchComponent'/>                
+        <js:service name="SSO" />                 
+        <js:service name='UserManager'/>     
+        <js:service name='DecorationFactory'/>        
+	</js:services>
+	
+	<user-attribute-ref>
+	  <js:name>my name</js:name>
+	  <js:name-link>my link</js:name-link>
+	  <js:description>my description</js:description>
+	</user-attribute-ref>
+
 </portlet-app>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/examples/jetspeed-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/examples/page.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/examples/page.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/examples/page.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/examples/page.xml Fri Dec 12 04:06:29 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,75 +15,75 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<page-security 
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/page-security.xsd">
-
-  <!-- define global admin constraints -->
-  <security-constraints-def name="admin">
-    <security-constraint>
-      <roles>admin</roles>
-      <permissions>view, edit</permissions>
-    </security-constraint>
-  </security-constraints-def>
-  <global-security-constraints-ref>admin</global-security-constraints-ref>
-
-  <!-- define manager constraints -->
-  <security-constraints-def name="manager">
-    <security-constraint>
-      <roles>manager</roles>
-      <permissions>view</permissions>
-    </security-constraint>
-  </security-constraints-def>
-
-  <!-- define user constraints -->
-  <security-constraints-def name="users">
-    <security-constraint>
-      <roles>user, manager</roles>
-      <permissions>view</permissions>
-    </security-constraint>
-  </security-constraints-def>
-
-  <!-- define public constraints -->
-  <security-constraints-def name="public-view">
-    <security-constraint>
-      <users>*</users>
-      <permissions>view</permissions>
-    </security-constraint>
-  </security-constraints-def>
-  <security-constraints-def name="public-edit">
-    <security-constraint>
-      <users>*</users>
-      <permissions>view, edit</permissions>
-    </security-constraint>
-  </security-constraints-def>
-
-  <security-constraints-def name="delete3">
-    <security-constraint>
-      <users>replaceme</users>
-      <permissions>view, edit, help</permissions>
-    </security-constraint>
-    <!-- delete below -->
-    <security-constraint>
-      <roles>manager</roles>
-      <permissions>view</permissions>
-    </security-constraint>
-    <security-constraint>
-      <roles>admin</roles>
-      <permissions>view, edit</permissions>
-    </security-constraint>
-    <security-constraint>
-      <roles>guest</roles>
-      <permissions>view</permissions>
-    </security-constraint>    
-  </security-constraints-def>
-
-  <security-constraints-def name="deleteme">
-    <security-constraint>
-      <roles>*</roles>
-      <permissions>view, edit</permissions>
-    </security-constraint>
-  </security-constraints-def>
-
-</page-security>
+<page-security 
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/page-security.xsd">
+
+  <!-- define global admin constraints -->
+  <security-constraints-def name="admin">
+    <security-constraint>
+      <roles>admin</roles>
+      <permissions>view, edit</permissions>
+    </security-constraint>
+  </security-constraints-def>
+  <global-security-constraints-ref>admin</global-security-constraints-ref>
+
+  <!-- define manager constraints -->
+  <security-constraints-def name="manager">
+    <security-constraint>
+      <roles>manager</roles>
+      <permissions>view</permissions>
+    </security-constraint>
+  </security-constraints-def>
+
+  <!-- define user constraints -->
+  <security-constraints-def name="users">
+    <security-constraint>
+      <roles>user, manager</roles>
+      <permissions>view</permissions>
+    </security-constraint>
+  </security-constraints-def>
+
+  <!-- define public constraints -->
+  <security-constraints-def name="public-view">
+    <security-constraint>
+      <users>*</users>
+      <permissions>view</permissions>
+    </security-constraint>
+  </security-constraints-def>
+  <security-constraints-def name="public-edit">
+    <security-constraint>
+      <users>*</users>
+      <permissions>view, edit</permissions>
+    </security-constraint>
+  </security-constraints-def>
+
+  <security-constraints-def name="delete3">
+    <security-constraint>
+      <users>replaceme</users>
+      <permissions>view, edit, help</permissions>
+    </security-constraint>
+    <!-- delete below -->
+    <security-constraint>
+      <roles>manager</roles>
+      <permissions>view</permissions>
+    </security-constraint>
+    <security-constraint>
+      <roles>admin</roles>
+      <permissions>view, edit</permissions>
+    </security-constraint>
+    <security-constraint>
+      <roles>guest</roles>
+      <permissions>view</permissions>
+    </security-constraint>    
+  </security-constraints-def>
+
+  <security-constraints-def name="deleteme">
+    <security-constraint>
+      <roles>*</roles>
+      <permissions>view, edit</permissions>
+    </security-constraint>
+  </security-constraints-def>
+
+</page-security>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/examples/page.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/folder-metadata.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/folder-metadata.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/folder-metadata.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/folder-metadata.xsd Fri Dec 12 04:06:29 2008
@@ -1,126 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You 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.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-		xmlns:tns="http://portals.apache.org/jetspeed"
-		targetNamespace="http://portals.apache.org/jetspeed">
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <xs:element name="folder">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:title" minOccurs="0"/>
-        <xs:element ref="tns:short-title" minOccurs="0"/>
-        <xs:element ref="tns:default-page" minOccurs="0"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
-        <xs:element minOccurs="0" ref="tns:defaults"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:document-order"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:menu"/>
-        <xs:element minOccurs="0" ref="tns:security-constraints"/>
-      </xs:sequence>
-      <xs:attribute name="hidden" type="xs:boolean" use="optional"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="title" type="xs:string"/>
-  <xs:element name="default-page" type="xs:string"/>
-  <xs:element name="defaults">
-    <xs:complexType>
-      <xs:attribute name="layout-decorator" use="required" type="xs:string"/>
-      <xs:attribute name="portlet-decorator" use="required" type="xs:string"/>
-      <xs:attribute name="skin" use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="document-order" type="xs:string"/>
-  <xs:element name="menu">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:title" minOccurs="0"/>
-        <xs:element ref="tns:short-title" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:menu" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element ref="tns:options"/>
-	      <xs:element ref="tns:separator"/>
-	      <xs:element ref="tns:exclude"/>
-	      <xs:element ref="tns:include"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attribute name="name"    use="optional" type="xs:string"/>
-      <xs:attribute name="depth"   use="optional" type="xs:integer"/>
-      <xs:attribute name="options" use="optional" type="xs:string"/>
-      <xs:attribute name="regexp"  use="optional" type="xs:boolean"/>
-      <xs:attribute name="skin"    use="optional" type="xs:string"/>
-      <xs:attribute name="profile" use="optional" type="xs:string"/>
-      <xs:attribute name="order"   use="optional" type="xs:string"/>
-      <xs:attribute name="paths"   use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="exclude" type="xs:string"/>
-  <xs:element name="include">
-    <xs:complexType mixed="true">
-      <xs:attribute name="nest" type="xs:boolean"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="short-title" type="xs:string"/>
-  <xs:element name="options">
-    <xs:complexType mixed="true">
-      <xs:attribute name="profile" use="optional" type="xs:string"/>
-      <xs:attribute name="regexp"  use="optional" type="xs:boolean"/>
-      <xs:attribute name="depth"   use="optional" type="xs:integer"/>
-      <xs:attribute name="order"   use="optional" type="xs:string"/>
-      <xs:attribute name="skin"    use="optional" type="xs:string"/>
-      <xs:attribute name="paths"   use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="separator">
-    <xs:complexType mixed="true">
-      <xs:sequence>
-        <xs:element ref="tns:text" minOccurs="0"/>
-        <xs:element ref="tns:title" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="skin" use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="text" type="xs:string"/>
-  <xs:element name="security-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:owner"/>
-        <xs:element minOccurs="0" ref="tns:security-constraints-ref"/>
-        <xs:element minOccurs="0" ref="tns:security-constraint"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="owner" type="xs:string"/>
-  <xs:element name="security-constraints-ref" type="xs:string"/>
-  <xs:element name="security-constraint">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:roles"/>
-        <xs:element ref="tns:permissions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="roles" type="xs:string"/>
-  <xs:element name="permissions" type="xs:string"/>
-  <xs:element name="metadata">
-    <xs:complexType mixed="true">
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute ref="xml:lang" use="required"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
+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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+		xmlns:tns="http://portals.apache.org/jetspeed"
+		targetNamespace="http://portals.apache.org/jetspeed">
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xs:element name="folder">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:title" minOccurs="0"/>
+        <xs:element ref="tns:short-title" minOccurs="0"/>
+        <xs:element ref="tns:default-page" minOccurs="0"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
+        <xs:element minOccurs="0" ref="tns:defaults"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:document-order"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:menu"/>
+        <xs:element minOccurs="0" ref="tns:security-constraints"/>
+      </xs:sequence>
+      <xs:attribute name="hidden" type="xs:boolean" use="optional"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="title" type="xs:string"/>
+  <xs:element name="default-page" type="xs:string"/>
+  <xs:element name="defaults">
+    <xs:complexType>
+      <xs:attribute name="layout-decorator" use="required" type="xs:string"/>
+      <xs:attribute name="portlet-decorator" use="required" type="xs:string"/>
+      <xs:attribute name="skin" use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="document-order" type="xs:string"/>
+  <xs:element name="menu">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:title" minOccurs="0"/>
+        <xs:element ref="tns:short-title" minOccurs="0"/>
+        <xs:element ref="tns:metadata" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="tns:menu" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element ref="tns:options"/>
+	      <xs:element ref="tns:separator"/>
+	      <xs:element ref="tns:exclude"/>
+	      <xs:element ref="tns:include"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="name"    use="optional" type="xs:string"/>
+      <xs:attribute name="depth"   use="optional" type="xs:integer"/>
+      <xs:attribute name="options" use="optional" type="xs:string"/>
+      <xs:attribute name="regexp"  use="optional" type="xs:boolean"/>
+      <xs:attribute name="skin"    use="optional" type="xs:string"/>
+      <xs:attribute name="profile" use="optional" type="xs:string"/>
+      <xs:attribute name="order"   use="optional" type="xs:string"/>
+      <xs:attribute name="paths"   use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="exclude" type="xs:string"/>
+  <xs:element name="include">
+    <xs:complexType mixed="true">
+      <xs:attribute name="nest" type="xs:boolean"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="short-title" type="xs:string"/>
+  <xs:element name="options">
+    <xs:complexType mixed="true">
+      <xs:attribute name="profile" use="optional" type="xs:string"/>
+      <xs:attribute name="regexp"  use="optional" type="xs:boolean"/>
+      <xs:attribute name="depth"   use="optional" type="xs:integer"/>
+      <xs:attribute name="order"   use="optional" type="xs:string"/>
+      <xs:attribute name="skin"    use="optional" type="xs:string"/>
+      <xs:attribute name="paths"   use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="separator">
+    <xs:complexType mixed="true">
+      <xs:sequence>
+        <xs:element ref="tns:text" minOccurs="0"/>
+        <xs:element ref="tns:title" minOccurs="0"/>
+        <xs:element ref="tns:metadata" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="skin" use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="text" type="xs:string"/>
+  <xs:element name="security-constraints">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="tns:owner"/>
+        <xs:element minOccurs="0" ref="tns:security-constraints-ref"/>
+        <xs:element minOccurs="0" ref="tns:security-constraint"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="owner" type="xs:string"/>
+  <xs:element name="security-constraints-ref" type="xs:string"/>
+  <xs:element name="security-constraint">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:roles"/>
+        <xs:element ref="tns:permissions"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="roles" type="xs:string"/>
+  <xs:element name="permissions" type="xs:string"/>
+  <xs:element name="metadata">
+    <xs:complexType mixed="true">
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute ref="xml:lang" use="required"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/folder-metadata.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/j2-seed.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/jetspeed-portlet.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/jetspeed-portlet.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/jetspeed-portlet.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/jetspeed-portlet.xsd Fri Dec 12 04:06:29 2008
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You 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.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" 
-	targetNamespace="http://portals.apache.org/jetspeed"
-	xmlns:tns="http://portals.apache.org/jetspeed"
-	xmlns:dc="http://www.purl.org/dc" 
-	xmlns:js="http://portals.apache.org/jetspeed" 
-	xmlns:p="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-
-  <xs:import namespace="http://www.purl.org/dc" schemaLocation="dublin-core.xsd"/>
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-             
-  <xs:element name="portlet-app">
-    <xs:complexType mixed="true">
-      <xs:sequence>
-        <xs:element name="security-constraint-ref" minOccurs="0" type="xs:string"/>          
-        <xs:group ref="tns:metadataGroup" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:custom-portlet-mode" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:custom-window-state" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:portlet" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
+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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" 
+	targetNamespace="http://portals.apache.org/jetspeed"
+	xmlns:tns="http://portals.apache.org/jetspeed"
+	xmlns:dc="http://www.purl.org/dc" 
+	xmlns:js="http://portals.apache.org/jetspeed" 
+	xmlns:p="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+
+  <xs:import namespace="http://www.purl.org/dc" schemaLocation="dublin-core.xsd"/>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+             schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+             
+  <xs:element name="portlet-app">
+    <xs:complexType mixed="true">
+      <xs:sequence>
+        <xs:element name="security-constraint-ref" minOccurs="0" type="xs:string"/>          
+        <xs:group ref="tns:metadataGroup" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:custom-portlet-mode" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:custom-window-state" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:portlet" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:services" minOccurs="0"/>
         <xs:element ref="tns:user-attribute-ref" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="version" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>  
-  
-  <xs:element name="portlet">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="portlet-name" type="xs:string"/>
-        <xs:element name="security-constraint-ref" minOccurs="0" type="xs:string"/>
-        <xs:group ref="tns:metadataGroup" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID" use="optional"/>
-    </xs:complexType>
-  </xs:element>  
-
-  <xs:element name="custom-portlet-mode">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="name" type="xs:string"/>
-        <xs:element name="mapped-name" type="xs:string"/>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  
-  <xs:element name="custom-window-state">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="name" type="xs:string"/>
-        <xs:element name="mapped-name" type="xs:string"/>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>   
-  
-  <xs:element name="user-attribute-ref">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="name" type="xs:string"/>
-        <xs:element name="name-link" type="xs:string"/>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>         
-    
-  <xs:element name="metadata">
-    <xs:complexType mixed="true">
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute ref="xml:lang"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="js:service"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:group name="metadataGroup">
-     <xs:choice>
-       <xs:element ref="dc:creator"/>
-       <xs:element ref="dc:description"/>
-       <xs:element ref="dc:title"/>
-       <xs:element ref="dc:type"/>
-       <xs:element ref="dc:source"/>
-       <xs:element ref="dc:right"/>
-         
-       <xs:element ref="dc:relation"/>
-       <xs:element ref="dc:publisher"/>
-       <xs:element ref="dc:language"/>
-       <xs:element ref="dc:identifer"/>
-       <xs:element ref="dc:format"/>
-       <xs:element ref="dc:contributor"/>
-       <xs:element ref="dc:coverage"/> 
-       <xs:element ref="dc:subject"/>
-       <xs:element ref="js:metadata"/>
-     </xs:choice>
-  </xs:group>
-</xs:schema>
+      </xs:sequence>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="version" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>  
+  
+  <xs:element name="portlet">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="portlet-name" type="xs:string"/>
+        <xs:element name="security-constraint-ref" minOccurs="0" type="xs:string"/>
+        <xs:group ref="tns:metadataGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="id" type="xs:ID" use="optional"/>
+    </xs:complexType>
+  </xs:element>  
+
+  <xs:element name="custom-portlet-mode">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="name" type="xs:string"/>
+        <xs:element name="mapped-name" type="xs:string"/>
+        <xs:element name="description" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="custom-window-state">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="name" type="xs:string"/>
+        <xs:element name="mapped-name" type="xs:string"/>
+        <xs:element name="description" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>   
+  
+  <xs:element name="user-attribute-ref">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="name" type="xs:string"/>
+        <xs:element name="name-link" type="xs:string"/>
+        <xs:element name="description" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>         
+    
+  <xs:element name="metadata">
+    <xs:complexType mixed="true">
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute ref="xml:lang"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="services">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="js:service"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="service">
+    <xs:complexType>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:group name="metadataGroup">
+     <xs:choice>
+       <xs:element ref="dc:creator"/>
+       <xs:element ref="dc:description"/>
+       <xs:element ref="dc:title"/>
+       <xs:element ref="dc:type"/>
+       <xs:element ref="dc:source"/>
+       <xs:element ref="dc:right"/>
+         
+       <xs:element ref="dc:relation"/>
+       <xs:element ref="dc:publisher"/>
+       <xs:element ref="dc:language"/>
+       <xs:element ref="dc:identifer"/>
+       <xs:element ref="dc:format"/>
+       <xs:element ref="dc:contributor"/>
+       <xs:element ref="dc:coverage"/> 
+       <xs:element ref="dc:subject"/>
+       <xs:element ref="js:metadata"/>
+     </xs:choice>
+  </xs:group>
+</xs:schema>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/jetspeed-portlet.xsd
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message