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 Wed, 25 Aug 2004 20:23:53 GMT
weaver      2004/08/25 13:23:53

  Modified:    maven-plugin plugin.jelly
  Log:
  Fixed issue with filtersets not being invoked when copying jetspeed.properties
  
  Revision  Changes    Path
  1.16      +2 -4      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- plugin.jelly	24 Aug 2004 14:18:15 -0000	1.15
  +++ plugin.jelly	25 Aug 2004 20:23:53 -0000	1.16
  @@ -152,9 +152,7 @@
            <fileset dir="${basedir}/src/webapp"/>
        </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">
  +       <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp/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}"/>
  @@ -167,7 +165,7 @@
             <filter token="=" value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
           </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