portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r505014 [8/11] - in /portals/jetspeed-2/trunk: components/serializer/ components/serializer/src/java/org/apache/jetspeed/serializer/ components/serializer/src/java/org/apache/jetspeed/serializer/objects/ etc/ etc/sql/ etc/xsd/ jetspeed-api/...
Date Thu, 08 Feb 2007 19:31:03 GMT
Modified: portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/sql/j2-seed.xml?view=diff&rev=505014&r1=505013&r2=505014
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Thu Feb  8 11:31:01 2007
@@ -1,695 +1,708 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>user,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>user,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>
+<?xml version="1.0" encoding="UTF-8"?>
+<Snapshot name="standard-jetspeed2.xml"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<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>
+				<preference>
+					<name value="org.apache.jetspeed.prefered.locale"/>
+					<value value="en,,"/>
+				</preference>
+			</preferences>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Test Dude"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Dudley"/>
+				</preference>
+			</userinfo>
+			<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>user,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>user,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>

Modified: portals/jetspeed-2/trunk/etc/xsd/j2-seed.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/xsd/j2-seed.xsd?view=diff&rev=505014&r1=505013&r2=505014
==============================================================================
--- portals/jetspeed-2/trunk/etc/xsd/j2-seed.xsd (original)
+++ portals/jetspeed-2/trunk/etc/xsd/j2-seed.xsd Thu Feb  8 11:31:01 2007
@@ -1,319 +1,336 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2007 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<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">
-  <xs:element name="Snapshot">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:softwareVersion"/>
-        <xs:element ref="tns:softwareSubVersion"/>
-        <xs:element ref="tns:default_rule"/>
-        <xs:element ref="tns:encryption"/>
-        <xs:element ref="tns:MimeTypes"/>
-        <xs:element ref="tns:MediaTypes"/>
-        <xs:element ref="tns:Capabilities"/>
-        <xs:element ref="tns:Clients"/>
-        <xs:element ref="tns:Roles"/>
-        <xs:element ref="tns:Groups"/>
-        <xs:element ref="tns:Users"/>
-        <xs:element ref="tns:Permissions"/>
-        <xs:element ref="tns:ProfilingRules"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="softwareVersion">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:integer"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="softwareSubVersion">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:integer"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="default_rule">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="encryption">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="MimeTypes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:MimeType"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="MimeType" type="xs:string"/>
-  <xs:element name="MediaTypes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:MediaType"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="MediaType">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:charcterSet"/>
-        <xs:element ref="tns:title"/>
-        <xs:element ref="tns:description"/>
-        <xs:element ref="tns:capabilities"/>
-        <xs:element ref="tns:mimeTypes"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="charcterSet">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="title">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Capabilities">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:Capability"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Capability" type="xs:string"/>
-  <xs:element name="Clients">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:Client"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Client">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:userAgentPattern"/>
-        <xs:element ref="tns:version"/>
-        <xs:element ref="tns:model"/>
-        <xs:element ref="tns:manufacturer"/>
-        <xs:element ref="tns:capabilities"/>
-        <xs:element ref="tns:mimeTypes"/>
-      </xs:sequence>
-      <xs:attribute name="evalOrder" use="required" type="xs:integer"/>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="preferredMimeTypeID" type="xs:string" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="userAgentPattern">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="version">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="manufacturer">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Roles">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:Role"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Role" type="xs:string"/>
-  <xs:element name="Groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:Group"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Group" type="xs:string"/>
-  <xs:element name="Users">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:User"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="User">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:choice>
-          <xs:element ref="tns:Null"/>
-          <xs:element ref="tns:credentials"/>
-        </xs:choice>
-        <xs:element ref="tns:roles"/>
-        <xs:element ref="tns:groups"/>
-        <xs:element ref="tns:preferences"/>
-        <xs:element ref="tns:userinfo"/>
-        <xs:element ref="tns:Rules"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Null">
-    <xs:complexType/>
-  </xs:element>
-  <xs:element name="credentials">
-    <xs:complexType>
-      <xs:attribute name="enabled" use="required">
-         <xs:simpleType>
-          <xs:restriction base="xs:string">
-            <xs:enumeration value="TRUE" />
-            <xs:enumeration value="FALSE" />
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="password" use="required" type="xs:string"/>
-      <xs:attribute name="requiresUpdate" use="required">
-        <xs:simpleType>
-          <xs:restriction base="xs:string">
-            <xs:enumeration value="TRUE" />
-            <xs:enumeration value="FALSE" />
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="expirationDate" type="xs:string" use="optional"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="preferences">
-    <xs:complexType>
-      <xs:attribute name="org.apache.jetspeed.prefered.locale"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="userinfo">
-    <xs:complexType>
-      <xs:attribute name="user.name.family" type="xs:string"/>
-      <xs:attribute name="user.name.given" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Rules">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:Rule"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Rule">
-    <xs:complexType>
-      <xs:attribute name="locator" use="required" type="xs:string"/>
-      <xs:attribute name="rule" use="required" type="xs:IDREF"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Permissions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:Permission"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Permission">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:roles"/>
-        <xs:element ref="tns:groups"/>
-        <xs:element ref="tns:users"/>
-      </xs:sequence>
-      <xs:attribute name="actions" use="required" type="xs:string"/>
-      <xs:attribute name="resource" use="required" type="xs:string"/>
-      <xs:attribute name="type" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="users" type="xs:string"/>
-  <xs:element name="ProfilingRules">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:ProfilingRule"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ProfilingRule">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:description"/>
-        <xs:element ref="tns:Criteria"/>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="standardRule" use="required" type="xs:boolean"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Criteria">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:Criterion"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Criterion">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:type"/>
-        <xs:element minOccurs="0" ref="tns:value"/>
-        <xs:element ref="tns:fallBackOrder"/>
-        <xs:element ref="tns:fallBackType"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="type">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="value">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="fallBackOrder">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:integer"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="fallBackType">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:integer"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="description">
-    <xs:complexType>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="capabilities" type="xs:string"/>
-  <xs:element name="mimeTypes" type="xs:string"/>
-  <xs:element name="roles" type="xs:string"/>
-  <xs:element name="groups" type="xs:string"/>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2007 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<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">
+  <xs:element name="Snapshot">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:softwareVersion"/>
+        <xs:element ref="tns:softwareSubVersion"/>
+        <xs:element ref="tns:default_rule"/>
+        <xs:element ref="tns:encryption"/>
+        <xs:element ref="tns:MimeTypes"/>
+        <xs:element ref="tns:MediaTypes"/>
+        <xs:element ref="tns:Capabilities"/>
+        <xs:element ref="tns:Clients"/>
+        <xs:element ref="tns:Roles"/>
+        <xs:element ref="tns:Groups"/>
+        <xs:element ref="tns:Users"/>
+        <xs:element ref="tns:Permissions"/>
+        <xs:element ref="tns:ProfilingRules"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="softwareVersion">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:integer"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="softwareSubVersion">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:integer"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="default_rule">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="encryption">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="MimeTypes">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:MimeType"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="MimeType" type="xs:string"/>
+  <xs:element name="MediaTypes">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:MediaType"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="MediaType">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:charcterSet"/>
+        <xs:element ref="tns:title"/>
+        <xs:element ref="tns:description"/>
+        <xs:element ref="tns:capabilities"/>
+        <xs:element ref="tns:mimeTypes"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="charcterSet">
+    <xs:complexType>
+      <xs:attribute name="value" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="title">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Capabilities">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:Capability"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Capability" type="xs:string"/>
+  <xs:element name="Clients">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:Client"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Client">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:userAgentPattern"/>
+        <xs:element ref="tns:version"/>
+        <xs:element ref="tns:model"/>
+        <xs:element ref="tns:manufacturer"/>
+        <xs:element ref="tns:capabilities"/>
+        <xs:element ref="tns:mimeTypes"/>
+      </xs:sequence>
+      <xs:attribute name="evalOrder" use="required" type="xs:integer"/>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute name="preferredMimeTypeID" type="xs:string" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="userAgentPattern">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="version">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="model">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="manufacturer">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Roles">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:Role"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Role" type="xs:string"/>
+  <xs:element name="Groups">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:Group"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Group" type="xs:string"/>
+  <xs:element name="Users">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:User"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="User">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice>
+          <xs:element ref="tns:Null"/>
+          <xs:element ref="tns:credentials"/>
+        </xs:choice>
+        <xs:element ref="tns:roles"/>
+        <xs:element ref="tns:groups"/>
+        <xs:element ref="tns:preferences"/>
+        <xs:element ref="tns:userinfo"/>
+        <xs:element ref="tns:Rules"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Null">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="credentials">
+    <xs:complexType>
+      <xs:attribute name="enabled" use="required">
+         <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="TRUE" />
+            <xs:enumeration value="FALSE" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="password" use="required" type="xs:string"/>
+      <xs:attribute name="requiresUpdate" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="TRUE" />
+            <xs:enumeration value="FALSE" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="expirationDate" type="xs:string" use="optional"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="preferences">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="tns:preference"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="userinfo">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:preference"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Rules">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:Rule"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Rule">
+    <xs:complexType>
+      <xs:attribute name="locator" use="required" type="xs:string"/>
+      <xs:attribute name="rule" use="required" type="xs:IDREF"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Permissions">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:Permission"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Permission">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:roles"/>
+        <xs:element ref="tns:groups"/>
+        <xs:element ref="tns:users"/>
+      </xs:sequence>
+      <xs:attribute name="actions" use="required" type="xs:string"/>
+      <xs:attribute name="resource" use="required" type="xs:string"/>
+      <xs:attribute name="type" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="users" type="xs:string"/>
+  <xs:element name="ProfilingRules">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:ProfilingRule"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ProfilingRule">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:description"/>
+        <xs:element ref="tns:Criteria"/>
+      </xs:sequence>
+      <xs:attribute name="id" use="required" type="xs:ID"/>
+      <xs:attribute name="standardRule" use="required" type="xs:boolean"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Criteria">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:Criterion"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Criterion">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:type"/>
+        <xs:element minOccurs="0" ref="tns:value"/>
+        <xs:element ref="tns:fallBackOrder"/>
+        <xs:element ref="tns:fallBackType"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="type">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="value">
+    <xs:complexType>
+      <xs:attribute name="value" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="fallBackOrder">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:integer"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="fallBackType">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:integer"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="description">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="capabilities" type="xs:string"/>
+  <xs:element name="mimeTypes" type="xs:string"/>
+  <xs:element name="roles" type="xs:string"/>
+  <xs:element name="groups" type="xs:string"/>
+    <xs:element name="preference">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:name"/>
+        <xs:element ref="tns:value"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="name">
+    <xs:complexType>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/JetspeedSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/JetspeedSerializer.java?view=diff&rev=505014&r1=505013&r2=505014
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/JetspeedSerializer.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/serializer/JetspeedSerializer.java Thu Feb  8 11:31:01 2007
@@ -1,183 +1,192 @@
-/**
- * Copyright 2004 The Apache Software Foundation
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer;
-
-import java.util.Map;
-
-import org.apache.jetspeed.components.ComponentManager;
-
-/**
- * Jetspeed Serializer
- * <p>
- * The Serializer is capable of reading and writing the current content of the
- * Jetspeed environment to and from XML files. The component can be used from a
- * standalone java application for seeding a new database or from a running
- * portal as an administrative backup/restore function.
- * <p>
- * The XML file needs to indicate whether passwords used in credentials
- * are plain text or whether they are encoded. The import algoritm can determine -
- * prior to reading users - which encode/decode scheme was used and if <none> or
- * <implements PasswordEncodingService> then we store plain passwords (Note that
- * that alone requires the resulting XML to be encoded!!!!!)
- * 
- * @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
- * @version $Id: JetspeedSerializer.java 0 2006-10-31 22:51:28Z hjb $
- * 
- */
-public interface JetspeedSerializer
-{
-
-    /** Password handling */
-    /** Error in determening correct password handling */
-    public final static short ERROR_DECODING = -1;
-
-    /** the passwords are in clear text */
-    public final static short NO_DECODING = 0;
-
-    /**
-     * the passwords are encoded and the provider is the same as the data
-     * source, but is a 1-way algorithm
-     */
-    public final static short PASSTHRU_REQUIRED = 1;
-
-    /**
-     * the passwords are encoded and the provider is the same as the data source
-     * and we have a 2-way algorithm
-     */
-    public final static short DECODING_SUPPORTED = 2;
-
-    /** the passwords are encoded and the current provider is DIFFERENT.... */
-    public final static short INVALID_PASSWORDS = 3;
-
-    /** export/import instructions */
-
-    public final static String KEY_PROCESS_USERS = "process_users".intern();
-
-    public final static String KEY_PROCESS_CAPABILITIES = "process_capabilities"
-            .intern();
-
-    public final static String KEY_PROCESS_PROFILER = "process_profiler"
-            .intern();
-
-    public final static String KEY_PROCESS_USER_PREFERENCES = "process_user_preferences"
-            .intern();
-
-    public final static String KEY_OVERWRITE_EXISTING = "overwrite_existing"
-            .intern();
-
-    public final static String KEY_BACKUP_BEFORE_PROCESS = "backup_before_process"
-            .intern();
-
-    /**<p> the main tag in the XML file */
-    public final static String TAG_SNAPSHOT = "Snapshot"; 
-    
-    /**
-     * hand the serializer an existing component manager to access the
-     * environment
-     * 
-     * @param cm
-     */
-    public void setComponentManager(ComponentManager cm)
-            throws SerializerException;
-
-    /**
-     * Create a component manager with the list of primary components (boot),
-     * the application components and the root path of the application
-     * 
-     * @param appRoot
-     *            working directory
-     * @param bootConfig
-     *            boot (primary) file or files (wildcards are allowed)
-     * @param appConfig
-     *            application (secondary) file or files (wildcards are allowed)
-     * @return a newly initiated component manager
-     * @throws SerializerException
-     */
-    public void initializeComponentManager(String appRoot, String[] bootConfig,
-            String[] appConfig) throws SerializerException;
-
-    /**
-     * Main routine to export the set of data elements and write them to the
-     * named XML file. The default behavior of the serializer is that all
-     * available data is extracted and the target file gets created or
-     * overwritten
-     * <p>
-     * The caller can adjust the default behavior by passign in a map of flags.
-     * Each map entry is keyed by a key Constant and the associated Boolean
-     * value, for exammple KEY_PROCESS_USER_PREFERENCES, Boolean.FALSE would
-     * cause the serializer to skip user preferences.
-     * <p>
-     * Note that ProfilingRules require the users . Hence turning off User
-     * collection will automatically turn off the Profiling rules
-     * 
-     * 
-     * @param name
-     *            of the snapshot
-     * @param exportFileName
-     * @param settings
-     *            optional Map overwriting default export behavior
-     */
-    public void exportData(String name, String exportFileName, Map settings)
-            throws SerializerException;
-
-    /**
-     * Main routine to import the set of data elements and write them to the
-     * current environment. The default behavior of the serializer is that all
-     * available data is read and written to the current environment.
-     * <p>
-     * Existing entries (like users) etc. will be overwritten with the provided
-     * data.
-     * <p>
-     * The caller can adjust the default behavior by passign in a map of flags.
-     * Each map entry is keyed by a key Constant and the associated Boolean
-     * value, for exammple KEY_PROCESS_USER_PREFERENCES, Boolean.FALSE would
-     * cause the serializer to skip user preferences.
-     * <p>
-     * Note that settings are valid throughout each invocation. Therefore if a
-     * caller wants to preserve current users and only add new entries while at
-     * the same time overwrite all profiling rules, exportData has to be invoked
-     * twice - once to process only the users with the no-overwrite option and
-     * once to process the profiling rules
-     * 
-     * @param importFileName
-     * @param settings
-     *            optional Map overwriting default import behavior
-     * @return
-     */
-    public void importData(String importFileName, Map settings)
-            throws SerializerException;
-
-    /**
-     * Set the default indent for the XML output
-     * 
-     * @param indent
-     */
-    public void setDefaultIndent(String indent);
-
-    /**
-     * Get the current indent setting for XML files
-     * 
-     * @return the current indent setting
-     */
-    public String getDefaultIndent();
-
-    /**
-     * reelase the resources etc.
-     * 
-     */
-    public void closeUp();
-
-}
+/**
+ * Copyright 2004 The Apache Software Foundation
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.serializer;
+
+import java.util.Map;
+
+import org.apache.jetspeed.components.ComponentManager;
+
+/**
+ * Jetspeed Serializer
+ * <p>
+ * The Serializer is capable of reading and writing the current content of the
+ * Jetspeed environment to and from XML files. The component can be used from a
+ * standalone java application for seeding a new database or from a running
+ * portal as an administrative backup/restore function.
+ * <p>
+ * The XML file needs to indicate whether passwords used in credentials
+ * are plain text or whether they are encoded. The import algoritm can determine -
+ * prior to reading users - which encode/decode scheme was used and if <none> or
+ * <implements PasswordEncodingService> then we store plain passwords (Note that
+ * that alone requires the resulting XML to be encoded!!!!!)
+ * 
+ * @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+ * @version $Id: JetspeedSerializer.java 0 2006-10-31 22:51:28Z hjb $
+ * 
+ */
+public interface JetspeedSerializer
+{
+
+    /** Password handling */
+    /** Error in determening correct password handling */
+    public final static short ERROR_DECODING = -1;
+
+    /** the passwords are in clear text */
+    public final static short NO_DECODING = 0;
+
+    /**
+     * the passwords are encoded and the provider is the same as the data
+     * source, but is a 1-way algorithm
+     */
+    public final static short PASSTHRU_REQUIRED = 1;
+
+    /**
+     * the passwords are encoded and the provider is the same as the data source
+     * and we have a 2-way algorithm
+     */
+    public final static short DECODING_SUPPORTED = 2;
+
+    /** the passwords are encoded and the current provider is DIFFERENT.... */
+    public final static short INVALID_PASSWORDS = 3;
+
+    /** export/import instructions */
+
+    public final static String KEY_PROCESS_USERS = "process_users".intern();
+
+    public final static String KEY_PROCESS_CAPABILITIES = "process_capabilities"
+            .intern();
+
+    public final static String KEY_PROCESS_PROFILER = "process_profiler"
+            .intern();
+
+    public final static String KEY_PROCESS_USER_PREFERENCES = "process_user_preferences"
+            .intern();
+    public final static String KEY_PROCESS_PORTAL_PREFERENCES = "process_portal_preferences"
+        .intern();
+
+    public final static String KEY_OVERWRITE_EXISTING = "overwrite_existing"
+            .intern();
+
+    public final static String KEY_BACKUP_BEFORE_PROCESS = "backup_before_process"
+            .intern();
+
+    /** export/import instructions secondary*/
+    public final static String KEY_PROCESS_ENTITIES = "process_entities".intern();
+    public final static String KEY_PROCESS_PREFERENCES = "process_preferences".intern();
+    
+    
+    
+    /**<p> the main tag in the XML file */
+    public final static String TAG_SNAPSHOT = "Snapshot"; 
+    public final static String TAG_SECONDARYSNAPSHOT = "SecondaryData"; 
+    
+    /**
+     * hand the serializer an existing component manager to access the
+     * environment
+     * 
+     * @param cm
+     */
+    public void setComponentManager(ComponentManager cm)
+            throws SerializerException;
+
+    /**
+     * Create a component manager with the list of primary components (boot),
+     * the application components and the root path of the application
+     * 
+     * @param appRoot
+     *            working directory
+     * @param bootConfig
+     *            boot (primary) file or files (wildcards are allowed)
+     * @param appConfig
+     *            application (secondary) file or files (wildcards are allowed)
+     * @return a newly initiated component manager
+     * @throws SerializerException
+     */
+    public void initializeComponentManager(String appRoot, String[] bootConfig,
+            String[] appConfig) throws SerializerException;
+
+    /**
+     * Main routine to export the set of data elements and write them to the
+     * named XML file. The default behavior of the serializer is that all
+     * available data is extracted and the target file gets created or
+     * overwritten
+     * <p>
+     * The caller can adjust the default behavior by passign in a map of flags.
+     * Each map entry is keyed by a key Constant and the associated Boolean
+     * value, for exammple KEY_PROCESS_USER_PREFERENCES, Boolean.FALSE would
+     * cause the serializer to skip user preferences.
+     * <p>
+     * Note that ProfilingRules require the users . Hence turning off User
+     * collection will automatically turn off the Profiling rules
+     * 
+     * 
+     * @param name
+     *            of the snapshot
+     * @param exportFileName
+     * @param settings
+     *            optional Map overwriting default export behavior
+     */
+    public void exportData(String name, String exportFileName, Map settings)
+            throws SerializerException;
+
+    /**
+     * Main routine to import the set of data elements and write them to the
+     * current environment. The default behavior of the serializer is that all
+     * available data is read and written to the current environment.
+     * <p>
+     * Existing entries (like users) etc. will be overwritten with the provided
+     * data.
+     * <p>
+     * The caller can adjust the default behavior by passign in a map of flags.
+     * Each map entry is keyed by a key Constant and the associated Boolean
+     * value, for exammple KEY_PROCESS_USER_PREFERENCES, Boolean.FALSE would
+     * cause the serializer to skip user preferences.
+     * <p>
+     * Note that settings are valid throughout each invocation. Therefore if a
+     * caller wants to preserve current users and only add new entries while at
+     * the same time overwrite all profiling rules, exportData has to be invoked
+     * twice - once to process only the users with the no-overwrite option and
+     * once to process the profiling rules
+     * 
+     * @param importFileName
+     * @param settings
+     *            optional Map overwriting default import behavior
+     * @return
+     */
+    public void importData(String importFileName, Map settings)
+            throws SerializerException;
+
+    /**
+     * Set the default indent for the XML output
+     * 
+     * @param indent
+     */
+    public void setDefaultIndent(String indent);
+
+    /**
+     * Get the current indent setting for XML files
+     * 
+     * @return the current indent setting
+     */
+    public String getDefaultIndent();
+
+    /**
+     * reelase the resources etc.
+     * 
+     */
+    public void closeUp();
+
+}

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml?view=diff&rev=505014&r1=505013&r2=505014
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml Thu Feb  8 11:31:01 2007
@@ -113,11 +113,17 @@
             <include name="security*.xml"/>
             <include name="capabilities.xml"/>           
             <include name="prefs.xml"/>           
-            <include name="profiler.xml"/>            
+            <include name="profiler.xml"/>    
+           <include name="registry.xml"/>       
             <include name="transaction.xml"/>           
           </fileset>
             </copy>
-    	<mkdir dir="${basedir}/target/classes/archetype-resources/etc/serializer/log4j"/>
+        <copy todir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly">
+           <fileset dir="${basedir}/../../src/webapp/WEB-INF/assembly/alternate">
+             <include name="request-context.xml"/>
+           </fileset>
+          </copy>
+      	<mkdir dir="${basedir}/target/classes/archetype-resources/etc/serializer/log4j"/>
         <copy todir="${basedir}/target/classes/archetype-resources/etc/serializer/log4j">
             <fileset dir="${basedir}/../../etc/log4j" >
                 <include name="log4j.properties"/>



---------------------------------------------------------------------
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