You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/02/25 09:48:23 UTC

svn commit: r511469 [1/2] - in /portals/jetspeed-2/trunk: ./ applications/j2-admin/src/webapp/WEB-INF/ applications/j2-admin/src/webapp/WEB-INF/view/info/ components/portal/src/java/org/apache/jetspeed/container/window/impl/ etc/sql/ etc/sql/min/ maven...

Author: taylor
Date: Sun Feb 25 00:48:19 2007
New Revision: 511469

URL: http://svn.apache.org/viewvc?view=rev&rev=511469
Log:
alternate "min" build
- site (psml)
- seed data

added maven-1 (only) goals for min build

maven minBuild (same as allBuild but embeds min site,seed into war
maven j2:minDeploy - correctly now uses min site and min seed data

these goals are now ready to be used by the installer, although i still have a few tweaks on the min site files

Added:
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
    portals/jetspeed-2/trunk/etc/sql/min/
    portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/folder.metadata
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/groups.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiroles.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiusers.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/roles.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/users.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/entities.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/palm.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/rpad.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/site.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/statistics.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/tracking.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/folder.metadata
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-constraints.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-permissions.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/sso-admin.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2.link
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/apache.link
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/apache_portals.link
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/folder.metadata
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/my-account.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/page.security
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/registration.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/system/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/system/customizer/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/system/customizer/folder.metadata
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/system/customizer/selector.psml
Modified:
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
    portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/maven.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/profiler.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=511469&r1=511468&r2=511469
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml Sun Feb 25 00:48:19 2007
@@ -62,6 +62,16 @@
          <js:metadata name="merge.portal.parameters.with.portlet.parameters">true</js:metadata>
          <js:metadata name="merge.portal.parameters.before.portlet.parameters">true</js:metadata>
     </portlet>   
+
+    <portlet>
+        <portlet-name>WelcomeToJetspeed</portlet-name>
+        <js:security-constraint-ref>public-view</js:security-constraint-ref>       
+    </portlet>
+
+    <portlet>
+        <portlet-name>AboutJetspeed</portlet-name>
+        <js:security-constraint-ref>public-view</js:security-constraint-ref>       
+    </portlet>
 	
 	<js:services>        
         <js:service name='ApplicationServerManager'/>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml?view=diff&rev=511469&r1=511468&r2=511469
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml Sun Feb 25 00:48:19 2007
@@ -1522,12 +1522,37 @@
     <portlet-info>
       <title>Welcome to Jetspeed</title>
       <short-title>Welcome</short-title>
-      <keywords>welcome</keywords>
+      <keywords>welcome,jetspeed</keywords>
     </portlet-info>
     <portlet-preferences>
          <preference>
              <name>file</name>
-             <value>/info/welcome.html</value>
+             <value>view/info/welcome.html</value>
+         </preference>
+     </portlet-preferences>   
+  </portlet>
+
+<portlet>
+    <description>About Jetspeed</description>
+    <portlet-name>AboutJetspeed</portlet-name>
+    <display-name>About Jetspeed</display-name>
+    <portlet-class>org.apache.portals.gems.file.FilePortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <!-- resource-bundle></resource-bundle -->
+    <portlet-info>
+      <title>About Jetspeed</title>
+      <short-title>About</short-title>
+      <keywords>about,jetspeed</keywords>
+    </portlet-info>
+    <portlet-preferences>
+         <preference>
+             <name>file</name>
+             <value>view/info/about.html</value>
          </preference>
      </portlet-preferences>   
   </portlet>

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html Sun Feb 25 00:48:19 2007
@@ -0,0 +1 @@
+<b>About!</b>

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html Sun Feb 25 00:48:19 2007
@@ -0,0 +1 @@
+<b>Welcome!</b>

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java?view=diff&rev=511469&r1=511468&r2=511469
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java Sun Feb 25 00:48:19 2007
@@ -314,13 +314,14 @@
         {
             PortletWindow window = (PortletWindow)((Map.Entry)tmpWindows.get(i)).getValue();
             PortletDefinitionComposite windowDef = (PortletDefinitionComposite)window.getPortletEntity().getPortletDefinition();            
-            if(def.getUniqueName().equals(windowDef.getUniqueName()))
+            if(def != null && def.getUniqueName().equals(windowDef.getUniqueName()))
             {
                 removeWindow(window);
             }
         }        
         tmpWindows.clear(); 
-        portletFactory.updatePortletConfig(def);
+        if (def != null)
+            portletFactory.updatePortletConfig(def);
     }
 
     protected void removeForPortletApplication(MutablePortletApplication app)

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=511469&r1=511468&r2=511469
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Sun Feb 25 00:48:19 2007
@@ -362,11 +362,6 @@
 			<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>
@@ -374,11 +369,6 @@
 		</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>

Added: portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml (added)
+++ portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,484 @@
+<?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>guest</Role>
+		<Role>user</Role>
+	</Roles>
+	<Groups>
+	</Groups>
+	<Users>
+		<User name="admin">
+			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
+			<roles>user,admin</roles>
+			<groups></groups>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="System"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Administrator"/>
+				</preference>
+			</userinfo>
+			<Rules/>
+		</User>
+		<User name="guest">
+			<Null/>
+			<roles>guest</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+	</Users>
+	<Permissions>
+		<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>
+	</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="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/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?view=diff&rev=511469&r1=511468&r2=511469
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Sun Feb 25 00:48:19 2007
@@ -198,6 +198,12 @@
         <include name="*seed.xml"/>
       </fileset>
     </copy>        
+    <mkdir dir="${portal.sql.target.dir}/min"/>          
+    <copy todir="${portal.sql.target.dir}/min" overwrite="true" verbose="true" failonerror="false" flatten="true">
+      <fileset dir="${portal.sql.src.dir}/min">
+        <include name="*seed.xml"/>
+      </fileset>
+    </copy>        
     <!-- Copy over custom build seed data -->
 	<util:file var="customExists" name="./src/sql/"/> 
 	<j:if test="${customExists.exists()}">
@@ -333,7 +339,14 @@
 	<goal name="j2:_db.entities">
 		<echo>Running JETSPEED seed scripts...</echo> 
 		<!-- if there is an order file, use it -->
-		<j:set var="DATAFILE" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.sql.dir}/${org.apache.jetspeed.portal.seed.data}"/>
+	    <j:choose>
+    	   <j:when test="${demoBuild == 'true'}">		  					
+		       <j:set var="DATAFILE" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.sql.dir}/${org.apache.jetspeed.portal.seed.data}"/>
+		   </j:when>
+		   <j:otherwise>
+		       <j:set var="DATAFILE" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.sql.dir}/min/${org.apache.jetspeed.portal.seed.data}"/>
+           </j:otherwise>
+	   	</j:choose>
 		<attainGoal name="j2:_db.seed"/>
 	</goal>
     
@@ -546,21 +559,26 @@
     <attainGoal name="j2:catalina.shared"/>
   </goal>
     
-  <goal name="j2:minDeploy">
+  <goal name="j2:baseDeploy">
       <attainGoal name="j2:portal.deploy"/>
       <attainGoal name="j2:pam.layoutdeploy"/>
-      <attainGoal name="j2:pam.admindeploy"/>
+      <attainGoal name="j2:pam.admindeploy"/>  
+  </goal>
+  
+  <goal name="j2:minDeploy">
+      <attainGoal name="j2:baseDeploy"/>
+      <j:set var="demoBuild" value="false"/>     
       <attainGoal name="j2:db.entities"/>
   </goal>
 
   <goal name="j2:nodbMinDeploy">
-      <attainGoal name="j2:portal.deploy"/>
-      <attainGoal name="j2:pam.layoutdeploy"/>
-      <attainGoal name="j2:pam.admindeploy"/>
+      <attainGoal name="j2:baseDeploy"/>
   </goal>
   
   <goal name="j2:fullDeploy">
-      <attainGoal name="j2:minDeploy"/>
+      <attainGoal name="j2:baseDeploy"/>
+      <j:set var="demoBuild" value="true"/>     
+      <attainGoal name="j2:db.entities"/>
       <attainGoal name="j2:pam.demodeploy"/>
       <attainGoal name="j2:pam.jsfdeploy"/>
       <attainGoal name="j2:pam.rssdeploy"/>

Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven.xml?view=diff&rev=511469&r1=511468&r2=511469
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Sun Feb 25 00:48:19 2007
@@ -182,8 +182,18 @@
 		<maven:reactor basedir="${basedir}/maven-plugin" includes="project.xml" goals="deploy-plugin"
             banner="Build and deploy the Jetspeed 2 Maven plugin" postProcessing="false" ignoreFailures="false" />
     </goal>
-    
-    <goal name="allBuild" description="Build all jars and war">
+ 
+	<goal name="allBuild" description="Build all jars and war plus configures demo">
+		 <j:set var="demoBuild" value="true"/>      
+		 <attainGoal name="commonBuild"/>
+	</goal>
+  
+	<goal name="minBuild" description="Same as allBuild, but with minimal seed and page info">
+		 <j:set var="demoBuild" value="false"/>      
+		 <attainGoal name="commonBuild"/>
+	</goal>
+	
+    <goal name="commonBuild" description="Build all jars and war">
             
       <attainGoal name="j2:portal.conf.sql"/>
       <attainGoal name="j2:portal.conf.ldap"/>
@@ -219,6 +229,7 @@
         
       <attainGoal name='unzip-javascript'/>
           
+  	
       <!-- Build and install pa war files -->
       <attainGoal name="jetspeed2:war:install" />
         
@@ -229,6 +240,18 @@
             banner="Build and deploy the Jetspeed 2 Maven plugin" postProcessing="false" ignoreFailures="false" />
     </goal>
 
+	<postGoal name="war:webapp">
+		 <available file="${maven.build.dir}/jetspeed/WEB-INF/min-pages/" property="inRightDir"/>
+		  <j:if test="${inRightDir == 'true'}">
+	      <j:if test="${demoBuild != 'true'}">	
+			<delete dir="${maven.build.dir}/jetspeed/WEB-INF/pages"/>
+		    <copy todir="${maven.build.dir}/jetspeed/WEB-INF/pages/">
+		        <fileset dir="${maven.build.dir}/jetspeed/WEB-INF/min-pages/"/>
+			</copy>
+	     </j:if>
+		 </j:if>
+	</postGoal>
+		
     <goal name="show.maven.props">
         <echo message="maven.home.local = ${maven.home.local}" />
         <echo message="maven.repo.local = ${maven.repo.local}" />

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/folder.metadata?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/folder.metadata (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/folder.metadata Sun Feb 25 00:48:19 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<folder hidden="true"
+    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/folder-metadata.xsd"/>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/groups.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/groups.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/groups.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/groups.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<page id="chooser-groups" hidden='true'
+    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/psml.xsd">
+  <defaults
+     layout-decorator="simple"
+     portlet-decorator="clear"
+  />
+  <title>Group Chooser</title>
+  <metadata name="title" xml:lang="ja">グループ選択</metadata>
+  <metadata name="title" xml:lang="es">Selector de grupos</metadata>
+  <metadata name="title" xml:lang="zh">用户组选择器</metadata>
+  <metadata name="title" xml:lang="zh-TW">用戶組選擇器</metadata>
+
+  <fragment id="chooser-groups-0" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+    <fragment id="chooser-groups-1" type="portlet" name="j2-admin::GroupChooser" >
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiroles.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiroles.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiroles.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiroles.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,31 @@
+<?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.
+-->
+<page id="multi-chooser-roles" hidden='true'
+    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/psml.xsd">
+  <defaults
+     layout-decorator="simple"
+     portlet-decorator="clear"
+  />
+  <title>User Chooser</title>
+
+  <fragment id="mchooser-roles" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+    <fragment id="mchooser-roles-1" type="portlet" name="j2-admin::RoleMultiChooser" >
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiusers.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiusers.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiusers.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/multiusers.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,36 @@
+<?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.
+-->
+<page id="multi-chooser-users" hidden='true'
+    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/psml.xsd">
+  <defaults
+     layout-decorator="simple"
+     portlet-decorator="clear"
+  />
+  <title>User Chooser</title>
+  <metadata name="title" xml:lang="ja">ユーザー選択</metadata>
+  <metadata name="title" xml:lang="es">Selector de usuarios</metadata>
+  <metadata name="title" xml:lang="zh">用户选择器</metadata>
+  <metadata name="title" xml:lang="zh-TW">用戶選擇器</metadata>
+  <metadata name="title" xml:lang="ko">사용자 선택</metadata>
+
+  <fragment id="mchooser-users" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+    <fragment id="mchooser-users-1" type="portlet" name="j2-admin::UserMultiChooser" >
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/roles.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/roles.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/roles.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/roles.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<page id="chooser-roles" hidden='true'
+    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/psml.xsd">
+  <defaults
+     layout-decorator="simple"
+     portlet-decorator="clear"
+  />
+  <title>Role Chooser</title>
+  <metadata name="title" xml:lang="ja">ロール選択</metadata>
+  <metadata name="title" xml:lang="es">Selector de roles</metadata>
+  <metadata name="title" xml:lang="zh">角色选择器</metadata>
+  <metadata name="title" xml:lang="zh-TW">角色選擇器</metadata>
+
+  <fragment id="chooser-roles-0" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+    <fragment id="chooser-roles-1" type="portlet" name="j2-admin::RoleChooser" >
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/users.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/users.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/users.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/choosers/users.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<page id="chooser-users" hidden='true'
+    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/psml.xsd">
+  <defaults
+     layout-decorator="simple"
+     portlet-decorator="clear"
+  />
+  <title>User Chooser</title>
+  <metadata name="title" xml:lang="ja">ユーザー選択</metadata>
+  <metadata name="title" xml:lang="es">Selector de usuarios</metadata>
+  <metadata name="title" xml:lang="zh">用户选择</metadata>
+  <metadata name="title" xml:lang="zh-TW">用戶選擇</metadata>
+
+  <fragment id="chooser-users-0" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+    <fragment id="chooser-users-1" type="portlet" name="j2-admin::UserChooser" >
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/entities.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/entities.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/entities.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/entities.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<page id="pam"
+    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/psml.xsd">
+  
+  <title>Portlet Entity Manager</title>
+  <fragment id="pemp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+     <fragment id="pemp-2" type="portlet" name="j2-admin::PortletEntityBrowserPortlet" >
+        <property layout="TwoColumns" name="row" value="1" />
+        <property layout="TwoColumns" name="column" value="0" />
+      </fragment>
+     <fragment id="pemp-3" type="portlet" name="j2-admin::PortletEntityEditorPortlet" >
+        <property layout="TwoColumns" name="row" value="1" />
+        <property layout="TwoColumns" name="column" value="1" />
+      </fragment>
+   </fragment>
+</page>
+
+

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata Sun Feb 25 00:48:19 2007
@@ -0,0 +1,36 @@
+<?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.
+-->
+<folder
+    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/folder-metadata.xsd">
+  <title >Jetspeed Administrative Portlets</title>  
+  <metadata name="title" xml:lang="fr">Jetspeed Portlets Administratif</metadata>
+  <metadata name="title" xml:lang="ja">Jetspeed 管理ポートレット</metadata>
+  <metadata name="title" xml:lang="es">Administración de Jetspeed</metadata>
+  <metadata name="title" xml:lang="zh">Jetspeed 管理Portlets</metadata>
+  <metadata name="title" xml:lang="ko">Jetspeed 관리 포틀릿들</metadata>
+
+  <document-order>rpad.psml</document-order>
+  <document-order>pam.psml</document-order>
+  <document-order>site.psml</document-order>
+  <document-order>palm.psml</document-order>
+  <document-order>profiler.psml</document-order>
+  <document-order>entities.psml</document-order>
+  <document-order>tracking.psml</document-order>
+
+  <security-constraints>
+    <security-constraints-ref>admin</security-constraints-ref>
+  </security-constraints>
+</folder>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/palm.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/palm.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/palm.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/palm.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,38 @@
+<?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.
+-->
+<page id="palm"
+    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/psml.xsd">
+ 
+  <title>PALM</title>
+  <metadata name="title" xml:lang="ja">PALM</metadata>
+  <metadata name="title" xml:lang="es">Gestión dinámica de aplicaciones de Portlets</metadata>
+  <metadata name="short-title" xml:lang="es">PALM</metadata>
+  <metadata name="short-title" xml:lang="hu">PALM</metadata>
+  <metadata name="title" xml:lang="hu">PALM</metadata>
+  <metadata name="title" xml:lang="zh">Portlet应用生命周期管理</metadata>
+  <metadata name="title" xml:lang="zh-TW">Portlet應用生命週期管理</metadata>
+  <metadata name="title" xml:lang="ko">포틀릿 애플리케이션 생명주기 관리</metadata>
+
+  <fragment id="palm-layout" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="palm-app" type="portlet" name="j2-admin::PortletApplicationLifecycleManager">
+      <property name="row" value="0" layout="OneColumn"/>
+      <property name="column" value="0" layout="OneColumn"/>
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,41 @@
+<?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.
+-->
+<page id="pam"
+    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/psml.xsd">
+  
+  <title>Portlet Application Manager</title>
+  <metadata name="title" xml:lang="ja">PAM</metadata>
+  <metadata name="title" xml:lang="es">PAM (Gestor de aplicaciones de portlets</metadata>
+  <metadata name="short-title" xml:lang="es">PAM</metadata>
+  <metadata name="title" xml:lang="hu">Portlet alkalmazás beállítások</metadata>
+  <metadata name="title" xml:lang="zh">Portlet应用程序管理</metadata>
+  <metadata name="title" xml:lang="zh-TW">Portlet應用程式管理</metadata>
+  <metadata name="title" xml:lang="ko">포틀릿 애플리케이션 관리</metadata>
+
+  <fragment id="pam-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <fragment id="pam-4" type="portlet" name="j2-admin::PortletApplicationBrowser" >
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="pam-5" type="portlet" name="j2-admin::PortletApplicationDetail" >
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,33 @@
+<?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.
+-->
+<page id="site"
+    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/psml.xsd">
+ 
+  <title>Profiler Admin</title>
+  <metadata name="title" xml:lang="ja">プロファイラ管理</metadata>
+  <metadata name="short-title" xml:lang="es">Perfiles</metadata>
+  <metadata name="title" xml:lang="es">Administrador de perfiles</metadata>
+  <metadata name="title" xml:lang="hu">Profil beállítások</metadata>
+  <metadata name="title" xml:lang="zh">Profiler管理</metadata>
+  <metadata name="title" xml:lang="ko">프로파일 관리</metadata>
+  
+  <fragment id="pa-site" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="prof-1" type="portlet" name="j2-admin::ProfilerAdmin" />
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/rpad.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/rpad.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/rpad.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/rpad.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,28 @@
+<?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.
+-->
+<page id="rpad"
+    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/psml.xsd">
+  <title>RPAD</title>
+  <metadata name="short-title" xml:lang="es">RPAD</metadata>
+
+  <fragment id="rpad-layout" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="rpad-app" type="portlet" name="j2-admin::RPADPortlet">
+      <property name="row" value="0" layout="OneColumn"/>
+      <property name="column" value="0" layout="OneColumn"/>
+    </fragment>
+  </fragment>
+
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/site.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/site.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/site.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/site.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<page id="site"
+    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/psml.xsd">
+ 
+  <title>Portal Site Manager</title>
+  <metadata name="title" xml:lang="ja">ポータルサイト管理</metadata>
+  <metadata name="title" xml:lang="es">Gestor de Páginas del Portal</metadata>
+  <metadata name="short-title" xml:lang="es">Páginas</metadata>
+  <metadata name="title" xml:lang="hu">Portál beállítások</metadata>
+  <metadata name="title" xml:lang="zh">Portal页面管理</metadata>
+  <metadata name="title" xml:lang="zh-TW">Portal頁面管理</metadata>
+      
+
+  <fragment id="js-site2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="psm-10" type="portlet" name="j2-admin::PortalSiteManager" >
+    </fragment>
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/statistics.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/statistics.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/statistics.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/statistics.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,26 @@
+<?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.
+-->
+<page id="statistics"
+    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/psml.xsd">
+  <title>Portal Statistics</title>
+
+  <fragment id="stats-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="stats-3" type="portlet" name="j2-admin::StatisticsPortlet" />
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/tracking.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/tracking.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/tracking.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/portal-admin/tracking.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,26 @@
+<?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.
+-->
+<page id="tracking"
+    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/psml.xsd">
+  <title>Portlet Tracking</title>
+
+  <fragment id="js-ptrack-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="js-ptrack-2" type="portlet" name="j2-admin::PortletTracking" />
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/folder.metadata?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/folder.metadata (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/folder.metadata Sun Feb 25 00:48:19 2007
@@ -0,0 +1,29 @@
+<?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.
+-->
+<folder
+    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/folder-metadata.xsd">
+  <title >Security Administration</title>  
+
+  <document-order>user-mgt.psml</document-order>
+  <document-order>role-mgt.psml</document-order>
+  <document-order>group-mgt.psml</document-order>
+  <document-order>security-permissions.psml</document-order>
+  <document-order>sso-admin.psml</document-order>
+
+  <security-constraints>
+    <security-constraints-ref>admin</security-constraints-ref>
+  </security-constraints>
+</folder>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,40 @@
+<?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.
+-->
+<page id="group-mgt"
+    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/psml.xsd">
+  
+  <title>Group Management</title>
+  <metadata name="title" xml:lang="ja">グループ管理</metadata>
+  <metadata name="short-title" xml:lang="es">Grupos</metadata>
+  <metadata name="title" xml:lang="es">Gestión de Grupos</metadata>
+  <metadata name="title" xml:lang="hu">Csoport beállítások</metadata>
+  <metadata name="title" xml:lang="zh">用户组管理</metadata>
+  <metadata name="title" xml:lang="zh-TW">用戶組管理</metadata>
+  <metadata name="title" xml:lang="ko">그룹 관리</metadata>
+  <fragment id="gm-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
+    <fragment id="gm-3" type="portlet" name="j2-admin::GroupBrowserPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="gm-4" type="portlet" name="j2-admin::GroupDetailsPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>    
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,40 @@
+<?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.
+-->
+<page id="role-mgt"
+    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/psml.xsd">
+ 
+  <title>Role Management</title>
+  <metadata name="title" xml:lang="ja">ロール管理</metadata>
+  <metadata name="short-title" xml:lang="es">Roles</metadata>
+  <metadata name="title" xml:lang="es">Gestión de roles</metadata>
+  <metadata name="title" xml:lang="hu">Szerepkör beállítások</metadata>
+  <metadata name="title" xml:lang="zh">角色管理</metadata>
+  <metadata name="title" xml:lang="ko">역할 관리</metadata>
+
+  <fragment id="rm-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
+    <fragment id="rm-3" type="portlet" name="j2-admin::RoleBrowserPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="rm-4" type="portlet" name="j2-admin::RoleDetailsPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>    
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-constraints.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-constraints.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-constraints.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-constraints.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,26 @@
+<?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.
+-->
+<page id="security-policy"
+    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/psml.xsd">
+  
+  <title>Constraints</title>
+  <fragment id="m-security-constraints-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="m-security-constraints-2" type="portlet" name="j2-admin::SecurityConstraintsPortlet" />
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-permissions.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-permissions.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-permissions.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/security-permissions.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,26 @@
+<?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.
+-->
+<page id="security-policy"
+    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/psml.xsd">
+  
+  <title>Permissions</title>
+  <fragment id="m-security-policy-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="m-security-policy-2" type="portlet" name="j2-admin::SecurityPermissionsPortlet" />
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/sso-admin.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/sso-admin.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/sso-admin.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/sso-admin.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,40 @@
+<?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.
+-->
+<page id="sso-admin"
+    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/psml.xsd">
+
+  <title>SSO Management</title>
+  <metadata name="title" xml:lang="ja">SSO 管理</metadata>
+  <metadata name="short-title" xml:lang="es">Gestión de credenciales (SSO)</metadata>
+  <metadata name="title" xml:lang="es">Credenciales (SSO)</metadata>
+  <metadata name="title" xml:lang="hu">SSO beállítások</metadata>
+  <metadata name="title" xml:lang="zh">SSO 管理</metadata>
+  <metadata name="title" xml:lang="ko">SSO 관리</metadata>
+
+  <fragment id="ssoa-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <fragment id="ssoa-200" type="portlet" name="j2-admin::SSOBrowserPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="ssoa-201" type="portlet" name="j2-admin::SSODetailsPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>    
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,42 @@
+<?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.
+-->
+<page id="user-mgt"
+    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/psml.xsd">
+ 
+  <title>User Management</title>
+  <metadata name="title" xml:lang="ja">ユーザー管理</metadata>
+  <metadata name="short-title" xml:lang="es">Usuarios</metadata>
+  <metadata name="title" xml:lang="es">Gestor de usuarios</metadata>
+  <metadata name="title" xml:lang="hu">Felhasználók beállítása</metadata>
+  <metadata name="title" xml:lang="zh">用户管理</metadata>
+  <metadata name="title" xml:lang="zh-TW">用戶管理</metadata>
+  <metadata name="title" xml:lang="ko">사용자 관리</metadata>
+
+  <fragment id="um-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <property layout="TwoColumns" name="sizes" value="33%,64%" />
+    <fragment id="um-3" type="portlet" name="j2-admin::UserBrowserPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="um-4" type="portlet" name="j2-admin::UserDetailsPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>    
+  </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2.link?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2.link (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2.link Sun Feb 25 00:48:19 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2005 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.
+-->
+<link target="top"
+    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/link.xsd">
+ <title>Jetspeed 2 Home Page</title>
+ <url>http://portals.apache.org/jetspeed-2/</url>
+ <metadata name="title" xml:lang="ja">Jetspeed 2 ホームページ</metadata>
+ <metadata name="title" xml:lang="es">Página Web de Jetspeed 2</metadata>
+ <metadata name="title" xml:lang="zh">Jetspeed 2主页</metadata>
+ <metadata name="title" xml:lang="zh-TW">Jetspeed 2主頁</metadata>
+ <metadata name="title" xml:lang="ko">Jetspeed 2 홈페이지</metadata>
+</link>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link Sun Feb 25 00:48:19 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2005 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.
+-->
+<link target="top"
+    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/link.xsd">
+ <title>Jetspeed 2 Wiki</title>
+ <url>http://wiki.apache.org/portals/Jetspeed2</url>
+</link>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml?view=auto&rev=511469
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml Sun Feb 25 00:48:19 2007
@@ -0,0 +1,41 @@
+<?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.
+-->
+<page id="my-account2" hidden="true"
+    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/psml.xsd">
+ 
+  <title>My Account</title>
+  <metadata name="title" xml:lang="ja">アカウント</metadata>
+  <metadata name="title" xml:lang="es">Mi cuenta</metadata>
+  <metadata name="title" xml:lang="hu">Személyes beállítások</metadata>
+  <metadata name="title" xml:lang="zh">我的帐户配置</metadata>
+  <metadata name="title" xml:lang="zh-TW">我的帳戶配置</metadata>
+  <metadata name="title" xml:lang="ko">내 계정</metadata>
+
+  <fragment id="jp-macc-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <fragment id="jp-macc-2" type="portlet" name="j2-admin::LoginPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+   <fragment id="jp-macc-3" type="portlet" name="j2-admin::ChangePasswordPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>    
+  </fragment>
+
+</page>



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