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 rw...@apache.org on 2005/11/08 10:09:37 UTC

svn commit: r331748 - in /portals/jetspeed-2/trunk: components/page-manager/src/java/JETSPEED-INF/ojb/ components/page-manager/src/test/org/apache/jetspeed/page/ etc/schema/ etc/sql/ etc/sql/oracle/

Author: rwatler
Date: Tue Nov  8 01:09:31 2005
New Revision: 331748

URL: http://svn.apache.org/viewcvs?rev=331748&view=rev
Log:
Shorten DDL table/column names for Oracle; remove compound keys for Page, Folder, and PageSecurity, restoring PATH as primary lookup key; comment out portions of test case to be replaced by this key modification

Modified:
    portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
    portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
    portals/jetspeed-2/trunk/etc/sql/drop.sql
    portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml?rev=331748&r1=331747&r2=331748&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml Tue Nov  8 01:09:31 2005
@@ -249,11 +249,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.folder.impl.FolderSecurityConstraint"
-      table="FOLDER_SECURITY_CONSTRAINT"
+      table="FOLDER_CNSTRNT"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINT_ID"
+         column="CNSTRNT_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -303,11 +303,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.folder.impl.FolderSecurityConstraintsRef"
-      table="FOLDER_SECURITY_CONSTRAINTS_REF"
+      table="FOLDER_CNSTRNTS_REF"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINTS_REF_ID"
+         column="CNSTRNTS_REF_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -554,11 +554,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.PageSecurityConstraint"
-      table="PAGE_SECURITY_CONSTRAINT"
+      table="PAGE_CNSTRNT"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINT_ID"
+         column="CNSTRNT_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -608,11 +608,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.PageSecurityConstraintsRef"
-      table="PAGE_SECURITY_CONSTRAINTS_REF"
+      table="PAGE_CNSTRNTS_REF"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINTS_REF_ID"
+         column="CNSTRNTS_REF_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -793,11 +793,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.FragmentSecurityConstraint"
-      table="FRAGMENT_SECURITY_CONSTRAINT"
+      table="FRAGMENT_CNSTRNT"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINT_ID"
+         column="CNSTRNT_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -847,11 +847,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.FragmentSecurityConstraintsRef"
-      table="FRAGMENT_SECURITY_CONSTRAINTS_REF"
+      table="FRAGMENT_CNSTRNTS_REF"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINTS_REF_ID"
+         column="CNSTRNTS_REF_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -881,11 +881,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.PageSecurityImpl"
-      table="PAGE_SECURITY"
+      table="PAGE_SEC"
    >
       <field-descriptor
          name="id"
-         column="PAGE_SECURITY_ID"
+         column="PAGE_SEC_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -995,11 +995,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.PageSecuritySecurityConstraintsDef"
-      table="PAGE_SECURITY_SECURITY_CONSTRAINTS_DEF"
+      table="PAGE_SEC_CNSTRNTS_DEF"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINTS_DEF_ID"
+         column="CNSTRNTS_DEF_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -1007,7 +1007,7 @@
 
       <field-descriptor
         name="pageSecurityId"
-        column="PAGE_SECURITY_ID"
+        column="PAGE_SEC_ID"
         jdbc-type="INTEGER"
         access="anonymous"
       />
@@ -1055,11 +1055,11 @@
 
    <class-descriptor
       class="org.apache.jetspeed.om.page.impl.PageSecurityGlobalSecurityConstraintsRef"
-      table="PAGE_SECURITY_GLOBAL_SECURITY_CONSTRAINTS_REF"
+      table="PAGE_SEC_CNSTRNTS_REF"
    >
       <field-descriptor
          name="id"
-         column="CONSTRAINTS_REF_ID"
+         column="CNSTRNTS_REF_ID"
          jdbc-type="INTEGER"
          primarykey="true"
          autoincrement="true"
@@ -1067,7 +1067,7 @@
 
       <field-descriptor
         name="pageSecurityId"
-        column="PAGE_SECURITY_ID"
+        column="PAGE_SEC_ID"
         jdbc-type="INTEGER"
         access="anonymous"
       />

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=331748&r1=331747&r2=331748&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java Tue Nov  8 01:09:31 2005
@@ -44,8 +44,10 @@
  */
 public class TestDatabasePageManager extends AbstractSpringTestCase
 {
+    /*
     private String testAttributesPath = "/__subsite-rootX/_user/userX/_role/roleX/_group/groupX/_mediatype/xhtml/_language/en/_country/us/_custom/customX";
     private String verifyTestAttributesPath = "/__subsite-rootx/_user/userx/_role/rolex/_group/groupx/_mediatype/xhtml/_language/en/_country/us/_custom/customx";
+    */
 
     private PageManager pageManager;
     
@@ -229,6 +231,7 @@
             {
             }
 
+            /*
             // test folder/page creation with attributes
             folder = pageManager.newFolder(testAttributesPath);
             pageManager.updateFolder(folder);
@@ -239,6 +242,7 @@
 
             assertNotNull(page.getParent());
             assertEquals(page.getParent().getId(), folder.getId());
+            */
         }
         catch (Exception e)
         {
@@ -345,6 +349,7 @@
             {
                 assertTrue("Folder / NOT FOUND", false);
             }
+            /*
             try
             {
                 Page check = pageManager.getPage(testAttributesPath + "/default-page.psml");
@@ -363,6 +368,7 @@
             {
                 assertTrue("Folder " + testAttributesPath + " NOT FOUND", false);
             }
+            */
         }
         catch (Exception e)
         {
@@ -389,6 +395,7 @@
             {
                 assertTrue("Folder / NOT FOUND", false);
             }
+            /*
             try
             {
                 Folder remove = pageManager.getFolder(testAttributesPath);
@@ -399,6 +406,7 @@
             {
                 assertTrue("Folder " + testAttributesPath + " NOT FOUND", false);
             }
+            */
 
             // reset page manager cache
             pageManager.reset();
@@ -412,6 +420,7 @@
             catch (FolderNotFoundException e)
             {
             }
+            /*
             try
             {
                 Folder check = pageManager.getFolder(testAttributesPath);
@@ -420,6 +429,7 @@
             catch (FolderNotFoundException e)
             {
             }
+            */
         }
         catch (Exception e)
         {

Modified: portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml?rev=331748&r1=331747&r2=331748&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml Tue Nov  8 01:09:31 2005
@@ -47,14 +47,6 @@
         </index>
         <unique name="UN_FOLDER_1">
             <unique-column name="PATH"/>
-            <unique-column name="SUBSITE"/>
-            <unique-column name="USER_PRINCIPAL"/>
-            <unique-column name="ROLE_PRINCIPAL"/>
-            <unique-column name="GROUP_PRINCIPAL"/>
-            <unique-column name="MEDIATYPE"/>
-            <unique-column name="LOCALE"/>
-            <unique-column name="EXT_ATTR_NAME"/>
-            <unique-column name="EXT_ATTR_VALUE"/>
         </unique>
     </table>
     
@@ -78,8 +70,8 @@
         </unique>
     </table>
 
-    <table name="FOLDER_SECURITY_CONSTRAINT">
-        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="FOLDER_CNSTRNT">
+        <column name="CNSTRNT_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="FOLDER_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
@@ -89,20 +81,20 @@
         <foreign-key foreignTable="FOLDER" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
-        <index name="IX_FOLDER_SECURITY_CONSTRAINT_1">
+        <index name="IX_FOLDER_CNSTRNT_1">
             <index-column name="FOLDER_ID"/>
         </index>
     </table>
 
-    <table name="FOLDER_SECURITY_CONSTRAINTS_REF">
-        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="FOLDER_CNSTRNTS_REF">
+        <column name="CNSTRNTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
         <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">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
-        <index name="IX_FOLDER_SECURITY_CONSTRAINTS_REF_1">
+        <index name="IX_FOLDER_CNSTRNTS_REF_1">
             <index-column name="FOLDER_ID"/>
         </index>
     </table>
@@ -139,14 +131,6 @@
         </index>
         <unique name="UN_PAGE_1">
             <unique-column name="PATH"/>
-            <unique-column name="SUBSITE"/>
-            <unique-column name="USER_PRINCIPAL"/>
-            <unique-column name="ROLE_PRINCIPAL"/>
-            <unique-column name="GROUP_PRINCIPAL"/>
-            <unique-column name="MEDIATYPE"/>
-            <unique-column name="LOCALE"/>
-            <unique-column name="EXT_ATTR_NAME"/>
-            <unique-column name="EXT_ATTR_VALUE"/>
         </unique>
     </table>
     
@@ -170,8 +154,8 @@
         </unique>
     </table>
 
-    <table name="PAGE_SECURITY_CONSTRAINT">
-        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="PAGE_CNSTRNT">
+        <column name="CNSTRNT_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PAGE_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
@@ -181,20 +165,20 @@
         <foreign-key foreignTable="PAGE" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SECURITY_CONSTRAINT_1">
+        <index name="IX_PAGE_CNSTRNT_1">
             <index-column name="PAGE_ID"/>
         </index>
     </table>
 
-    <table name="PAGE_SECURITY_CONSTRAINTS_REF">
-        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="PAGE_CNSTRNTS_REF">
+        <column name="CNSTRNTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
         <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">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SECURITY_CONSTRAINTS_REF_1">
+        <index name="IX_PAGE_CNSTRNTS_REF_1">
             <index-column name="PAGE_ID"/>
         </index>
     </table>
@@ -236,8 +220,8 @@
         </unique>
     </table>
 
-    <table name="FRAGMENT_SECURITY_CONSTRAINT">
-        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="FRAGMENT_CNSTRNT">
+        <column name="CNSTRNT_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
@@ -247,20 +231,20 @@
         <foreign-key foreignTable="FRAGMENT" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
-        <index name="IX_FRAGMENT_SECURITY_CONSTRAINT_1">
+        <index name="IX_FRAGMENT_CNSTRNT_1">
             <index-column name="FRAGMENT_ID"/>
         </index>
     </table>
 
-    <table name="FRAGMENT_SECURITY_CONSTRAINTS_REF">
-        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="FRAGMENT_CNSTRNTS_REF">
+        <column name="CNSTRNTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
         <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">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
-        <index name="IX_FRAGMENT_SECURITY_CONSTRAINTS_REF_1">
+        <index name="IX_FRAGMENT_CNSTRNTS_REF_1">
             <index-column name="FRAGMENT_ID"/>
         </index>
     </table>
@@ -269,8 +253,8 @@
        Page Security Definition
     -->
 
-    <table name="PAGE_SECURITY">
-        <column name="PAGE_SECURITY_ID" primaryKey="true" required="true" type="INTEGER"/>
+    <table name="PAGE_SEC">
+        <column name="PAGE_SEC_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PARENT_ID" type="INTEGER" required="true"/>
         <column name="PATH" required="true" size="160" type="VARCHAR"/>
         <column name="NAME" required="true" size="80" type="VARCHAR"/>
@@ -285,49 +269,41 @@
         <foreign-key foreignTable="FOLDER" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="PARENT_ID"/>
         </foreign-key>
-        <unique name="UN_PAGE_SECURITY_1">
+        <unique name="UN_PAGE_SEC_1">
             <unique-column name="PARENT_ID"/>
         </unique>
-        <unique name="UN_PAGE_SECURITY_2">
+        <unique name="UN_PAGE_SEC_2">
             <unique-column name="PATH"/>
-            <unique-column name="SUBSITE"/>
-            <unique-column name="USER_PRINCIPAL"/>
-            <unique-column name="ROLE_PRINCIPAL"/>
-            <unique-column name="GROUP_PRINCIPAL"/>
-            <unique-column name="MEDIATYPE"/>
-            <unique-column name="LOCALE"/>
-            <unique-column name="EXT_ATTR_NAME"/>
-            <unique-column name="EXT_ATTR_VALUE"/>
         </unique>
     </table>
     
-    <table name="PAGE_SECURITY_SECURITY_CONSTRAINTS_DEF">
-        <column name="CONSTRAINTS_DEF_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
+    <table name="PAGE_SEC_CNSTRNTS_DEF">
+        <column name="CNSTRNTS_DEF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_SEC_ID" type="INTEGER" required="true"/>
         <column name="NAME" required="true" size="40" type="VARCHAR"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <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_SECURITY" onDelete="cascade">
-            <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
+        <foreign-key foreignTable="PAGE_SEC" onDelete="cascade">
+            <reference foreign="PAGE_SEC_ID" local="PAGE_SEC_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SECURITY_SECURITY_CONSTRAINTS_DEF_1">
-            <index-column name="PAGE_SECURITY_ID"/>
+        <index name="IX_PAGE_SEC_CNSTRNTS_DEF_1">
+            <index-column name="PAGE_SEC_ID"/>
         </index>
     </table>
 
-    <table name="PAGE_SECURITY_GLOBAL_SECURITY_CONSTRAINTS_REF">
-        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
+    <table name="PAGE_SEC_CNSTRNTS_REF">
+        <column name="CNSTRNTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_SEC_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">
-            <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
+        <foreign-key foreignTable="PAGE_SEC" onDelete="cascade">
+            <reference foreign="PAGE_SEC_ID" local="PAGE_SEC_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SECURITY_GLOBAL_SECURITY_CONSTRAINTS_REF_1">
-            <index-column name="PAGE_SECURITY_ID"/>
+        <index name="IX_PAGE_SEC_CNSTRNTS_REF_1">
+            <index-column name="PAGE_SEC_ID"/>
         </index>
     </table>
 

Modified: portals/jetspeed-2/trunk/etc/sql/drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/drop.sql?rev=331748&r1=331747&r2=331748&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/drop.sql Tue Nov  8 01:09:31 2005
@@ -16,18 +16,18 @@
 DROP TABLE MEDIATYPE_TO_CAPABILITY;
 DROP TABLE MEDIATYPE_TO_MIMETYPE;
 
-DROP TABLE PAGE_SECURITY_GLOBAL_SECURITY_CONSTRAINTS_REF;
-DROP TABLE PAGE_SECURITY_SECURITY_CONSTRAINTS_DEF;
-DROP TABLE PAGE_SECURITY;
-DROP TABLE FRAGMENT_SECURITY_CONSTRAINTS_REF;
-DROP TABLE FRAGMENT_SECURITY_CONSTRAINT;
+DROP TABLE PAGE_SEC_CNSTRNTS_REF;
+DROP TABLE PAGE_SEC_CNSTRNTS_DEF;
+DROP TABLE PAGE_SEC;
+DROP TABLE FRAGMENT_CNSTRNTS_REF;
+DROP TABLE FRAGMENT_CNSTRNT;
 DROP TABLE FRAGMENT;
-DROP TABLE PAGE_SECURITY_CONSTRAINTS_REF;
-DROP TABLE PAGE_SECURITY_CONSTRAINT;
+DROP TABLE PAGE_CNSTRNTS_REF;
+DROP TABLE PAGE_CNSTRNT;
 DROP TABLE PAGE_METADATA;
 DROP TABLE PAGE;
-DROP TABLE FOLDER_SECURITY_CONSTRAINTS_REF;
-DROP TABLE FOLDER_SECURITY_CONSTRAINT;
+DROP TABLE FOLDER_CNSTRNTS_REF;
+DROP TABLE FOLDER_CNSTRNT;
 DROP TABLE FOLDER_METADATA;
 DROP TABLE FOLDER;
 

Modified: portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql?rev=331748&r1=331747&r2=331748&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql Tue Nov  8 01:09:31 2005
@@ -21,18 +21,18 @@
 DROP TABLE MEDIATYPE_TO_CAPABILITY;
 DROP TABLE MEDIATYPE_TO_MIMETYPE;
 
-DROP TABLE PAGE_SECURITY_GLOBAL_SECURITY_CONSTRAINTS_REF;
-DROP TABLE PAGE_SECURITY_SECURITY_CONSTRAINTS_DEF;
-DROP TABLE PAGE_SECURITY;
-DROP TABLE FRAGMENT_SECURITY_CONSTRAINTS_REF;
-DROP TABLE FRAGMENT_SECURITY_CONSTRAINT;
+DROP TABLE PAGE_SEC_CNSTRNTS_REF;
+DROP TABLE PAGE_SEC_CNSTRNTS_DEF;
+DROP TABLE PAGE_SEC;
+DROP TABLE FRAGMENT_CNSTRNTS_REF;
+DROP TABLE FRAGMENT_CNSTRNT;
 DROP TABLE FRAGMENT;
-DROP TABLE PAGE_SECURITY_CONSTRAINTS_REF;
-DROP TABLE PAGE_SECURITY_CONSTRAINT;
+DROP TABLE PAGE_CNSTRNTS_REF;
+DROP TABLE PAGE_CNSTRNT;
 DROP TABLE PAGE_METADATA;
 DROP TABLE PAGE;
-DROP TABLE FOLDER_SECURITY_CONSTRAINTS_REF;
-DROP TABLE FOLDER_SECURITY_CONSTRAINT;
+DROP TABLE FOLDER_CNSTRNTS_REF;
+DROP TABLE FOLDER_CNSTRNT;
 DROP TABLE FOLDER_METADATA;
 DROP TABLE FOLDER;
 



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