portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/db jetspeed.properties jetspeed.script
Date Sun, 26 May 2002 16:07:51 GMT
taylor      02/05/26 09:07:51

  Modified:    build/torque/schema Tag: security_14 security-schema.xml
               src/java/org/apache/jetspeed/services/registry Tag:
                        security_14 TestRegistryCategories.java
               webapp/WEB-INF/db Tag: security_14 jetspeed.properties
                        jetspeed.script
  Log:
  - dropped constraints table since cascade deletes dont work on hypersonic
  - added jetspeed_acl table to default hypersonic db
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +4 -12     jakarta-jetspeed/build/torque/schema/Attic/security-schema.xml
  
  Index: security-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/Attic/security-schema.xml,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- security-schema.xml	26 May 2002 15:40:13 -0000	1.1.2.3
  +++ security-schema.xml	26 May 2002 16:07:51 -0000	1.1.2.4
  @@ -13,7 +13,7 @@
   <!-- users, and security.                                                 -->
   <!-- ==================================================================== -->
   <!-- @author: <a href="mailto:taylor@apache.org">David Sean Taylor</a> 
  -->
  -<!-- @version $Id: security-schema.xml,v 1.1.2.3 2002/05/26 15:40:13 taylor Exp $ -->
  +<!-- @version $Id: security-schema.xml,v 1.1.2.4 2002/05/26 16:07:51 taylor Exp $ -->
   <!-- ==================================================================== -->
   
   <database name="@DATABASE_NAME@">
  @@ -37,26 +37,18 @@
       </unique>        
     
     </table>
  -
  -  <table name="JETSPEED_CONSTRAINT">
  -    <column name="CONSTRAINT_ID" required="true" primaryKey="true" type="INTEGER"/>
  -  </table>
     
     <table name="JETSPEED_ACL">
  -    <column name="ACCESS_ID" required="true" primaryKey="true" type="INTEGER"/>
  -    <column name="CONSTRAINT_ID" required="true" primaryKey="true" type="INTEGER"/>
  +    <column name="ACL_ID" required="true" primaryKey="true" type="INTEGER"/>
  +    <column name="SECURITY_ID" required="true" type="INTEGER"/>
       <column name="RESOURCE" required="true" size="99" type="VARCHAR"/>
       <column name="RESOURCE_TYPE" required="true" size="32" type="VARCHAR"/>
       <column name="ACTION" required="true" size="32" type="VARCHAR"/>
       <column name="ALLOW_TYPE" required="true" size="32" type="VARCHAR"/>
       <column name="PRINCIPAL" required="true" size="32" type="VARCHAR"/>
   
  -    <foreign-key foreignTable="JETSPEED_CONSTRAINT" onDelete="cascade">
  -      <reference local="CONSTRAINT_ID" foreign="CONSTRAINT_ID" />
  -    </foreign-key>
  -
       <index>
  -      <index-column name="CONSTRAINT_ID"/>
  +      <index-column name="SECURITY_ID"/>
       </index>
   
     </table>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +3 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryCategories.java
  
  Index: TestRegistryCategories.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryCategories.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- TestRegistryCategories.java	10 Apr 2002 23:35:41 -0000	1.3
  +++ TestRegistryCategories.java	26 May 2002 16:07:51 -0000	1.3.2.1
  @@ -85,7 +85,7 @@
    * TestRegistryCategories
    *
    * @author <a href="taylor@apache.org">David Sean Taylor</a>
  - * @version $Id: TestRegistryCategories.java,v 1.3 2002/04/10 23:35:41 taylor Exp $
  + * @version $Id: TestRegistryCategories.java,v 1.3.2.1 2002/05/26 16:07:51 taylor Exp $
    */
   
   public class TestRegistryCategories extends TestCase {    
  @@ -147,6 +147,7 @@
               }
               System.out.println("[RSS] count = " + count);
               System.out.println("------------------");
  +            
               assertTrue(count == 6);
   
               registry.removeEntry(pe);
  @@ -156,7 +157,7 @@
               assertTrue(iterator.hasNext());
               assertTrue(iterator.hasNext());
               assertTrue(iterator.hasNext());
  -
  +              
               registry.addEntry(pe);
               iterator = registry.findPortletsByCategory("rss");
               assertTrue(iterator.hasNext());
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.2  +2 -2      jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- jetspeed.properties	26 May 2002 15:33:35 -0000	1.11.2.1
  +++ jetspeed.properties	26 May 2002 16:07:51 -0000	1.11.2.2
  @@ -1,4 +1,4 @@
   #Hypersonic SQL database
  -#Sun May 26 08:26:59 PDT 2002
  +#Sun May 26 09:01:04 PDT 2002
   version=1.4
  -modified=yes
  +modified=no
  
  
  
  1.13.2.2  +2 -3      jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script
  
  Index: jetspeed.script
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- jetspeed.script	26 May 2002 15:33:35 -0000	1.13.2.1
  +++ jetspeed.script	26 May 2002 16:07:51 -0000	1.13.2.2
  @@ -17,6 +17,8 @@
   CREATE TABLE JETSPEED_ANON_PROFILE(PSML_ID INTEGER IDENTITY PRIMARY KEY,MEDIA_TYPE VARCHAR,LANGUAGE
VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,UNIQUE(PSML_ID),UNIQUE(MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
   CREATE INDEX JETSPEED_ANON_PROFILE_INDEX ON JETSPEED_ANON_PROFILE(MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE)
   CREATE TABLE COFFEES(COF_NAME VARCHAR,SUP_ID INTEGER,PRICE FLOAT,SALES INTEGER,TOTAL INTEGER)
  +CREATE TABLE JETSPEED_ACL(ACL_ID INTEGER,SECURITY_ID INTEGER,RESOURCE VARCHAR,RESOURCE_TYPE
VARCHAR,ACTION VARCHAR,ALLOW_TYPE VARCHAR,PRINCIPAL VARCHAR,UNIQUE(ACL_ID))
  +CREATE INDEX JETSPEED_ACL_I_2 ON JETSPEED_ACL(SECURITY_ID)
   GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
   GRANT ALL ON CLASS "org.hsql.Library" TO PUBLIC
   CREATE USER SA PASSWORD "" ADMIN
  @@ -137,6 +139,3 @@
   INSERT INTO COFFEES VALUES('KenyanGrade',2,7.99,1,2)
   INSERT INTO COFFEES VALUES('JoeGrade',3,7.99,1,2)
   INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99,1,2)
  -/*C4*/CONNECT USER sa PASSWORD ""
  -
  -/*C1*/CONNECT USER sa PASSWORD ""
  
  
  

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


Mime
View raw message