Changeset 1281

Show
Ignore:
Timestamp:
02/09/07 22:48:45
Author:
douglm
Message:

Rearranged schema to solve most of the problems caused for Oracle deployments.

Incomplete - follow up changes will add a new long string table using text/clob values.

Renamed many table to a more consistent naming scheme.
Added foreign key constraint names.

Updated the dump/restore utility to produce formatted output (and a little help).
Also added drop adn drop-export option to drop tables.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r1213 r1281  
    7676            value="${propval.app.name}"/> 
    7777    <filter token="APP-VERSION" 
    78             value="${propval.app.version}"/> 
     78            value="${org.bedework.global.version}"/> 
    7979    <filter token="WAR-NAME" 
    8080            value="${propval.app.war.name}"/> 
    …… 
    105105    <filter token="PERSONAL-URI" 
    106106            value="${org.bedework.global.personal.calendar.uri}" /> 
     107 
     108    <!--      Shell script settings            --> 
     109 
     110    <filter token="SCHEMA-DELIMITER" 
     111            value="${propval.app.schema.delimiter}" /> 
     112 
     113      <filter token="CALDAVTEST-CLASS" 
     114              value="org.bedework.caldav.test.TestCalDav"/> 
     115 
     116      <filter token="DUMP-CLASS" 
     117              value="org.bedework.dumprestore.dump.Dump"/> 
     118      <filter token="RESTORE-CLASS" 
     119              value="org.bedework.dumprestore.restore.Restore"/> 
    107120  </filterset> 
    108121</project> 

  • trunk/build/buildsh.xml

    r1186 r1281  
    1616 
    1717<project name="uwcal.buildsh" default="build"> 
     18  <import file="${build.dir}/buildfilters.xml" /> 
     19 
    1820  <target name="init"> 
    1921    <!-- Load the location of the libraries --> 
    …… 
    4345 
    4446  <target name="build" depends="init"> 
    45     <filterset id="property.filters" > 
    46       <filter token="BW-APP-NAME" 
    47               value="${org.bedework.deploy.name}"/> 
    48  
    49       <filter token="HIBERNATE-DIALECT" 
    50               value="${org.bedework.global.hibernate.dialect}" /> 
    51  
    52       <filter token="SECOND-LEVEL-CACHING" 
    53               value="${org.bedework.global.hibernate.cache.use_second_level_cache}" /> 
    54  
    55       <filter token="CACHE-PROVIDER" 
    56               value="${org.bedework.global.hibernate.cache.provider_class}" /> 
    57  
    58       <filter token="DIRECTORY-BROWSING-DISALLOWED" 
    59               value="${org.bedework.global.directory.browsing.disallowed}" /> 
    60  
    61       <filter token="APP-DESCRIPTION" 
    62               value="${propval.app.description}" /> 
    63  
    64       <filter token="CALDAVTEST-CLASS" 
    65               value="org.bedework.caldav.test.TestCalDav"/> 
    66  
    67       <filter token="DUMP-CLASS" 
    68               value="org.bedework.dumprestore.dump.Dump"/> 
    69       <filter token="RESTORE-CLASS" 
    70               value="org.bedework.dumprestore.restore.Restore"/> 
    71  
    72       <filter token="APP-NAME" 
    73               value="${propval.app.name}"/> 
    74       <filter token="APP-VERSION" 
    75               value="${propval.app.version}"/> 
    76     </filterset> 
    77  
    7847    <delete dir="${app.dest.home}" /> 
    7948 

  • trunk/config/configs/democal.properties

    r1213 r1281  
    1717# Global options 
    1818# 
     19org.bedework.global.version=3.3.1 
    1920 
    2021# Define the names of the applications we want to build 
    …… 
    2930 
    3031# Hibernate caching parameters 
    31 org.bedework.global.hibernate.cache.use_second_level_cache=true 
     32org.bedework.global.hibernate.cache.use_second_level_cache=false 
    3233org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3334 
    …… 
    124125org.bedework.app.bwconfig.type=webconfig 
    125126org.bedework.app.bwconfig.sou.dir=webconfig 
    126 org.bedework.app.bwconfig.version=3.3 
    127127org.bedework.app.bwconfig.default.contenttype=text/xml 
    128128org.bedework.app.bwconfig.war.name=bwconfig 
    …… 
    146146org.bedework.app.CalAdmin.type=webadmin 
    147147org.bedework.app.CalAdmin.sou.dir=webadmin 
    148 org.bedework.app.CalAdmin.version=3.3 
    149148org.bedework.app.CalAdmin.default.contenttype=text/xml 
    150149org.bedework.app.CalAdmin.nogroupallowed=false 
    …… 
    179178org.bedework.app.Events.type=webpublic 
    180179org.bedework.app.Events.sou.dir=webclient 
    181 org.bedework.app.Events.version=3.3 
    182180org.bedework.app.Events.default.contenttype=text/xml 
    183181org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml 
    …… 
    209207org.bedework.app.SoEDept.type=webpublic 
    210208org.bedework.app.SoEDept.sou.dir=webclient 
    211 org.bedework.app.SoEDept.version=3.3 
    212209org.bedework.app.SoEDept.default.contenttype=text/xml 
    213210org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml 
    …… 
    331328org.bedework.app.caldavTest.zip.name=caldavTest 
    332329org.bedework.app.caldavTest.description=Bedework CalDAV test utility 
    333 org.bedework.app.caldavTest.version=3.3 
    334330 
    335331# 
    …… 
    348344org.bedework.app.dumpres.zip.name=dumpres 
    349345org.bedework.app.dumpres.description=Bedework dump/restore utility 
    350 org.bedework.app.dumpres.version=3.3 
     346org.bedework.app.dumpres.schema.delimiter=; 
    351347org.bedework.app.dumpres.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    352348org.bedework.app.dumpres.jdbcdriver=org.hsqldb.jdbcDriver 

  • trunk/deployment/dumprestore/shellscr/resources/dumpres.sh

    r1071 r1281  
    3737    $RESTORECMD -appname $APPNAME -f ./data/initbedework.xml -initSyspars $2 $3 $4 $5 $6 $7 $8 $9 
    3838    ;; 
     39  drop) 
     40    echo $SCHEMACMD --text --drop --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql 
     41    $SCHEMACMD --text --drop --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql 
     42    ;; 
     43  export-drop) 
     44    echo $SCHEMACMD --drop --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql $2 $3 $4 $5 $6 $7 $8 $9 
     45    $SCHEMACMD --drop --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql $2 $3 $4 $5 $6 $7 $8 $9 
     46    ;; 
    3947  schema) 
    40     echo $SCHEMACMD --text --create --config=./classes/hibernate.cfg.xml --output=schema.sql 
    41     $SCHEMACMD --text --create --config=./classes/hibernate.cfg.xml --output=schema.sql 
     48    echo $SCHEMACMD --text --create --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql 
     49    $SCHEMACMD --text --create --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql 
    4250    ;; 
    4351  schema-export) 
    44     echo $SCHEMACMD --create --config=./classes/hibernate.cfg.xml --output=schema.sql 
    45     $SCHEMACMD --create --config=./classes/hibernate.cfg.xml --output=schema.sql 
     52    echo $SCHEMACMD --create --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql $2 $3 $4 $5 $6 $7 $8 $9 
     53    $SCHEMACMD --create --formatted --delimiter="@SCHEMA-DELIMITER@" --config=./classes/hibernate.cfg.xml --output=schema.sql $2 $3 $4 $5 $6 $7 $8 $9 
    4654    ;; 
    4755  *) 
    48     echo $"Usage: $0 {dump <filename> |" 
    49     echo $"           restore <filename> |" 
    50     echo $"           backup <directory> <prefix>} |" 
    51     echo $"           initdb |" 
    52     echo $"           schema |" 
    53     echo $"           schema-export" 
     56    echo $" " 
     57    echo $"Usage: " 
     58    echo $"  $0 dump <filename> " 
     59    echo $"     Dump the database in xml format suitable for restore." 
     60    echo $" " 
     61    echo $"  $0 restore <filename> " 
     62    echo $"     Restore the database from an xml formatted dump." 
     63    echo $" " 
     64    echo $"  $0 backup <directory> <prefix>} " 
     65    echo $"     Dump the database in xml format suitable for restore." 
     66    echo $"     Files will have a name built from the prefix and the current date/time." 
     67    echo $" " 
     68    echo $"  $0 initdb [--indexroot=<lucene-index-root>" 
     69    echo $"     Populate the database using the provided initial data." 
     70    echo $" " 
     71    echo $"  $0 drop [--haltonerror] " 
     72    echo $"     Create a file in the current directory with sql drop statements" 
     73    echo $" " 
     74    echo $"  $0 export-drop [--haltonerror]" 
     75    echo $"     Drop tables in the database. Note this may not work if the schema" 
     76    echo $"     was changed." 
     77    echo $" " 
     78    echo $"  $0 schema [--haltonerror] " 
     79    echo $"     Create a schema from the xml schema. Placed in a file in the current directory" 
     80    echo $" " 
     81    echo $"  $0 schema-export [--haltonerror]" 
     82    echo $"     Create a schema from the xml schema." 
     83    echo $"     Also create the database tables, indexes etc." 
     84    echo $" " 
    5485esac 
    5586