portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r709083 [2/2] - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ ...
Date Thu, 30 Oct 2008 03:58:29 GMT
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml?rev=709083&r1=709082&r2=709083&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
Wed Oct 29 20:58:27 2008
@@ -27,16 +27,10 @@
         <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"/>
         <column name="SECURITY_REF" size="40" type="VARCHAR"/>        
-        <!-- This breaks some tests since portlet identifier is not required
-        <unique name="UK_PORTLET_IDENT">
-            <unique-column name="PORTLET_IDENTIFIER"/>
-        </unique>
-        -->
     </table>
 
     <!--
@@ -45,12 +39,11 @@
     <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="CONTEXT_ROOT" required="true" size="255" type="VARCHAR"/>
+        <column name="REVISION" required="true" type="INTEGER"/>
         <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"/>
         <column name="SECURITY_REF" size="40" type="VARCHAR"/>
         <unique name="UK_APPLICATION">
             <unique-column name="APP_NAME"/>
@@ -58,14 +51,6 @@
     </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
     -->    
     <table name="PA_METADATA_FIELDS">
@@ -122,13 +107,11 @@
     
     <!--
        Create Parameter Table
-       NOTE : This table supports both Servlet and Portlet parameters
-       Class Name is required to decide if this is a portlet or servlet parameter
     -->
     <table name="PARAMETER">
         <column name="PARAMETER_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PARENT_ID" required="true" type="INTEGER"/>
-        <column name="CLASS_NAME" required="true" size="255" type="VARCHAR"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="OWNER_CLASS_NAME" required="true" size="255" type="VARCHAR"/>
         <column name="NAME" required="true" size="80" type="VARCHAR"/>
         <column name="PARAMETER_VALUE" required="false" type="LONGVARCHAR"/>
     </table>
@@ -203,12 +186,10 @@
     -->                                                                     
     <table name="SECURITY_ROLE">                                            
         <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="WEB_APPLICATION_ID" required="true" type="INTEGER"/>  
-        <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" onDelete="cascade">           
            
-            <reference foreign="ID" local="WEB_APPLICATION_ID"/>            
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>  
+        <column name="NAME" required="true" size="150" type="VARCHAR"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_SECURITY_ROLE_REF_1"
onDelete="cascade">                        
+            <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>          
 
         </foreign-key>
         -->                                                   
     </table> 
@@ -233,7 +214,6 @@
         <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
         <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" name="FK_USER_ATTRIBUTE_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
@@ -254,8 +234,8 @@
     -->
     <table name="LOCALIZED_DESCRIPTION">
         <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="OBJECT_ID" required="true" type="INTEGER"/>
-        <column name="CLASS_NAME" required="true" size="255" type="VARCHAR"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="OWNER_CLASS_NAME" required="true" size="255" type="VARCHAR"/>
         <column name="DESCRIPTION" required="true" type="LONGVARCHAR"/>
         <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
     </table>
@@ -265,8 +245,8 @@
     -->
     <table name="LOCALIZED_DISPLAY_NAME">
         <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="OBJECT_ID" required="true" type="INTEGER"/>
-        <column name="CLASS_NAME" size="255" type="VARCHAR"/>
+        <column name="OWNER_ID" required="true" type="INTEGER"/>
+        <column name="OWNER_CLASS_NAME" size="255" type="VARCHAR"/>
         <column name="DISPLAY_NAME" required="true" type="LONGVARCHAR"/>
         <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
     </table>
@@ -279,7 +259,6 @@
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
         <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" name="FK_CUSTOM_PORTLET_MODE_1"
onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
@@ -293,7 +272,6 @@
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
         <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" name="FK_CUSTOM_WINDOW_STATE_1"
onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        



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