portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2 maven.xml
Date Sat, 02 Apr 2005 22:45:37 GMT
ate         2005/04/02 14:45:37

  Modified:    .        maven.xml
  Log:
  Moved calling copy.shared.deps from allBuild to doStart (quickStart,minStart etc.)
  Added nodbQuickStart and nodbMinStart skipping db.recreate and calling portal/nodbfullDeploy
or portal/nodbMinDeploy
  
  Revision  Changes    Path
  1.111     +54 -24    jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- maven.xml	22 Dec 2004 23:06:15 -0000	1.110
  +++ maven.xml	2 Apr 2005 22:45:37 -0000	1.111
  @@ -150,7 +150,9 @@
           
       <attainGoal name="check.required.properties"/>
     	<attainGoal name="db.scripts.gen"/>
  -  	<attainGoal name="db.create.test"/>
  +    <j:if test="${maven.test.skip == false}">
  +    	<attainGoal name="db.create.test"/>
  +    </j:if>
     	
       <!-- Build jars files-->
       <attainGoal name="jetspeed2:jar:install"/>  
  @@ -167,8 +169,6 @@
                  postProcessing="false"
                  ignoreFailures="false"/>
                  
  -     <!-- Dependency copying -->
  -     <attainGoal name="copy.shared.deps" />
     </goal>
   
     <goal name="copy.shared.deps">
  @@ -449,46 +449,76 @@
     <goal name="db.recreate">
       <attainGoal name="db.create.production" />
     </goal>
  +  
  +    <goal name="doStart">
  +      <maven:property name="deployType" defaultValue="fullDeploy"/>
  +      <maven:property name="recreateDB" defaultValue="true"/>
   
  -    <goal name="quickStart"
  -        description="Creates the production DB and calls portal/maven fulDeploy">
  +      <j:if test="${recreateDB}">
           <attainGoal name="db.recreate" />
  +      </j:if>
  +      
           <maven:reactor
                  basedir="${basedir}"
                  includes="portal/project.xml"
                  goals="remove.wars"
                  banner="Remove war files, make sure to shutdown server first"
                  postProcessing="false"
  -               ignoreFailures="false"/>        
  +               ignoreFailures="false"/>
  +
  +        <!-- Dependency copying -->
  +
  +        <attainGoal name="copy.shared.deps" />
  +
           <maven:reactor
                  basedir="${basedir}"
                  includes="portal/project.xml"
  -               goals="fullDeploy"
  +               goals="${deployType}"
                  banner="Deploying basic Jetspeed portal suite"
                  postProcessing="false"
                  ignoreFailures="false"/>
  +
  +    </goal>
  +
  +    <goal name="quickStart"
  +        description="Creates the production DB and calls portal/maven fullDeploy">
  +        <j:set var="deployType" value="fullDeploy"/>
  +        <attainGoal name="doStart"/>
       </goal>
       
  +    <goal name="nodbQuickStart"
  +        description="Don't create a new production DB but call portal/maven fullDeploy">
  +        <j:set var="deployType" value="nodbfullDeploy"/>
  +        <j:set var="recreateDB" value="false"/>
  +        <attainGoal name="doStart"/>
  +    </goal>
  +
       <goal name="minStart"
  -        description="Creates the production DB and calls portal/maven fulDeploy">
  -        <attainGoal name="db.recreate" />
  -        <maven:reactor
  -               basedir="${basedir}"
  -               includes="portal/project.xml"
  -               goals="remove.wars"
  -               banner="Remove war files, make sure to shutdown server first"
  -               postProcessing="false"
  -               ignoreFailures="false"/>        
  -        <maven:reactor
  -               basedir="${basedir}"
  -               includes="portal/project.xml"
  -               goals="minDeploy"
  -               banner="Deploying basic Jetspeed portal suite"
  -               postProcessing="false"
  -               ignoreFailures="false"/>
  +        description="Creates the production DB and calls portal/maven minDeploy">
  +        <j:set var="deployType" value="minDeploy"/>
  +        <attainGoal name="doStart"/>
  +    </goal>
  +    
  +    <goal name="nodbMinStart"
  +        description="Don't create a new production DB but call portal/maven minDeploy">
  +        <j:set var="deployType" value="nodbMinDeploy"/>
  +        <j:set var="recreateDB" value="false"/>
  +        <attainGoal name="doStart"/>
  +    </goal>
  +    
  +    <goal name="basicStart"
  +        description="Creates the production DB and calls portal/maven basicDeploy">
  +        <j:set var="deployType" value="minDeploy"/>
  +        <attainGoal name="doStart"/>
  +    </goal>
  +    
  +    <goal name="nodbBasicStart"
  +        description="Don't create a new production DB but call portal/maven nodbBasicDeploy">
  +        <j:set var="deployType" value="nodbBasicDeploy"/>
  +        <j:set var="recreateDB" value="false"/>
  +        <attainGoal name="doStart"/>
       </goal>
       
  -
      <goal name="dropdrops">
       <attainGoal name="java:compile"/>
       <attainGoal name="db.test.properties"/>
  
  
  

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


Mime
View raw message