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 2004/12/03 23:00:23 UTC

cvs commit: jakarta-jetspeed-2/src/schema security-schema.xml registry-schema.xml phase2-schema.xml

taylor      2004/12/03 14:00:23

  Modified:    src/schema security-schema.xml registry-schema.xml
                        phase2-schema.xml
  Added:       src/sql/mysql drop.sql
               src/sql/oracle drop.sql
  Log:
  - added schema support for MySQL 4 InnoDB
  - added drop.sql for Oracle to match current dbs
  
  Revision  Changes    Path
  1.1                  jakarta-jetspeed-2/src/sql/mysql/drop.sql
  
  Index: drop.sql
  ===================================================================
  drop table if exists RULE_CRITERION;
  drop table if exists PRINCIPAL_PERMISSION;
  drop table if exists PA_METADATA_FIELDS;
  drop table if exists PD_METADATA_FIELDS;
  drop table if exists USER_ATTRIBUTE_REF;
  drop table if exists USER_ATTRIBUTE;
  drop table if exists SECURITY_CREDENTIAL;
  drop table if exists SSO_SITE_TO_PRINCIPALS;
  drop table if exists SSO_PRINCIPAL_TO_REMOTE_PRINCIPAL;
  drop table if exists SECURITY_USER_ROLE;
  drop table if exists SECURITY_USER_GROUP;
  drop table if exists SECURITY_GROUP_ROLE;
  
  
  1.1                  jakarta-jetspeed-2/src/sql/oracle/drop.sql
  
  Index: drop.sql
  ===================================================================
  drop table A;
  drop table B;
  
  drop table OJB_HL_SEQ;
  drop table OJB_LOCKENTRY;
  drop table OJB_NRM;
  drop table OJB_DLIST;
  drop table OJB_DLIST_ENTRIES;
  drop table OJB_DSET;
  drop table OJB_DSET_ENTRIES;
  drop table OJB_DMAP;
  
  
  DROP TABLE CAPABILITY;
  DROP TABLE MIMETYPE;
  DROP TABLE CLIENT;
  DROP TABLE MEDIA_TYPE;
  
  DROP TABLE CLIENT_TO_CAPABILITY;
  DROP TABLE CLIENT_TO_MIMETYPE;
  DROP TABLE MEDIATYPE_TO_CAPABILITY;
  DROP TABLE MEDIATYPE_TO_MIMETYPE;
  
  DROP TABLE SUB_PAGES;
  DROP TABLE PAGE;
  DROP TABLE FRAGMENT;
  DROP TABLE PAGE_FRAGMENTS;
  DROP TABLE SUB_FRAGMENTS;
  DROP TABLE FRAGMENT_PARAMETER;
  DROP TABLE FRAGMENT_REF;
  DROP TABLE FRAGMENT_REFS;
  DROP TABLE RULE_CRITERION;
  DROP TABLE PRINCIPAL_RULE_ASSOC;
  DROP TABLE PROFILE_PAGE_ASSOC;
  DROP TABLE PROFILING_RULE;
  
  -----------------------------------------------------------------------------
  -- drop preferences schema
  -----------------------------------------------------------------------------
  drop table PREFS_PROPERTY_VALUE;
  drop table PREFS_NODE_PROPERTY_KEY;
  drop table PREFS_PROPERTY_KEY;
  drop table PREFS_NODE;
  
  DROP TABLE PA_METADATA_FIELDS;
  DROP TABLE PD_METADATA_FIELDS;
  DROP TABLE LANGUAGE; 
  DROP TABLE PORTLET_CONTENT_TYPE; 
  DROP TABLE PARAMETER; 
  DROP TABLE PREFERENCE_VALUE; 
  DROP TABLE PORTLET_PREFERENCE; 
  DROP TABLE PORTLET_ENTITY; 
  DROP TABLE SECURITY_ROLE_REFERENCE;
  DROP TABLE SECURITY_ROLE;
  DROP TABLE USER_ATTRIBUTE_REF;
  DROP TABLE USER_ATTRIBUTE;
  DROP TABLE JETSPEED_SERVICE;
  
  DROP TABLE LOCALIZED_DESCRIPTION; 
  DROP TABLE LOCALIZED_DISPLAY_NAME; 
  
  DROP TABLE WEB_APPLICATION; 
  DROP TABLE PORTLET_DEFINITION; 
  DROP TABLE PORTLET_APPLICATION; 
  
  drop table  PRINCIPAL_PERMISSION;
  DROP TABLE SECURITY_CREDENTIAL;
  drop table   SSO_SITE_TO_PRINCIPALS;
  drop table   SSO_PRINCIPAL_TO_REMOTE;
  DROP TABLE SECURITY_USER_ROLE;
  DROP TABLE SECURITY_USER_GROUP;
  DROP TABLE SECURITY_GROUP_ROLE;
  
  
  drop table  SSO_SITE;
  drop table  SECURITY_PERMISSION;
  drop table  SECURITY_PRINCIPAL;
  
  
  
  
  1.11      +88 -86    jakarta-jetspeed-2/src/schema/security-schema.xml
  
  Index: security-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/src/schema/security-schema.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- security-schema.xml	30 Nov 2004 18:14:31 -0000	1.10
  +++ security-schema.xml	3 Dec 2004 22:00:22 -0000	1.11
  @@ -25,33 +25,70 @@
       <!--
          Create Site to Principals association Table
       -->
  +    <!--
  +       Create Security Principal Table
  +    -->
  +    <table name="SECURITY_PRINCIPAL">
  +        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
  +        <column name="IS_MAPPING_ONLY" required="true" type="BIT"/>
  +        <column name="IS_ENABLED" required="true" type="BIT"/>
  +        <column name="FULL_PATH" required="true" size="254" type="VARCHAR"/>
  +        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
  +        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
  +    </table>
  +
  +    <!--
  +       Create Security Permission Table
  +    -->
  +    <table name="SECURITY_PERMISSION">
  +        <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
  +        <column name="NAME" required="true" size="254" type="VARCHAR"/>
  +        <column name="ACTIONS" required="true" size="254" type="VARCHAR"/>
  +        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
  +        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
  +    </table>
       
  -    <table name="SSO_SITE_TO_PRINCIPALS">
  -    	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
  +    <!--
  +       Create Security Principal Permission Table
  +    -->
  +    <table name="PRINCIPAL_PERMISSION">
           <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
  -         <foreign-key foreignTable="SSO_SITE">
  -            <reference foreign="SITE_ID" local="SITE_ID"/>
  +        <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <foreign-key foreignTable="SECURITY_PERMISSION" onDelete="cascade">
  +            <reference foreign="PERMISSION_ID" local="PERMISSION_ID"/>
           </foreign-key>
  -       <foreign-key foreignTable="SECURITY_PRINCIPAL">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
           </foreign-key>
       </table>
  -    
  +        
       <!--
  -       Create Principals to Remote Principals association Table
  +       Create Security Credential Table
       -->
  -    
  -    <table name="SSO_PRINCIPAL_TO_REMOTE_PRINCIPAL">
  -    	<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">
  +    <table name="SECURITY_CREDENTIAL">
  +        <column name="CREDENTIAL_ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="PRINCIPAL_ID" required="true" type="INTEGER"/>
  +        <column name="VALUE" required="true" size="254" type="VARCHAR"/>
  +        <column name="TYPE" required="true" type="SMALLINT"/>
  +        <column name="CLASSNAME" size="254" type="VARCHAR"/>
  +        <column name="UPDATE_REQUIRED" required="true" type="BIT"/>
  +        <column name="IS_ENCODED" required="true" type="BIT"/>
  +        <column name="IS_ENABLED" required="true" type="BIT"/>
  +        <column name="AUTH_FAILURES" required="true" type="SMALLINT"/>
  +        <column name="IS_EXPIRED" required="true" type="BIT"/>
  +        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
  +        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
  +        <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">
               <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
           </foreign-key>
  -       <foreign-key foreignTable="SECURITY_PRINCIPAL">
  -            <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
  -        </foreign-key>
       </table>
  -    
  +	
  +
       <!--
          Create SiteTable
       -->
  @@ -62,17 +99,44 @@
           <column name="ALLOW_USER_SET" default="0" type="BIT"/>
           <column name="REQUIRES_CERTIFICATE" default="0" type="BIT"/>
       </table>
  -     
  +	
  +	
  +    <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">
  +            <reference foreign="SITE_ID" local="SITE_ID"/>
  +        </foreign-key>
  +       <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
  +            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
  +        </foreign-key>
  +    </table>
  +    
  +    <!--
  +       Create Principals to Remote Principals association Table
  +    -->
  +    
  +    <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">
  +            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
  +        </foreign-key>
  +       <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
  +            <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
  +        </foreign-key>
  +    </table>
  +         
       <!--
          Create Security User Role Table
       -->
       <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">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
           </foreign-key>
  -        <foreign-key foreignTable="SECURITY_PRINCIPAL">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
           </foreign-key>
       </table>
  @@ -83,10 +147,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">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
           </foreign-key>
  -        <foreign-key foreignTable="SECURITY_PRINCIPAL">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
           </foreign-key>
       </table>
  @@ -97,76 +161,14 @@
       <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">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
           </foreign-key>
  -        <foreign-key foreignTable="SECURITY_PRINCIPAL">
  +        <foreign-key foreignTable="SECURITY_PRINCIPAL" onDelete="cascade">
               <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
           </foreign-key>
       </table>
   
  -    <!--
  -       Create Security Principal Permission Table
  -    -->
  -    <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">
  -            <reference foreign="PERMISSION_ID" local="PERMISSION_ID"/>
  -        </foreign-key>
  -        <foreign-key foreignTable="SECURITY_PRINCIPAL">
  -            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
  -        </foreign-key>
  -    </table>
  -    
  -    <!--
  -       Create Security Permission Table
  -    -->
  -    <table name="SECURITY_PERMISSION">
  -        <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
  -        <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
  -        <column name="NAME" required="true" size="254" type="VARCHAR"/>
  -        <column name="ACTIONS" required="true" size="254" type="VARCHAR"/>
  -        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
  -        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
  -    </table>
  -    
  -    <!--
  -       Create Security Credential Table
  -    -->
  -    <table name="SECURITY_CREDENTIAL">
  -        <column name="CREDENTIAL_ID" primaryKey="true" required="true" type="INTEGER"/>
  -        <column name="PRINCIPAL_ID" required="true" type="INTEGER"/>
  -        <column name="VALUE" required="true" size="254" type="VARCHAR"/>
  -        <column name="TYPE" required="true" type="SMALLINT"/>
  -        <column name="CLASSNAME" size="254" type="VARCHAR"/>
  -        <column name="UPDATE_REQUIRED" required="true" type="BIT"/>
  -        <column name="IS_ENCODED" required="true" type="BIT"/>
  -        <column name="IS_ENABLED" required="true" type="BIT"/>
  -        <column name="AUTH_FAILURES" required="true" type="SMALLINT"/>
  -        <column name="IS_EXPIRED" required="true" type="BIT"/>
  -        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
  -        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
  -        <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">
  -            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
  -        </foreign-key>
  -    </table>
  -    
  -    <!--
  -       Create Security Principal Table
  -    -->
  -    <table name="SECURITY_PRINCIPAL">
  -        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
  -        <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
  -        <column name="IS_MAPPING_ONLY" required="true" type="BIT"/>
  -        <column name="IS_ENABLED" required="true" type="BIT"/>
  -        <column name="FULL_PATH" required="true" size="254" type="VARCHAR"/>
  -        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
  -        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
  -    </table>
  -    
  +        
       
   </database>
  
  
  
  1.24      +48 -48    jakarta-jetspeed-2/src/schema/registry-schema.xml
  
  Index: registry-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/src/schema/registry-schema.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- registry-schema.xml	1 Oct 2004 22:46:03 -0000	1.23
  +++ registry-schema.xml	3 Dec 2004 22:00:22 -0000	1.24
  @@ -18,6 +18,49 @@
   <!-- Autogenerated by JDBCToXMLSchema! -->
   <database>
   
  +    <!--
  +       Create Portlet Definition Table
  +    -->
  +    <table name="PORTLET_DEFINITION">
  +        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="NAME" size="80" type="VARCHAR"/>
  +        <column name="CLASS_NAME" size="255" type="VARCHAR"/>
  +        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
  +        <column name="PORTLET_IDENTIFIER" size="80" type="VARCHAR"/>
  +        <column name="EXPIRATION_CACHE" size="30" type="VARCHAR"/>
  +        <column name="RESOURCE_BUNDLE" size="255" type="VARCHAR"/>
  +        <column name="PREFERENCE_VALIDATOR" size="255" type="VARCHAR"/>
  +        <!-- This breaks some tests since portlet identifier is not required
  +        <unique name="UK_PORTLET_IDENT">
  +            <unique-column name="PORTLET_IDENTIFIER"/>
  +        </unique>
  +        -->
  +    </table>
  +
  +    <!--
  +       Create Portlet Application Table
  +    -->
  +    <table name="PORTLET_APPLICATION">
  +        <column name="APPLICATION_ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="APP_NAME" required="true" size="80" type="VARCHAR"/>
  +        <column name="APP_IDENTIFIER" size="80" type="VARCHAR"/>
  +        <column name="VERSION" size="80" type="VARCHAR"/>
  +        <column name="APP_TYPE" type="INTEGER"/>
  +		<column name="CHECKSUM" size="80" type="VARCHAR"/>
  +        <column name="DESCRIPTION" size="80" type="VARCHAR"/>
  +        <column name="WEB_APP_ID" required="true" type="INTEGER"/>
  +        <unique name="UK_APPLICATION">
  +            <unique-column name="APP_NAME"/>
  +        </unique>
  +    </table>                                                               
  +
  +    <!--
  +       Create Web Application Table
  +    -->
  +    <table name="WEB_APPLICATION">
  +        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
  +        <column name="CONTEXT_ROOT" required="true" size="255" type="VARCHAR"/>
  +    </table>
       
       <!--
          Create Portlet Application Metadata Fields Table
  @@ -28,7 +71,7 @@
           <column name="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">                        
  +        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">                        
               <reference foreign="APPLICATION_ID" local="OBJECT_ID"/>            
           </foreign-key>        
       </table>
  @@ -42,7 +85,7 @@
           <column name="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">                        
  +        <foreign-key foreignTable="PORTLET_DEFINITION" onDelete="cascade">                        
               <reference foreign="ID" local="OBJECT_ID"/>            
           </foreign-key>                
       </table>
  @@ -136,7 +179,7 @@
           <column name="ROLE_NAME" required="true" size="150" type="VARCHAR"/>
           <column name="DESCRIPTION" size="150" type="VARCHAR"/>              
           <!-- This is causing removing portlet application to fail with OJB RC4.
  -        <foreign-key foreignTable="WEB_APPLICATION">                        
  +        <foreign-key foreignTable="WEB_APPLICATION" onDelete="cascade">                        
               <reference foreign="ID" local="WEB_APPLICATION_ID"/>            
           </foreign-key>
           -->                                                   
  @@ -150,7 +193,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">
  +        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">
               <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
           </foreign-key>                
       </table>
  @@ -163,7 +206,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">
  +        <foreign-key foreignTable="PORTLET_APPLICATION" onDelete="cascade">
               <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
           </foreign-key>        
       </table>
  @@ -200,48 +243,5 @@
           <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
       </table>
       
  -    <!--
  -       Create Portlet Definition Table
  -    -->
  -    <table name="PORTLET_DEFINITION">
  -        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
  -        <column name="NAME" size="80" type="VARCHAR"/>
  -        <column name="CLASS_NAME" size="255" type="VARCHAR"/>
  -        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
  -        <column name="PORTLET_IDENTIFIER" size="80" type="VARCHAR"/>
  -        <column name="EXPIRATION_CACHE" size="30" type="VARCHAR"/>
  -        <column name="RESOURCE_BUNDLE" size="255" type="VARCHAR"/>
  -        <column name="PREFERENCE_VALIDATOR" size="255" type="VARCHAR"/>
  -        <!-- This breaks some tests since portlet identifier is not required
  -        <unique name="UK_PORTLET_IDENT">
  -            <unique-column name="PORTLET_IDENTIFIER"/>
  -        </unique>
  -        -->
  -    </table>
  -
  -    <!--
  -       Create Portlet Application Table
  -    -->
  -    <table name="PORTLET_APPLICATION">
  -        <column name="APPLICATION_ID" primaryKey="true" required="true" type="INTEGER"/>
  -        <column name="APP_NAME" required="true" size="80" type="VARCHAR"/>
  -        <column name="APP_IDENTIFIER" size="80" type="VARCHAR"/>
  -        <column name="VERSION" size="80" type="VARCHAR"/>
  -        <column name="APP_TYPE" type="INTEGER"/>
  -		<column name="CHECKSUM" size="80" type="VARCHAR"/>
  -        <column name="DESCRIPTION" size="80" type="VARCHAR"/>
  -        <column name="WEB_APP_ID" required="true" type="INTEGER"/>
  -        <unique name="UK_APPLICATION">
  -            <unique-column name="APP_NAME"/>
  -        </unique>
  -    </table>                                                               
  -
  -    <!--
  -       Create Web Application Table
  -    -->
  -    <table name="WEB_APPLICATION">
  -        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
  -        <column name="CONTEXT_ROOT" required="true" size="255" type="VARCHAR"/>
  -    </table>
                            
   </database>
  
  
  
  1.8       +9 -9      jakarta-jetspeed-2/src/schema/phase2-schema.xml
  
  Index: phase2-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/src/schema/phase2-schema.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- phase2-schema.xml	23 Oct 2004 19:50:53 -0000	1.7
  +++ phase2-schema.xml	3 Dec 2004 22:00:23 -0000	1.8
  @@ -107,6 +107,13 @@
          Profiler
       -->
   
  +    <table name="PROFILING_RULE">
  +        <column name="RULE_ID" primaryKey="true" required="true"
  +            size="80" type="VARCHAR"/>
  +        <column name="CLASS_NAME" required="true" size="100" type="VARCHAR"/>
  +        <column name="TITLE" size="100" type="VARCHAR"/>
  +    </table>
  +
       <table name="RULE_CRITERION">
           <column name="CRITERION_ID" primaryKey="true" required="true"
               size="80" type="VARCHAR"/>
  @@ -120,18 +127,11 @@
               <index-column name="RULE_ID" />
               <index-column name="FALLBACK_ORDER" />
           </index>
  -        <foreign-key foreignTable="PROFILING_RULE">
  +        <foreign-key foreignTable="PROFILING_RULE" onDelete="cascade">
               <reference foreign="RULE_ID" local="RULE_ID"/>
           </foreign-key>           
       </table>
  -    
  -    <table name="PROFILING_RULE">
  -        <column name="RULE_ID" primaryKey="true" required="true"
  -            size="80" type="VARCHAR"/>
  -        <column name="CLASS_NAME" required="true" size="100" type="VARCHAR"/>
  -        <column name="TITLE" size="100" type="VARCHAR"/>
  -    </table>
  -      
  +          
       <table name="PRINCIPAL_RULE_ASSOC">
           <column name="PRINCIPAL_NAME" primaryKey="true" required="true" size="80" type="VARCHAR"/>
           <column name="LOCATOR_NAME" primaryKey="true" required="true" size="80" type="VARCHAR"/>
  
  
  

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