weaver      2004/07/02 06:46:05

  Modified:    maven-plugin plugin.jelly
  Log:
  - Added jetspeed2:build.portal.debug that creates a WAR structure minus /lib and 
/classes for use
  with ceratin Eclipse/Tomcat plugins.
  
  - Added filter-set copy
  
  - Re-arranged jetspeed2:build.portal so that custom files ALWAYS overwrite the ones 
brought down
  from J2.
  
  Revision  Changes    Path
  1.8       +43 -7     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly      23 Jun 2004 18:39:32 -0000      1.7
  +++ plugin.jelly      2 Jul 2004 13:46:04 -0000       1.8
  @@ -141,17 +141,53 @@
         </j:if>
          <!-- END OF TO BE REMOVED -->
       </j:forEach>
  -   
  -     copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-a1-dev.jar" 
todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
  +   <echo>Copying Jetspeed 2 portal files...</echo>
  +     <copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-a1-dev.jar" 
todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
        <copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="false">
            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" 
/>                               
        </copy>   
  -     <!--
  -     <touch >
  -            <fileset dir="${basedir}/src/webapp"/>
  -       </touch>
  -       -->
  +     
  +     <echo>Copying custom portal files...</echo>
  +     <copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="true">
  +         <fileset dir="${basedir}/src/webapp"/>
  +     </copy>
  +             
        <attainGoal name="war:war" />
  +     
  +     <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>
  +  </goal>
  +  
  +  <goal name="jetspeed2:build.portal.debug" >
  +     
  +     <copy todir="${basedir}/etc/project-dependencies" overwrite="true" 
failonerror="true">
  +         <fileset 
dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />  
                           
  +     </copy>
  +     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent" 
tofile="${basedir}/locator.ent" overwrite="true" failonerror="true"/> 
  +     
  +     
  +    <echo>Copying Jetspeed 2 portal files...</echo>
  +     <copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-a1-dev.jar" 
todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
  +     <copy todir="${basedir}/target/debug" failonerror="true" overwrite="false">
  +         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" 
/>                               
  +     </copy>   
  +     
  +     <echo>Copying custom portal files...</echo>
  +     <copy todir="${basedir}/target/debug" failonerror="true" overwrite="true">
  +         <fileset dir="${basedir}/src/webapp"/>
  +     </copy>
  +     
  +     <copy file="${basedir}/src/webapp/WEB-INF/conf/jetspeed.properties" 
tofile="${basedir}/target/debug/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>
  +     
     </goal>
     
     <goal name='jetspeed2:deploy.shared'>
  
  
  

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

Reply via email to