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 dl...@apache.org on 2005/09/11 17:07:17 UTC

svn commit: r280144 - in /portals/jetspeed-2/trunk: etc/schema/registry-schema.xml etc/sql/drop.sql etc/sql/hsql/registry-drop.sql etc/sql/oracle/drop.sql maven-plugin/plugin.jelly

Author: dlestrat
Date: Sun Sep 11 08:07:13 2005
New Revision: 280144

URL: http://svn.apache.org/viewcvs?rev=280144&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-318#action_12323130

Modified:
    portals/jetspeed-2/trunk/etc/schema/registry-schema.xml
    portals/jetspeed-2/trunk/etc/sql/drop.sql
    portals/jetspeed-2/trunk/etc/sql/hsql/registry-drop.sql
    portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly

Modified: portals/jetspeed-2/trunk/etc/schema/registry-schema.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/schema/registry-schema.xml?rev=280144&r1=280143&r2=280144&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/registry-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/registry-schema.xml Sun Sep 11 08:07:13 2005
@@ -124,24 +124,6 @@
         <column name="NAME" required="true" size="80" type="VARCHAR"/>
         <column name="PARAMETER_VALUE" required="true" type="LONGVARCHAR"/>
     </table>
-    
-    <!--
-      Preference and Preference Values
-    -->
-    
-    <table name="PREFERENCE_VALUE">
-        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PREFERENCE_ID" type="INTEGER"/>
-        <column name="VALUE" type="LONGVARCHAR"/>
-    </table>
-    
-    <table name="PORTLET_PREFERENCE">
-        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="PARENT_ID" required="true" type="INTEGER"/>
-        <column name="NAME" required="true" size="80" type="VARCHAR"/>
-        <column name="CLASS_NAME" required="true" size="255" type="VARCHAR"/>
-        <column default="1" name="READ_ONLY" size="1" type="CHAR"/>
-    </table>
 
     <!--
        Portlet Entity

Modified: portals/jetspeed-2/trunk/etc/sql/drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/drop.sql?rev=280144&r1=280143&r2=280144&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/drop.sql Sun Sep 11 08:07:13 2005
@@ -35,9 +35,7 @@
 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 PARAMETER;
 DROP TABLE PORTLET_ENTITY; 
 DROP TABLE SECURITY_ROLE_REFERENCE;
 DROP TABLE SECURITY_ROLE;

Modified: portals/jetspeed-2/trunk/etc/sql/hsql/registry-drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/hsql/registry-drop.sql?rev=280144&r1=280143&r2=280144&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/hsql/registry-drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/hsql/registry-drop.sql Sun Sep 11 08:07:13 2005
@@ -21,9 +21,7 @@
 DROP TABLE LANGUAGE IF EXISTS; 
 DROP TABLE PORTLET_DEFINITION IF EXISTS; 
 DROP TABLE WEB_APPLICATION IF EXISTS; 
-DROP TABLE PORTLET_APPLICATION IF EXISTS; 
-DROP TABLE PORTLET_PREFERENCE IF EXISTS; 
-DROP TABLE PREFERENCE_VALUE IF EXISTS; 
+DROP TABLE PORTLET_APPLICATION IF EXISTS;
 DROP TABLE USER_PREFERENCE_VALUE IF EXISTS; 
 DROP TABLE PORTLET_ENTITY IF EXISTS; 
 DROP TABLE LOCALIZED_DESCRIPTION IF EXISTS; 

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=280144&r1=280143&r2=280144&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql Sun Sep 11 08:07:13 2005
@@ -47,8 +47,6 @@
 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;
@@ -63,17 +61,17 @@
 DROP TABLE PORTLET_DEFINITION; 
 DROP TABLE PORTLET_APPLICATION; 
 
-drop table  PRINCIPAL_PERMISSION;
+drop table PRINCIPAL_PERMISSION;
 DROP TABLE SECURITY_CREDENTIAL;
-drop table   SSO_SITE_TO_PRINCIPALS;
-drop table   SSO_PRINCIPAL_TO_REMOTE;
-drop table   SSO_SITE_TO_REMOTE;
+drop table SSO_SITE_TO_PRINCIPALS;
+drop table SSO_PRINCIPAL_TO_REMOTE;
+drop table SSO_SITE_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;
+drop table SSO_SITE;
+drop table SECURITY_PERMISSION;
+drop table SECURITY_PRINCIPAL;
 

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=280144&r1=280143&r2=280144&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Sun Sep 11 08:07:13 2005
@@ -694,6 +694,10 @@
         <j:set var="org.apache.jetspeed.target.rdbms.name" value="postgresql"/>
         <j:set var="org.apache.jetspeed.target.rdbms.dropdrops" value="true"/>
       </j:when>
+      <j:when test="${dbase == 'sapdb'}">
+        <j:set var="org.apache.jetspeed.target.rdbms.name" value="sapdb"/>
+        <j:set var="org.apache.jetspeed.target.rdbms.dropdrops" value="true"/>
+      </j:when>
       <j:otherwise>
         <fail message="unsupported target database: ${org.apache.jetspeed.target.rdbms}"/>
       </j:otherwise>



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