taylor      2004/06/27 19:18:55

  Modified:    .        maven.xml
  Log:
  run merge on fusion.properties to get auto deploy user name
  
  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.27      +7 -1      jakarta-jetspeed/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- maven.xml 27 Jun 2004 17:29:04 -0000      1.26
  +++ maven.xml 28 Jun 2004 02:18:55 -0000      1.27
  @@ -59,6 +59,12 @@
       
       <postGoal name="war:webapp">
           <j:if test="${org.apache.jetspeed.fusion}">
  +                 <copy file="${maven.war.src}/WEB-INF/conf/fusion.properties" 
tofile="${maven.war.webapp.dir}/WEB-INF/conf/fusion.properties" overwrite="true">
  +                   <filterset begintoken="@" endtoken="@">
  +                 <filter token="AUTODEPLOYMENT_USER" 
value="${org.apache.jetspeed.services.autodeployment.user}"/>
  +                <filter token="AUTODEPLOYMENT_PASSWORD" 
value="${org.apache.jetspeed.services.autodeployment.password}"/>
  +              </filterset>
  +            </copy>        
                <j:forEach var="lib" items="${pom.artifacts}">
                    <j:set var="dep" value="${lib.dependency}"/>
                    <!--<echo>Dep: ${dep.getArtifactId()} 
${dep.getProperty('fusion.include')</echo>-->
  @@ -364,7 +370,7 @@
                <maven:reactor
                  basedir="${basedir}"
                  includes="fusion/project.xml"
  -               goals="deploy"
  +               goals="deployFusion"
                  banner="Deploying Fusion resources..."
                  postProcessing="false"
                  ignoreFailures="false"/>        
  
  
  

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

Reply via email to