portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r484726 - in /portals/jetspeed-2/trunk/etc: log4j/log4j.properties schema/phase2-schema.xml schema/prefs-schema.xml schema/registry-schema.xml schema/security-schema.xml sql/j2-seed.xml
Date Fri, 08 Dec 2006 20:05:34 GMT
Author: taylor
Date: Fri Dec  8 12:05:33 2006
New Revision: 484726

URL: http://svn.apache.org/viewvc?view=rev&rev=484726
Log:
https://issues.apache.org/jira/browse/JS2-461
Serializer component
* completion of j2-seed.xml data (not yet integrated in build)
* updated torque schema to better name FK constraints
* turn down verbosity on ddlutils logging
Contribution from Hajo Birthelmer (hajo@bluesunrise.com)

Added:
    portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
Modified:
    portals/jetspeed-2/trunk/etc/log4j/log4j.properties
    portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
    portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml
    portals/jetspeed-2/trunk/etc/schema/registry-schema.xml
    portals/jetspeed-2/trunk/etc/schema/security-schema.xml

Modified: portals/jetspeed-2/trunk/etc/log4j/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/log4j/log4j.properties?view=diff&rev=484726&r1=484725&r2=484726
==============================================================================
--- portals/jetspeed-2/trunk/etc/log4j/log4j.properties (original)
+++ portals/jetspeed-2/trunk/etc/log4j/log4j.properties Fri Dec  8 12:05:33 2006
@@ -30,6 +30,13 @@
 log4j.category.org.apache.ojb= DEBUG, console
 log4j.additivity.org.apache.ojb= false
 
+
+#
+# ddlutils Logfile
+#
+log4j.category.org.apache.ddlutils= WARN, console
+log4j.additivity.org.apache.ddlutils= false
+
 #
 # Console
 #

Modified: portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml?view=diff&rev=484726&r1=484725&r2=484726
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml Fri Dec  8 12:05:33 2006
@@ -42,7 +42,7 @@
         <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
         <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
         <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="PARENT_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_1">
@@ -59,7 +59,7 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_METADATA_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_METADATA_1">
@@ -81,7 +81,7 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_CONSTRAINT_1">
@@ -94,7 +94,7 @@
         <column name="FOLDER_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_CONSTRAINTS_REF_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_CONSTRAINTS_REF_1">
@@ -111,7 +111,7 @@
         <column name="FOLDER_ID" type="INTEGER" required="true"/>
         <column name="SORT_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="80" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_ORDER_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_ORDER_1">
@@ -141,10 +141,10 @@
         <column name="OPTIONS_ORDER" size="255" type="VARCHAR"/>
         <column name="SKIN" size="80" type="VARCHAR"/>
         <column name="IS_NEST" type="BOOLEANINT"/>
-        <foreign-key foreignTable="FOLDER_MENU" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER_MENU" name="FK_FOLDER_MENU_1" onDelete="cascade">
             <reference foreign="MENU_ID" local="PARENT_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_MENU_2" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_MENU_1">
@@ -162,7 +162,7 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER_MENU" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER_MENU" name="FK_FOLDER_MENU_METADATA_1" onDelete="cascade">
             <reference foreign="MENU_ID" local="MENU_ID"/>
         </foreign-key>
         <index name="IX_FOLDER_MENU_METADATA_1">
@@ -201,7 +201,7 @@
         <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
         <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
         <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_PAGE_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="PARENT_ID"/>
         </foreign-key>
         <index name="IX_PAGE_1">
@@ -218,7 +218,7 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_PAGE_METADATA_1" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
         <index name="IX_PAGE_METADATA_1">
@@ -240,7 +240,7 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_PAGE_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
         <index name="IX_PAGE_CONSTRAINT_1">
@@ -253,7 +253,7 @@
         <column name="PAGE_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="PAGE" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_PAGE_CONSTRAINTS_REF_1" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
         <index name="IX_PAGE_CONSTRAINTS_REF_1">
@@ -283,10 +283,10 @@
         <column name="OPTIONS_ORDER" size="255" type="VARCHAR"/>
         <column name="SKIN" size="80" type="VARCHAR"/>
         <column name="IS_NEST" type="BOOLEANINT"/>
-        <foreign-key foreignTable="PAGE_MENU" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_MENU" name="FK_PAGE_MENU_1" onDelete="cascade">
             <reference foreign="MENU_ID" local="PARENT_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="PAGE" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="PM_M_FK_PAGE_ID_PAGE" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
         <index name="IX_PAGE_MENU_1">
@@ -304,7 +304,7 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE_MENU" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_MENU" name="FK_PAGE_MENU_METADATA_1" onDelete="cascade">
             <reference foreign="MENU_ID" local="MENU_ID"/>
         </foreign-key>
         <index name="IX_PAGE_MENU_METADATA_1">
@@ -347,10 +347,10 @@
         <column name="EXT_PROP_NAME_2" size="40" type="VARCHAR"/>
         <column name="EXT_PROP_VALUE_2" size="80" type="VARCHAR"/>
         <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="FRAGMENT" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="PARENT_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="PAGE" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_FRAGMENT_2" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
         <index name="IX_FRAGMENT_1">
@@ -369,7 +369,7 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="FRAGMENT" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
         <index name="IX_FRAGMENT_CONSTRAINT_1">
@@ -382,7 +382,7 @@
         <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="FRAGMENT" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_CONSTRAINTS_REF_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
         <index name="IX_FRAGMENT_CONSTRAINTS_REF_1">
@@ -399,7 +399,7 @@
         <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
         <column name="IS_READ_ONLY" required="true" type="BOOLEANINT"/>
-        <foreign-key foreignTable="FRAGMENT" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_PREF_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
         <index name="IX_FRAGMENT_PREF_1">
@@ -416,7 +416,7 @@
         <column name="PREF_ID" type="INTEGER" required="true"/>
         <column name="VALUE_ORDER" type="INTEGER" required="true"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="FRAGMENT_PREF" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT_PREF" name="FK_FRAGMENT_PREF_VALUE_1" onDelete="cascade">
             <reference foreign="PREF_ID" local="PREF_ID"/>
         </foreign-key>
         <index name="IX_FRAGMENT_PREF_VALUE_1">
@@ -449,7 +449,7 @@
         <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
         <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
         <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_LINK_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="PARENT_ID"/>
         </foreign-key>
         <index name="IX_LINK_1">
@@ -466,7 +466,7 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="LINK" onDelete="cascade">
+        <foreign-key foreignTable="LINK" name="FK_LINK_METADATA_1" onDelete="cascade">
             <reference foreign="LINK_ID" local="LINK_ID"/>
         </foreign-key>
         <index name="IX_LINK_METADATA_1">
@@ -488,7 +488,7 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="LINK" onDelete="cascade">
+        <foreign-key foreignTable="LINK" name="FK_LINK_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="LINK_ID" local="LINK_ID"/>
         </foreign-key>
         <index name="IX_LINK_CONSTRAINT_1">
@@ -501,7 +501,7 @@
         <column name="LINK_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="LINK" onDelete="cascade">
+        <foreign-key foreignTable="LINK" name="FK_LINK_CONSTRAINTS_REF_1" onDelete="cascade">
             <reference foreign="LINK_ID" local="LINK_ID"/>
         </foreign-key>
         <index name="IX_LINK_CONSTRAINTS_REF_1">
@@ -531,7 +531,7 @@
         <column name="LOCALE" size="20" type="VARCHAR"/>
         <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
         <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_PAGE_SECURITY_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="PARENT_ID"/>
         </foreign-key>
         <unique name="UN_PAGE_SECURITY_1">
@@ -546,7 +546,7 @@
         <column name="CONSTRAINTS_DEF_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
         <column name="NAME" required="true" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE_SECURITY" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_SECURITY" name="FK_PAGE_SEC_CONSTRAINTS_DEF_1" onDelete="cascade">
             <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
         </foreign-key>
         <index name="IX_PAGE_SEC_CONSTRAINTS_DEF_1">
@@ -566,7 +566,7 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE_SEC_CONSTRAINTS_DEF" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_SEC_CONSTRAINTS_DEF" name="FK_PAGE_SEC_CONSTRAINT_DEF_1" onDelete="cascade">
             <reference foreign="CONSTRAINTS_DEF_ID" local="CONSTRAINTS_DEF_ID"/>
         </foreign-key>
         <index name="IX_PAGE_SEC_CONSTRAINT_DEF_1">
@@ -579,7 +579,7 @@
         <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="PAGE_SECURITY" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_SECURITY"  name="FK_PAGE_SEC_CONSTRAINTS_REF_1" onDelete="cascade">
             <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
         </foreign-key>
         <index name="IX_PAGE_SEC_CONSTRAINTS_REF_1">
@@ -615,7 +615,7 @@
             <index-column name="RULE_ID" />
             <index-column name="FALLBACK_ORDER" />
         </index>
-        <foreign-key foreignTable="PROFILING_RULE" onDelete="cascade">
+        <foreign-key foreignTable="PROFILING_RULE" name="FK_RULE_CRITERION_1" onDelete="cascade">
             <reference foreign="RULE_ID" local="RULE_ID"/>
         </foreign-key>           
     </table>

Modified: portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml?view=diff&rev=484726&r1=484725&r2=484726
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml Fri Dec  8 12:05:33 2006
@@ -46,7 +46,7 @@
         <column name="FULL_PATH" size="254" type="VARCHAR"/>
         <column name="CREATION_DATE" type="TIMESTAMP"/>
         <column name="MODIFIED_DATE" type="TIMESTAMP"/>
-        <foreign-key foreignTable="PREFS_NODE">
+        <foreign-key foreignTable="PREFS_NODE" name="FK_PREFS_NODE_1">
             <reference foreign="NODE_ID" local="PARENT_NODE_ID"/>
         </foreign-key>
     </table>

Modified: portals/jetspeed-2/trunk/etc/schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/schema/registry-schema.xml?view=diff&rev=484726&r1=484725&r2=484726
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/registry-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/registry-schema.xml Fri Dec  8 12:05:33 2006
@@ -71,7 +71,7 @@
         <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
         <column name="NAME" required="true" size="100" type="VARCHAR"/>
         <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">                        
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_PA_METADATA_FIELDS_1" onDelete="cascade">                        
             <reference foreign="APPLICATION_ID" local="OBJECT_ID"/>            
         </foreign-key>        
     </table>
@@ -85,7 +85,7 @@
         <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
         <column name="NAME" required="true" size="100" type="VARCHAR"/>
         <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_DEFINITION" onDelete="cascade">                        
+        <foreign-key foreignTable="PORTLET_DEFINITION" name="FK_PD_METADATA_FIELDS_1" onDelete="cascade">                        
             <reference foreign="ID" local="OBJECT_ID"/>            
         </foreign-key>                
     </table>
@@ -175,7 +175,7 @@
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
         <column name="NAME" size="150" type="VARCHAR"/>
         <column name="NAME_LINK" size="150" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_USER_ATTRIBUTE_REF_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>                
     </table>
@@ -188,7 +188,7 @@
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
         <column name="NAME" size="150" type="VARCHAR"/>
         <column name="DESCRIPTION" size="150" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_USER_ATTRIBUTE_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>
@@ -234,7 +234,7 @@
         <column name="CUSTOM_NAME" required="true" size="150" type="VARCHAR"/>
         <column name="MAPPED_NAME" size="150" type="VARCHAR"/>
         <column name="DESCRIPTION" type="LONGVARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_CUSTOM_PORTLET_MODE_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>
@@ -248,7 +248,7 @@
         <column name="CUSTOM_NAME" required="true" size="150" type="VARCHAR"/>
         <column name="MAPPED_NAME" size="150" type="VARCHAR"/>
         <column name="DESCRIPTION" type="LONGVARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_CUSTOM_WINDOW_STATE_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>

Modified: portals/jetspeed-2/trunk/etc/schema/security-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/schema/security-schema.xml?view=diff&rev=484726&r1=484725&r2=484726
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/security-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/security-schema.xml Fri Dec  8 12:05:33 2006
@@ -59,10 +59,10 @@
     <table name="PRINCIPAL_PERMISSION">
         <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PERMISSION" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PERMISSION" name="P_PER_FK_P_ID_SEC_PER" onDelete="cascade">
             <reference foreign="PERMISSION_ID" local="PERMISSION_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="P_PER_FK_P_ID_SEC_PRI" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -86,7 +86,7 @@
         <column name="PREV_AUTH_DATE" required="false" type="TIMESTAMP"/>
         <column name="LAST_AUTH_DATE" required="false" type="TIMESTAMP"/>
         <column name="EXPIRATION_DATE" required="false" type="DATE"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SEC_CRE_FK_P_ID_SEC_PR" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -121,10 +121,10 @@
     <table name="SSO_SITE_TO_PRINCIPALS">
     	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-         <foreign-key foreignTable="SSO_SITE" onDelete="cascade">
+         <foreign-key foreignTable="SSO_SITE" name="SSO_SITE_TO_PRINCIPALS_FK_SITE_ID_SSO_SITE" onDelete="cascade">
             <reference foreign="SITE_ID" local="SITE_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="SSO_S_TO_P_FK_P_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -136,10 +136,10 @@
     <table name="SSO_PRINCIPAL_TO_REMOTE">
     	<column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-         <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+         <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SSO_P_TO_P_FK_P_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SSO_P_TO_RP_FK_RP_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -148,10 +148,10 @@
     	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
            
-         <foreign-key foreignTable="SSO_SITE" onDelete="cascade">
+         <foreign-key foreignTable="SSO_SITE"  name="SSO_S_TO_S_FK_P_ID_SEC_P" onDelete="cascade">
             <reference foreign="SITE_ID" local="SITE_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SSO_S_TO_RP_FK_RP_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -160,10 +160,10 @@
     	<column name="COOKIE_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
            
-         <foreign-key foreignTable="SSO_COOKIE" onDelete="cascade">
+         <foreign-key foreignTable="SSO_COOKIE" name="SSO_C_TO_R_FK_C_ID_SSO_C" onDelete="cascade">
             <reference foreign="COOKIE_ID" local="COOKIE_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SSO_C_TO_R_FK_R_PR_R_ID" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -174,10 +174,10 @@
     <table name="SECURITY_USER_ROLE">
         <column name="USER_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="ROLE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SEC_U_R_FK_R_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SEC_U_R_FK_U_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
         </foreign-key>
     </table>
@@ -188,10 +188,10 @@
     <table name="SECURITY_USER_GROUP">
         <column name="USER_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="GROUP_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SEC_U_G_FK_G_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="SEC_U_G_FK_U_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
         </foreign-key>
     </table>
@@ -202,10 +202,10 @@
     <table name="SECURITY_GROUP_ROLE">
         <column name="GROUP_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="ROLE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="SEC_G_R_FK_G_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="SEC_G_R_FK_R_ID_SEC_P" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
         </foreign-key>
     </table>

Added: 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=auto&rev=484726
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (added)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Fri Dec  8 12:05:33 2006
@@ -0,0 +1,692 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Snapshot name="standard-jetspeed2.xml">
+	<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"/>
+			<titel 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"/>
+			<titel 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"/>
+			<titel 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"/>
+			<titel value="XHTML"/>
+			<description value="XHTML Basic"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="xml">
+			<charcterSet value=""/>
+			<titel value="XML"/>
+			<description value="XML 1.0"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</MediaType>
+	</MediaTypes>
+	<Capabilities>
+		<Capability>HTML_3_2</Capability>
+		<Capability>HTML_4_0</Capability>
+		<Capability>HTML_ACTIVEX</Capability>
+		<Capability>HTML_CSS1</Capability>
+		<Capability>HTML_CSS2</Capability>
+		<Capability>HTML_CSSP</Capability>
+		<Capability>HTML_DOM</Capability>
+		<Capability>HTML_DOM_1</Capability>
+		<Capability>HTML_DOM_2</Capability>
+		<Capability>HTML_DOM_IE</Capability>
+		<Capability>HTML_DOM_NS4</Capability>
+		<Capability>HTML_FORM</Capability>
+		<Capability>HTML_FRAME</Capability>
+		<Capability>HTML_IFRAME</Capability>
+		<Capability>HTML_IMAGE</Capability>
+		<Capability>HTML_JAVA</Capability>
+		<Capability>HTML_JAVA1_0</Capability>
+		<Capability>HTML_JAVA1_1</Capability>
+		<Capability>HTML_JAVA1_2</Capability>
+		<Capability>HTML_JAVASCRIPT</Capability>
+		<Capability>HTML_JAVASCRIPT_1_0</Capability>
+		<Capability>HTML_JAVASCRIPT_1_1</Capability>
+		<Capability>HTML_JAVASCRIPT_1_2</Capability>
+		<Capability>HTML_JAVA_JRE</Capability>
+		<Capability>HTML_JSCRIPT</Capability>
+		<Capability>HTML_JSCRIPT1_0</Capability>
+		<Capability>HTML_JSCRIPT1_1</Capability>
+		<Capability>HTML_JSCRIPT1_2</Capability>
+		<Capability>HTML_LAYER</Capability>
+		<Capability>HTML_NESTED_TABLE</Capability>
+		<Capability>HTML_PLUGIN</Capability>
+		<Capability>HTML_TABLE</Capability>
+		<Capability>HTML_XML</Capability>
+		<Capability>HTML_XSL</Capability>
+		<Capability>HTTP_1_1</Capability>
+		<Capability>HTTP_COOKIE</Capability>
+		<Capability>WML_1_0</Capability>
+		<Capability>WML_1_1</Capability>
+		<Capability>WML_TABLE</Capability>
+		<Capability>XML_XINCLUDE</Capability>
+		<Capability>XML_XPATH</Capability>
+		<Capability>XML_XSLT</Capability>
+	</Capabilities>
+	<Clients>
+		<Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*Mac.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="safari" evalOrder="2" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mac.*Safari.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Apple"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 6.*"/>
+			<version value="6.0"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*"/>
+			<version value="5.5"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml</mimeTypes>
+		</Client>
+		<Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/4.*"/>
+			<version value="4.75"/>
+			<model value="None"/>
+			<manufacturer value="Netscape"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/5.*"/>
+			<version value="1.x"/>
+			<model value="Mozilla"/>
+			<manufacturer value="Mozilla"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xhtml,text/xml</mimeTypes>
+		</Client>
+		<Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html">
+			<userAgentPattern value="Lynx.*"/>
+			<version value=""/>
+			<model value="None"/>
+			<manufacturer value="GNU"/>
+			<capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="nokia_generic" evalOrder="8" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Nokia.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nokia"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="xhtml-basic" evalOrder="9" preferredMimeTypeID="application/xhtml+xml">
+			<userAgentPattern value="DoCoMo/2.0.*|KDDI-.*UP.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</Client>
+		<Client name="up" evalOrder="10" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="UP.*|.*UP.Browser.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="United Planet"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="sonyericsson" evalOrder="11" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Ercis.*|SonyE.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="SonyEricsson"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="wapalizer" evalOrder="12" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Wapalizer.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Wapalizer"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="klondike" evalOrder="13" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Klondike.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Klondike"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="wml_generic" evalOrder="14" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value=".*WML.*|.*WAP.*|.*Wap.*|.*wml.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="vxml_generic" evalOrder="15" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value=".*VoiceXML.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value="Nuance.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nuance"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml">
+			<userAgentPattern value="agentxml/1.0.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Unknown"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</Client>
+		<Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Opera/7.*"/>
+			<version value="7.x"/>
+			<model value="Opera7"/>
+			<manufacturer value="Opera"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+	</Clients>
+	<Roles>
+		<Role>admin</Role>
+		<Role>manager</Role>
+		<Role>user</Role>
+		<Role>guest</Role>
+		<Role>subsite</Role>
+		<Role>subsite2</Role>
+	</Roles>
+	<Groups>
+		<Group>accounting</Group>
+		<Group>engineering</Group>
+		<Group>marketing</Group>
+	</Groups>
+	<Users>
+		<User name="admin">
+			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
+			<roles>user,manager,admin</roles>
+			<groups></groups>
+			<preferences org.apache.jetspeed.prefered.locale="en,,"/>
+			<userinfo user.name.given="Test Dude" user.name.family="Dudley"/>
+			<Rules/>
+		</User>
+		<User name="manager">
+			<credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user,manager</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules/>
+		</User>
+		<User name="user">
+			<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user</roles>
+			<groups>accounting</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="menu" rule="role-group"/>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+		<User name="tomcat">
+			<credentials password="tomcat" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles></roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules/>
+		</User>
+		<User name="jetspeed">
+			<credentials password="jetspeed" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>manager</roles>
+			<groups>engineering</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="menu" rule="role-group"/>
+				<Rule locator="page" rule="role-fallback"/>
+			</Rules>
+		</User>
+		<User name="guest">
+			<Null/>
+			<roles>guest</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+		<User name="subsite">
+			<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite-role-fallback-home"/>
+			</Rules>
+		</User>
+		<User name="subsite2">
+			<credentials password="subsite2" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite2-role-fallback-home"/>
+			</Rules>
+		</User>
+	</Users>
+	<Permissions>
+		<Permission type="folder" resource="/" actions="view">
+			<roles>user,guest,subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/*" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/anotherdir/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/non-java/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/Public" actions="view, edit">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/Public/-" actions="view, edit">
+			<roles>user,guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/third-party/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/top-links/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/_user/user" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>user</users>
+		</Permission>
+		<Permission type="folder" resource="/_user/user/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>user</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root" actions="view">
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/-" actions="view">
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite2" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite2</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite2/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite2</users>
+		</Permission>
+		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view">
+			<roles>manager</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="page" resource="/default-page.psml" actions="view">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="page" resource="/rss.psml" actions="view">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="demo::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="rss::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+	</Permissions>
+	<ProfilingRules>
+		<ProfilingRule id="group-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 group-based fallback"/>
+			<Criteria>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="ip-address" standardRule="true">
+			<description value="Resolves pages based on the clients remote IP address."/>
+			<Criteria>
+				<Criterion name="ip">
+					<type value="ip"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j1" standardRule="true">
+			<description value="The default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="language">
+					<type value="language"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="country">
+					<type value="country"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j2" standardRule="true">
+			<description value="The default profiling rule for users and mediatype minus language and country."/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="path" standardRule="true">
+			<description value="use a path to locate."/>
+			<Criteria>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="/"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-group" standardRule="false">
+			<description value="A role based fallback algorithm that searches all groups and roles for a user"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="security" standardRule="true">
+			<description value="The security profiling rule needed for credential change requirements."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="hard.coded"/>
+					<value value="/my-account.psml"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite-role-fallback-home" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="subsite-default-page"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite2-role-fallback-home" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="subsite2-default-page"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-rolecombo-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="rolecombo"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+	</ProfilingRules>
+</Snapshot>



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