taylor      2004/05/01 12:45:57

  Modified:    .        maven.xml
  Log:
  added goals for dropping test and production dbs

  renamed redundant goal names

  

  PR:

  Obtained from:

  Submitted by: 

  Reviewed by:  

  CVS: ----------------------------------------------------------------------

  CVS: PR:

  CVS:   If this change addresses a PR in the problem report tracking

  CVS:   database, then enter the PR number(s) here.

  CVS: Obtained from:

  CVS:   If this change has been taken from another system, such as NCSA,

  CVS:   then name the system in this line, otherwise delete it.

  CVS: Submitted by:

  CVS:   If this code has been contributed to Apache by someone else; i.e.,

  CVS:   they sent us a patch or a new module, then include their name/email

  CVS:   address here. If this is your work then delete this line.

  CVS: Reviewed by:

  CVS:   If we are doing pre-commit code reviews and someone else has

  CVS:   reviewed your changes, include their name(s) here.

  CVS:   If you have not had it reviewed then delete this line.

  
  Revision  Changes    Path
  1.49      +17 -6     jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- maven.xml 1 May 2004 17:03:51 -0000       1.48
  +++ maven.xml 1 May 2004 19:45:57 -0000       1.49
  @@ -53,7 +53,7 @@
     <goal name="allBuild"
           description="Build all jars and war">
        <attainGoal name="db.scripts.gen"/>
  -     <attainGoal name="db.create.test.db"/>
  +     <attainGoal name="db.create.test"/>
   
       <!-- Build jars -->
       <maven:reactor
  @@ -321,6 +321,7 @@
     <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
     <!-- ================================================================ -->
     <goal name="db.execute">
  +    <echo message="$$$ script = ${database.arg.script}"/>
       <sql driver="${org.apache.jetspeed.database.driver}"
            url="${org.apache.jetspeed.database.url}"
            userid="${org.apache.jetspeed.database.user}"
  @@ -337,12 +338,12 @@
     <!-- EXECUTE CREATE DB SQL SCRIPTS                                    -->
     <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
     <!-- ================================================================ -->
  -  <goal name="db.create.test.db">
  +  <goal name="db.create.test">
       <attainGoal name="db.test.properties"/>
       <attainGoal name="db.create"/>
     </goal>
   
  -  <goal name="db.create.production.db">
  +  <goal name="db.create.production">
       <attainGoal name="db.production.properties"/>
       <attainGoal name="db.create"/>
     </goal>
  @@ -370,10 +371,20 @@
     <!-- EXECUTE DROP DB SQL SCRIPTS                                      -->
     <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
     <!-- ================================================================ -->
  +  <goal name="db.drop.test">
  +    <attainGoal name="db.test.properties"/>
  +    <attainGoal name="db.drop"/>
  +  </goal>
  +
  +  <goal name="db.drop.production">
  +    <attainGoal name="db.production.properties"/>
  +    <attainGoal name="db.drop"/>
  +  </goal>
  +
     <goal name="db.drop">
  -    <j:set var="database.arg.script" 
value="./src/sql/${org.apache.database.default.name}/drop-db.sql" />
  +    <j:set var="database.arg.script" 
value="./src/sql/${org.apache.jetspeed.database.default.name}/drop-db.sql" />
       <attainGoal name="db.execute" />
  -    <j:set var="database.arg.script" 
value="./src/sql/${org.apache.database.default.name}/registry-drop-db.sql" />
  +    <j:set var="database.arg.script" 
value="./src/sql/${org.apache.jetspeed.database.default.name}/registry-drop-db.sql" />
       <attainGoal name="db.execute" />
     </goal>
   
  @@ -383,7 +394,7 @@
     <!-- ================================================================ -->
     <goal name="db.recreate">
   <!--    <attainGoal name="db.drop" /> -->
  -    <attainGoal name="db.create.production.db" />
  +    <attainGoal name="db.create.production" />
     </goal>
   
       <goal name="quickStart"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to