portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal maven.xml
Date Wed, 19 Nov 2003 21:12:45 GMT
weaver      2003/11/19 13:12:45

  Modified:    .        maven.xml
               portal   maven.xml
  Log:
  moved the catalina:shared and catalina:base-shared to /portal
  deploy goal now calls these to goals
  
  Revision  Changes    Path
  1.8       +18 -18    jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- maven.xml	14 Oct 2003 06:37:56 -0000	1.7
  +++ maven.xml	19 Nov 2003 21:12:45 -0000	1.8
  @@ -95,26 +95,26 @@
                  banner="Build and Install the Demo application WAR"
                  postProcessing="false"
                  ignoreFailures="false"/>
  -
  -    <attainGoal name= "catalina:base-shared"/> 
  -    <attainGoal name= "catalina:shared"/> 
  -  
  -  </goal>
  -  <goal name="catalina:shared"
  -        description="Copy all jars necessary for common container">
  -    <copy file="commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${catalina.shared.lib}"/>
  -    <copy file="portlet-api/target/portlet-api-1.0.jar" todir="${catalina.shared.lib}"/>
  +               
  +          <attainGoal name="copy.shared.deps" />
     </goal>
  +  
  +  <goal name="copy.shared.deps"> 
  +      <maven:reactor
  +               basedir="${basedir}"
  +               includes="portal/project.xml"
  +               goals="catalina:base-shared"
  +               banner="Deploys misc. jars shared/lib  to Tomcat"
  +               postProcessing="false"
  +               ignoreFailures="false"/>
   
  -  <goal name="catalina:base-shared"
  -        description="Copy all base jars necessary for common container">
  -    <echo>Copying from ${maven.repo.local} to ${catalina.shared.lib}...</echo>
  -    <copy file="${maven.repo.local}/pluto-container/jars/pluto-0.1-dev-unreleased.jar"
todir="${catalina.shared.lib}"/>
  -    <copy file="${maven.repo.local}/commons-lang/jars/commons-lang-1.0.1.jar" todir="${catalina.shared.lib}"/>
  -    <copy file="${maven.repo.local}/commons-logging/jars/commons-logging-1.0.2.jar"
todir="${catalina.shared.lib}"/>
  -    <copy file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.0-dev.jar"
todir="${catalina.shared.lib}"/>
  -    <copy file="${maven.repo.local}/log4j/jars/log4j-1.2.6.jar" todir="${catalina.shared.lib}"/>
  +     <maven:reactor
  +               basedir="${basedir}"
  +               includes="portal/project.xml"
  +               goals="catalina:shared"
  +               banner="Deploys container jars to shared/lib to Tomcat"
  +               postProcessing="false"
  +               ignoreFailures="false"/>  
     </goal>
  -
   
   </project>
  
  
  
  1.9       +19 -0     jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- maven.xml	18 Nov 2003 03:38:11 -0000	1.8
  +++ maven.xml	19 Nov 2003 21:12:45 -0000	1.9
  @@ -145,6 +145,8 @@
         <copy  file="./target/jetspeed.war" tofile="${deploy.war.dir}/${webapp.name}.war"/>
         <unwar src="${deploy.war.dir}/${webapp.name}.war" dest="${deploy.war.dir}/${webapp.name}"/>
     
         <copy  file="./src/resources/jetspeed.xml" tofile="${deploy.war.dir}/jetspeed.xml"/>
  +      <attainGoal name="catalina:base-shared" />
  +      <attainGoal name="catalina:shared" />
     </goal>
   
     <!-- ================================================================ -->
  @@ -205,4 +207,21 @@
         </java>
   
     </goal>
  +  
  +  <goal name="catalina:base-shared"
  +        description="Copy all base jars necessary for common container">
  +    <echo>Copying from ${maven.repo.local} to ${catalina.shared.lib}...</echo>
  +    <copy file="${maven.repo.local}/pluto-container/jars/pluto-0.1-dev-unreleased.jar"
todir="${catalina.shared.lib}"/>
  +    <copy file="${maven.repo.local}/commons-lang/jars/commons-lang-1.0.1.jar" todir="${catalina.shared.lib}"/>
  +    <copy file="${maven.repo.local}/commons-logging/jars/commons-logging-1.0.2.jar"
todir="${catalina.shared.lib}"/>
  +    <copy file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.0-dev.jar"
todir="${catalina.shared.lib}"/>
  +    <copy file="${maven.repo.local}/log4j/jars/log4j-1.2.6.jar" todir="${catalina.shared.lib}"/>
  +  </goal>
  +  
  +  <goal name="catalina:shared"
  +        description="Copy all jars necessary for common container">
  +    <copy file="../commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${catalina.shared.lib}"/>
  +    <copy file="../portlet-api/target/portlet-api-1.0.jar" todir="${catalina.shared.lib}"/>
  +  </goal>
  +  
   </project>
  
  
  

---------------------------------------------------------------------
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