You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/07/07 19:40:22 UTC

cvs commit: jakarta-jetspeed/tutorial maven.xml

taylor      2004/07/07 10:40:22

  Modified:    tutorial maven.xml
  Log:
  fixing a few bugs in deployment scripts
  
  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.9       +314 -288  jakarta-jetspeed/tutorial/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/maven.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- maven.xml	15 Jun 2004 04:25:08 -0000	1.8
  +++ maven.xml	7 Jul 2004 17:40:22 -0000	1.9
  @@ -23,212 +23,217 @@
       <goal name="hotdeploy">
           <attainGoal name="jetspeed:hotdeploy"/>        
       </goal>
  -	<preGoal name="java:compile">
  -		<attainGoal name="torque:om"/>
  -		<attainGoal name="torque:sql"/>
  -	</preGoal>
  -	<preGoal name="jetspeed:war-config">
  +    <preGoal name="java:compile">
  +        <attainGoal name="torque:om"/>
  +        <attainGoal name="torque:sql"/>
  +    </preGoal>
  +    <preGoal name="jetspeed:war-config">
           <attainGoal name='tutorial-setup'/>
  -	</preGoal>
  +    </preGoal>
   
       <!-- copy over the tutorial files, this is not standard practice -->
  -	<preGoal name="jetspeed:hotdeploy-config">
  +    <preGoal name="jetspeed:hotdeploy-config">
           <attainGoal name='jetspeed:war-config'/>
  -	</preGoal>
  +    </preGoal>
   
       <preGoal name="jetspeed:hotdeploy-config">
           <attainGoal name='tutorial-setup'/>
  -	</preGoal>
  +    </preGoal>
   
       <goal name='tutorial-setup'>
  -		<j:choose>
  -			<j:when test="${tutorial == null}">
  -				<attainGoal name="tutorial-all"/>
  -			</j:when>
  -			<j:otherwise>
  -				<attainGoal name="tutorial-${tutorial}"/>
  -			</j:otherwise>
  -		</j:choose>
  -		<tstamp>
  -			<format property="timestamp" pattern="yyyy-MM-dd-hh:mm"/>
  -		</tstamp>
  -		<replace file="${maven.war.src}/WEB-INF/conf/JetspeedResources.properties" token="BUILD-VERSION" value="${pom.currentVersion}-${timestamp}"/>
  -    </goal>
  -	<preGoal name="clean">
  -		<delete failonerror="false">
  -			<fileset dir="${maven.src.dir}/java" includes="**/*.generation"/>
  -			<fileset dir="${maven.src.dir}/java/org/apache/jetspeed/tutorial/om">
  -				<exclude name="CVS"/>
  -				<exclude name="**.html"/>
  -				<include name="**.java"/>
  -			</fileset>
  -			<fileset dir="${maven.src.dir}/java/org/apache/jetspeed/tutorial/om/map">
  -				<exclude name="CVS"/>
  -				<exclude name="**.html"/>
  -				<include name="**.java"/>
  -			</fileset>
  -		</delete>
  -	</preGoal>
  -	<goal name="tutorial-0" description="Resets the web application. No changes are made to the Jetspeed distribution.">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/0">
  -				<include name="**/*.properties.merge.merge"/>
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -	</goal>
  -	<goal name="tutorial-1" description="Tailoring the Portal Web Design">
  +        <j:choose>
  +            <j:when test="${tutorial == null}">
  +                <attainGoal name="tutorial-all"/>
  +            </j:when>
  +            <j:otherwise>
  +                <attainGoal name="tutorial-${tutorial}"/>
  +            </j:otherwise>
  +        </j:choose>
  +        <tstamp>
  +            <format property="timestamp" pattern="yyyy-MM-dd-hh:mm"/>
  +        </tstamp>
  +        <replace file="${maven.war.src}/WEB-INF/conf/JetspeedResources.properties" token="BUILD-VERSION" value="${pom.currentVersion}-${timestamp}"/>
  +    </goal>
  +    <preGoal name="clean">
  +        <delete failonerror="false">
  +            <fileset dir="${maven.src.dir}/java" includes="**/*.generation"/>
  +            <fileset dir="${maven.src.dir}/java/org/apache/jetspeed/tutorial/om">
  +                <exclude name="CVS"/>
  +                <exclude name="**.html"/>
  +                <include name="**.java"/>
  +            </fileset>
  +            <fileset dir="${maven.src.dir}/java/org/apache/jetspeed/tutorial/om/map">
  +                <exclude name="CVS"/>
  +                <exclude name="**.html"/>
  +                <include name="**.java"/>
  +            </fileset>
  +        </delete>
  +    </preGoal>
  +    <goal name="tutorial-0" description="Resets the web application. No changes are made to the Jetspeed distribution.">
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/0">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +    </goal>
  +    <goal name="tutorial-1" description="Tailoring the Portal Web Design">
           <echo>Configuring for Tutorial 1</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/1">
  -				<include name="**/*.properties.merge"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/1">
  +                <include name="**/*.properties.merge"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
  -	</goal>
  -	<goal name="tutorial-2" description="Localisation">
  +    </goal>
  +    <goal name="tutorial-2" description="Localisation">
           <echo>Configuring for Tutorial 2</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/2">
  -				<include name="**/*.properties.merge"/>
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/2">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
  -	</goal>
  -	<goal name="tutorial-3" description="Site Map">
  +    </goal>
  +    <goal name="tutorial-3" description="Site Map">
           <echo>Configuring for Tutorial 3</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/3">
  -				<include name="**/*.properties.merge"/>
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/3/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/3/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/3">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/3/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/3/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
  -	</goal>
  -	<goal name="tutorial-4" description="Site Security">
  +    </goal>
  +    <goal name="tutorial-4" description="Site Security">
           <echo>Configuring for Tutorial 4</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/4">
  -				<include name="**/*.properties.merge"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/4/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/4/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/4">
  +                <include name="**/*.properties.merge"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/4/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/4/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
  -	</goal>
  -	<goal name="tutorial-5" description="Portlet 101">
  +    </goal>
  +    <goal name="tutorial-5" description="Portlet 101">
           <echo>Configuring for Tutorial 5</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/5">
  -				<include name="**/*.properties.merge"/>
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/5/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/5/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/5">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/5/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/5/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
           <attainGoal name='templates-5'/>
  -	</goal>
  -	<goal name="tutorial-6" description="Portlet Interface">
  +    </goal>
  +    <goal name="tutorial-6" description="Portlet Interface">
           <echo>Configuring for Tutorial 6</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/6">
  -				<include name="**/*.properties.merge"/>
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/6/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/6/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/6">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/6/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/6/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
           <attainGoal name='templates-5'/>
           <attainGoal name='templates-6'/>
  -	</goal>
  -	<goal name="tutorial-7" description="Velocity Portlet">
  +    </goal>
  +    <goal name="tutorial-7" description="Velocity Portlet">
           <echo>Configuring for Tutorial 7</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/7">
  -				<include name="**/*.properties.merge"/>
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/7/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/7/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/7">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/7/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/7/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
           <attainGoal name='templates-5'/>
           <attainGoal name='templates-6'/>
           <attainGoal name='templates-7'/>
  -	</goal>
  -	<goal name="tutorial-8" description="Parameter Styles">
  +    </goal>
  +    <goal name="tutorial-8" description="Parameter Styles">
           <echo>Configuring for Tutorial 8</echo>
  -
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/8">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/8/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/8/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/8">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/8">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/8/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/8/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
  @@ -236,26 +241,32 @@
           <attainGoal name='templates-6'/>
           <attainGoal name='templates-7'/>
           <attainGoal name='templates-8'/>
  -	</goal>
  +    </goal>
   
  -	<goal name="tutorial-9" description="DatabaseBrowser Portlet">
  +    <goal name="tutorial-9" description="DatabaseBrowser Portlet">
           <echo>Configuring for Tutorial 8</echo>
  -
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/9">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/9/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/9/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/9">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/9">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/9/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/9/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
  @@ -264,21 +275,28 @@
           <attainGoal name='templates-7'/>
           <attainGoal name='templates-8'/>
           <attainGoal name='templates-9'/>        
  -	</goal>
  +    </goal>
   
  -	<goal name="tutorial-10" description="XSLT Portlet">
  +    <goal name="tutorial-10" description="XSLT Portlet">
           <echo>Configuring for Tutorial 10</echo>
   
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  -			<fileset dir="tutorials/9/anon/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  -			<fileset dir="tutorials/9/turbine/html">
  -				<include name="**/*.psml"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/10">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/anon/html">
  +            <fileset dir="tutorials/10/anon/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/psml/user/turbine/html">
  +            <fileset dir="tutorials/10/turbine/html">
  +                <include name="**/*.psml"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
  @@ -288,25 +306,33 @@
           <attainGoal name='templates-8'/>
           <attainGoal name='templates-9'/>        
           <attainGoal name='template-10'/>
  -	</goal>
  +    </goal>
   
  -	<goal name="tutorial-12" description="Parameter Styles">
  +    <goal name="tutorial-12" description="Parameter Styles">
           <echo>Configuring for Tutorial 12</echo>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/12">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/parameters/html">
  -			<fileset dir="tutorials/12/templates/vm/parameters/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  -			<fileset dir="tutorials/12/templates/vm/portlets/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  +
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/5">
  +                <include name="**/*.properties.merge"/>
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/12">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/parameters/html">
  +            <fileset dir="tutorials/12/templates/vm/parameters/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  +            <fileset dir="tutorials/12/templates/vm/portlets/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
           <attainGoal name='templates-1'/>
           <attainGoal name='templates-2'/>
           <attainGoal name='templates-4'/>
  @@ -316,108 +342,108 @@
           <attainGoal name='templates-8'/>
           <attainGoal name='templates-9'/>
           <attainGoal name='templates-10'/>
  -	</goal>
  -	<goal name="tutorial-all" description="Build the complete tutorial">
  -	    <attainGoal name="tutorial-12"/>  
  -	</goal>
  +    </goal>
  +    <goal name="tutorial-all" description="Build the complete tutorial">
  +        <attainGoal name="tutorial-12"/>  
  +    </goal>
   
       <!-- Template Copies -->
       <goal name='templates-1' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/navigations/html">
  -			<fileset dir="tutorials/1/templates/vm/navigations/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/1">
  -				<include name="**/*.xreg"/>
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/navigations/html">
  +            <fileset dir="tutorials/1/templates/vm/navigations/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/1">
  +                <include name="**/*.xreg"/>
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-2' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/navigations/html">
  -			<fileset dir="tutorials/2/templates/vm/navigations/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/navigations/html">
  +            <fileset dir="tutorials/2/templates/vm/navigations/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-4' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  -			<fileset dir="tutorials/4/templates/vm/portlets/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/4">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  +            <fileset dir="tutorials/4/templates/vm/portlets/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/4">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-5' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/5">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/5">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-6' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/6">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/6">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-7' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  -			<fileset dir="tutorials/7/templates/vm/portlets/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/7">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  +            <fileset dir="tutorials/7/templates/vm/portlets/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/7">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-8' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/jsp/portlets/html">
  -			<fileset dir="tutorials/8/templates/jsp/portlets/html">
  -				<include name="**/*.jsp"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/8">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/jsp/portlets/html">
  +            <fileset dir="tutorials/8/templates/jsp/portlets/html">
  +                <include name="**/*.jsp"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/8">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-9' description="Copy common templates">
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  -			<fileset dir="tutorials/9/templates/vm/portlets/html">
  -				<include name="**/*.vm"/>
  -			</fileset>
  -		</copy>
  -		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/9">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/templates/vm/portlets/html">
  +            <fileset dir="tutorials/9/templates/vm/portlets/html">
  +                <include name="**/*.vm"/>
  +            </fileset>
  +        </copy>
  +        <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/9">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
       <goal name='templates-10' description="Copy common templates">
  -  		<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  -			<fileset dir="tutorials/10">
  -				<include name="**/*.xreg"/>
  -			</fileset>
  -		</copy>
  +          <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +            <fileset dir="tutorials/10">
  +                <include name="**/*.xreg"/>
  +            </fileset>
  +        </copy>
       </goal>
   
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org