cvs commit: jakarta-jetspeed-2/maven-plugin plugin.jelly

[weaver]

weaver      2004/08/26 08:33:15

  Modified:    maven-plugin plugin.jelly
  Log:
  The plugin was not copying the jetspeed.xml file
  
  Revision  Changes    Path
  1.17      +22 -2     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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- plugin.jelly      25 Aug 2004 20:23:53 -0000      1.16
  +++ plugin.jelly      26 Aug 2004 15:33:15 -0000      1.17
  @@ -165,8 +165,8 @@
             <filter token="=" 
value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
           </filterset>
         </copy>
  -
  -    
  +      
  +         
       <attainGoal name="war:war" />
     </goal>
     
  @@ -234,6 +234,26 @@
                  
        <delete dir="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
        <unwar src="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}" 
dest="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
  +     
  +     <j:set var="catalina_version_major" 
value="${org.apache.jetspeed.catalina.version.major}"/>
  +      <echo>Build jetspeed.xml for Tomcat version ${catalina_version_major}</echo>
  +      <j:choose>
  +        <j:when test="${catalina_version_major == '5'}" >
  +          <j:set var="context_dir" 
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
  +        </j:when>
  +        <j:otherwise>
  +          <j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
  +        </j:otherwise>
  +      </j:choose>
  +      
  +      <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/jetspeed.xml" 
tofile="${context_dir}/jetspeed.xml" overwrite="true">
  +        <filterset begintoken="@" endtoken="@">
  +          <filter token="USERNAME" 
value="${org.apache.jetspeed.production.database.user}"/>
  +          <filter token="PASSWORD" 
value="${org.apache.jetspeed.production.database.password}"/>
  +          <filter token="DRIVER" 
value="${org.apache.jetspeed.production.database.driver}"/>
  +          <filter token="URL" 
value="${org.apache.jetspeed.production.database.url}"/>
  +        </filterset>
  +      </copy>
        
   
     </goal>
  
  
  

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