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/maven-plugin plugin.jelly
Date Tue, 03 Aug 2004 13:57:44 GMT
weaver      2004/08/03 06:57:44

  Modified:    maven-plugin plugin.jelly
  Log:
  check for the availability of jetspeed.properties before we try the filterset copy
  
  Revision  Changes    Path
  1.12      +9 -6      jakarta-jetspeed-2/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- plugin.jelly	29 Jul 2004 22:27:51 -0000	1.11
  +++ plugin.jelly	3 Aug 2004 13:57:44 -0000	1.12
  @@ -151,12 +151,15 @@
            <fileset dir="${basedir}/src/webapp"/>
        </copy>     
        
  -     <copy file="${maven.war.src}/WEB-INF/conf/jetspeed.properties" tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.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>
  +     
  +     <util:available file="${maven.war.src}/WEB-INF/conf/jetspeed.properties">
  +       <copy file="${maven.war.src}/WEB-INF/conf/jetspeed.properties" tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.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>
  +     </util:available>
       
       <attainGoal name="war:war" />
     </goal>
  
  
  

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