morciuch    2004/04/08 18:14:29

  Modified:    tutorial maven.xml
  Added:       tutorial/src/webapp/WEB-INF/conf Torque.properties.merge
               tutorial/tutorials/0 JetspeedResources.properties.merge
                        JetspeedSecurity.properties.merge
                        TurbineResources.properties.merge
               tutorial/tutorials/1 JetspeedResources.properties.merge
                        JetspeedSecurity.properties.merge
                        TurbineResources.properties.merge
               tutorial/tutorials/2 JetspeedResources.properties.merge
                        JetspeedSecurity.properties.merge
                        TurbineResources.properties.merge
               tutorial/tutorials/3 JetspeedResources.properties.merge
                        JetspeedSecurity.properties.merge
                        TurbineResources.properties.merge
               tutorial/tutorials/4 JetspeedResources.properties.merge
                        JetspeedSecurity.properties.merge
                        TurbineResources.properties.merge
               tutorial/tutorials/5 JetspeedResources.properties.merge
               tutorial/tutorials/6 JetspeedResources.properties.merge
               tutorial/tutorials/7 JetspeedResources.properties.merge
                        JetspeedSecurity.properties.merge
                        TurbineResources.properties.merge
  Removed:     tutorial/src/webapp/WEB-INF/conf JPortalTorque.properties
               tutorial/tutorials/0 JPortalJetspeed.properties
                        JPortalSecurity.properties
                        JPortalTurbine.properties
               tutorial/tutorials/1 JPortalJetspeed.properties
                        JPortalSecurity.properties
                        JPortalTurbine.properties
               tutorial/tutorials/2 JPortalJetspeed.properties
                        JPortalSecurity.properties
                        JPortalTurbine.properties
               tutorial/tutorials/3 JPortalJetspeed.properties
                        JPortalSecurity.properties
                        JPortalTurbine.properties
               tutorial/tutorials/4 JPortalJetspeed.properties
                        JPortalSecurity.properties
                        JPortalTurbine.properties
               tutorial/tutorials/5 JPortalJetspeed.properties
               tutorial/tutorials/6 JPortalJetspeed.properties
               tutorial/tutorials/7 JPortalJetspeed.properties
                        JPortalSecurity.properties
                        JPortalTurbine.properties
  Log:
  Final changes to get the tutorial builds to work. To build a chapter:
  
  maven -Dtutorial=<chapter#> jetspeed:war
  
  or
  
  maven jetspeed:war to build all chapters.
  
  Prerequisites:
  1. Jetspeed Maven Plugin installed
  2. Torque Maven Plugin 3.2 installed
  3. Jetspeed binary distribution in maven repo (local or remote). To build/install 
Jetspeed binary distribution locally:
  
  maven dist:install
  
  Current project.properties points to binary distribution 1.5-dev.
  
  Revision  Changes    Path
  1.4       +255 -276  jakarta-jetspeed/tutorial/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/tutorial/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml 8 Apr 2004 20:49:28 -0000       1.3
  +++ maven.xml 9 Apr 2004 01:14:28 -0000       1.4
  @@ -13,279 +13,258 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
  -<project default="war"
  -         xmlns:j="jelly:core"
  -         xmlns:maven="jelly:maven"
  -         xmlns:ant="jelly:ant">
  -
  -<preGoal name="java:compile">
  -     <attainGoal name="torque:om"/>
  -     <attainGoal name="torque:sql"/> 
  -</preGoal>
  -
  -<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.">
  -  <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
  -
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/0">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-1" 
  -        description="Tailoring the Portal Web Design">
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/1">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -       <include name="**/*.vm"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/navigations/html">
  -   <fileset dir="tutorials/1/templates/vm/navigations/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-2" 
  -        description="Localisation">
  -<!-- <antcall goal="tutorial-1"/> -->
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/2">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/navigations/html">
  -   <fileset dir="tutorials/2/templates/vm/navigations/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>
  -
  -</goal>
  -
  -<goal name="tutorial-3" 
  -        description="Site Map">
  -<!-- <antcall goal="tutorial-1"/> -->
  -<!-- <antcall goal="tutorial-2"/> -->
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/3">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/3/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/3/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-4" 
  -        description="Site Security">
  -<!-- <antcall goal="tutorial-1"/> -->
  -<!-- <antcall goal="tutorial-2"/> -->
  -<!-- <antcall goal="tutorial-3"/> -->
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/4">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/4/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/4/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/portlets/html">
  -   <fileset dir="tutorials/4/templates/vm/portlets/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-5" 
  -        description="Portlet 101">
  -<!-- <antcall goal="tutorial-1"/> -->
  -<!-- <antcall goal="tutorial-2"/> -->
  -<!-- <antcall goal="tutorial-3"/> -->
  -<!-- <antcall goal="tutorial-4"/> -->
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/5">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/5/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/5/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-6" 
  -        description="Portlet Interface">
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/6">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/6/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/6/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-7" 
  -        description="Velocity Portlet">
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/7">
  -       <include name="**/*.properties"/>    
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/7/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/7/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/portlets/html">
  -   <fileset dir="tutorials/7/templates/vm/portlets/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-8" 
  -        description="Parameter Styles">
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/8">
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/jsp/portlets/html">
  -   <fileset dir="tutorials/8/templates/jsp/portlets/html">
  -       <include name="**/*.jsp"/>     
  -   </fileset>
  - </copy>   
  -  <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/8/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/8/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-9" 
  -        description="DatabaseBrowser Portlet">
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/9">
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/anon/html">
  -   <fileset dir="tutorials/9/anon/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/psml/user/turbine/html">
  -   <fileset dir="tutorials/9/turbine/html">
  -       <include name="**/*.psml"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/portlets/html">
  -   <fileset dir="tutorials/9/templates/vm/portlets/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>
  -</goal>
  -
  -<goal name="tutorial-12" 
  -        description="Parameter Styles">
  - <copy overwrite="true" todir="${maven.build.dir}/WEB-INF/conf">
  -   <fileset dir="tutorials/12">
  -       <include name="**/*.xreg"/>    
  -   </fileset>
  - </copy>
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/parameters/html">
  -   <fileset dir="tutorials/12/templates/vm/parameters/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>   
  - <copy overwrite="true" 
todir="${maven.build.dir}/WEB-INF/templates/vm/portlets/html">
  -   <fileset dir="tutorials/12/templates/vm/portlets/html">
  -       <include name="**/*.vm"/>     
  -   </fileset>
  - </copy>   
  -</goal>
  -
  -<goal name="tutorial-all" 
  -        description="Build the complete tutorial">
  -    <antcall goal="tutorial-0"/>
  -    <antcall goal="tutorial-1"/>
  -    <antcall goal="tutorial-2"/>
  -    <antcall goal="tutorial-3"/>
  -    <antcall goal="tutorial-4"/>
  -    <antcall goal="tutorial-5"/>
  -    <antcall goal="tutorial-6"/>
  -    <antcall goal="tutorial-7"/> 
  -    <antcall goal="tutorial-8"/> 
  -    <antcall goal="tutorial-9"/> 
  -<!--    <antcall goal="tutorial-10"/> -->
  -<!--    <antcall goal="tutorial-12"/>  -->
  -</goal>
  -
  -
  -
  -</project>
  \ No newline at end of file
  +<project default="war" xmlns:j="jelly:core" xmlns:maven="jelly:maven" 
xmlns:ant="jelly:ant">
  +     <preGoal name="java:compile">
  +             <attainGoal name="torque:om"/>
  +             <attainGoal name="torque:sql"/>
  +     </preGoal>
  +     <preGoal name="jetspeed:war-config">
  +             <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}"/>
  +     </preGoal>
  +     <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">
  +             <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +                     <fileset dir="tutorials/1">
  +                             <include name="**/*.properties.merge"/>
  +                             <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>
  +     </goal>
  +     <goal name="tutorial-2" description="Localisation">
  +             <!-- <attainGoal name="tutorial-1"/> -->
  +             <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/templates/vm/navigations/html">
  +                     <fileset dir="tutorials/2/templates/vm/navigations/html">
  +                             <include name="**/*.vm"/>
  +                     </fileset>
  +             </copy>
  +     </goal>
  +     <goal name="tutorial-3" description="Site Map">
  +             <!-- <attainGoal name="tutorial-1"/> -->
  +             <!-- <attainGoal name="tutorial-2"/> -->
  +             <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>
  +     </goal>
  +     <goal name="tutorial-4" description="Site Security">
  +             <!-- <attainGoal name="tutorial-1"/> -->
  +             <!-- <attainGoal name="tutorial-2"/> -->
  +             <!-- <attainGoal name="tutorial-3"/> -->
  +             <copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
  +                     <fileset dir="tutorials/4">
  +                             <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/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/templates/vm/portlets/html">
  +                     <fileset dir="tutorials/4/templates/vm/portlets/html">
  +                             <include name="**/*.vm"/>
  +                     </fileset>
  +             </copy>
  +     </goal>
  +     <goal name="tutorial-5" description="Portlet 101">
  +             <!-- <attainGoal name="tutorial-1"/> -->
  +             <!-- <attainGoal name="tutorial-2"/> -->
  +             <!-- <attainGoal name="tutorial-3"/> -->
  +             <!-- <attainGoal name="tutorial-4"/> -->
  +             <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>
  +     </goal>
  +     <goal name="tutorial-6" description="Portlet Interface">
  +             <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>
  +     </goal>
  +     <goal name="tutorial-7" description="Velocity Portlet">
  +             <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/templates/vm/portlets/html">
  +                     <fileset dir="tutorials/7/templates/vm/portlets/html">
  +                             <include name="**/*.vm"/>
  +                     </fileset>
  +             </copy>
  +     </goal>
  +     <goal name="tutorial-8" description="Parameter Styles">
  +             <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/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>
  +     </goal>
  +     <goal name="tutorial-9" description="DatabaseBrowser Portlet">
  +             <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/templates/vm/portlets/html">
  +                     <fileset dir="tutorials/9/templates/vm/portlets/html">
  +                             <include name="**/*.vm"/>
  +                     </fileset>
  +             </copy>
  +     </goal>
  +     <goal name="tutorial-12" description="Parameter Styles">
  +             <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>
  +     </goal>
  +     <goal name="tutorial-all" description="Build the complete tutorial">
  +             <attainGoal name="tutorial-0"/>
  +             <attainGoal name="tutorial-1"/>
  +             <attainGoal name="tutorial-2"/>
  +             <attainGoal name="tutorial-3"/>
  +             <attainGoal name="tutorial-4"/>
  +             <attainGoal name="tutorial-5"/>
  +             <attainGoal name="tutorial-6"/>
  +             <attainGoal name="tutorial-7"/>
  +             <attainGoal name="tutorial-8"/>
  +             <attainGoal name="tutorial-9"/>
  +             <!--    <attainGoal name="tutorial-10"/> -->
  +             <!--    <attainGoal name="tutorial-12"/>  -->
  +     </goal>
  +</project>
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/src/webapp/WEB-INF/conf/Torque.properties.merge
  
  Index: Torque.properties.merge
  ===================================================================
  # Copyright 2004 The Apache Software Foundation
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  # 
  # http://www.apache.org/licenses/LICENSE-2.0
  # 
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/0/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 0 - Getting Started
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/0/JetspeedSecurity.properties.merge
  
  Index: JetspeedSecurity.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 0 - Getting Started
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/0/TurbineResources.properties.merge
  
  Index: TurbineResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 0 - Getting Started
  #
  # -------------------------------------------------------------------
  
  
  mytest = great!
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/1/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  1a. Changing the Portal Logo
  #
  # -------------------------------------------------------------------
  
  topnav.logo.file=images/jportal.gif
  
  # -------------------------------------------------------------------
  #
  #  1b. Modify the Top Navigation
  #
  # -------------------------------------------------------------------
         
  topnav.user_creation.enable=false
  
  # -------------------------------------------------------------------
  #
  #  1c. Remove the Left Navigation
  #
  # -------------------------------------------------------------------
  
  leftnav.enable=false
  
  # -------------------------------------------------------------------
  #
  #  1d. Replace the Bottom Navigation
  #
  # -------------------------------------------------------------------
  
  bottomnav.vm=bottom-jportal.vm
  
  # -------------------------------------------------------------------
  #
  #  1e. Change the Web Page Title
  #
  # -------------------------------------------------------------------
  
  portalpage.title_prefix=JPortal Tutorial:
  
  # -------------------------------------------------------------------
  #
  #  1f. Change the Portal Skin
  #
  # -------------------------------------------------------------------
  
  services.PortalToolkit.default.skin=jportal-skin
  site.stylesheet=css/jportal.css
  
  # -------------------------------------------------------------------
  #
  #  Properties to be removed (including comments)
  #
  # -------------------------------------------------------------------
  #-contentfeeds.
  #-#contentfeeds.
  #-daemon.
  #-services.DaemonFactory
  #-content.
  #-#content.
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/1/JetspeedSecurity.properties.merge
  
  Index: JetspeedSecurity.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 1
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/1/TurbineResources.properties.merge
  
  Index: TurbineResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 1
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/2/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 2
  #
  # -------------------------------------------------------------------
  
  [EMAIL PROTECTED]
  
  # Consider the language as part of the fallback?
  services.Profiler.fallback.language=false
  
  # Consider the country code as part of the fallback?
  services.Profiler.fallback.country=false
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/2/JetspeedSecurity.properties.merge
  
  Index: JetspeedSecurity.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 2
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/2/TurbineResources.properties.merge
  
  Index: TurbineResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 2
  #
  # -------------------------------------------------------------------
  module.packages=com.bluesunrise.jportal.modules
  
  
locale.default.bundles=com.bluesunrise.jportal.modules.localization.JPortalLocalization,org.apache.jetspeed.modules.localization.JetspeedLocalization
  locale.default.bundle=org.apache.jetspeed.modules.localization.JetspeedLocalization
  
  locale.default.language=en
  locale.default.country=US
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/3/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 3
  #
  # -------------------------------------------------------------------
  
  # services.PortalToolkit.default.control=TitlePortletControl
  # services.PortalToolkit.default.controller=OneColumn
  services.PortalToolkit.default.skin=jportal-skin
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/3/JetspeedSecurity.properties.merge
  
  Index: JetspeedSecurity.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 3
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/3/TurbineResources.properties.merge
  
  Index: TurbineResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 3
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/4/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 4
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/4/JetspeedSecurity.properties.merge
  
  Index: JetspeedSecurity.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 4
  #
  # -------------------------------------------------------------------
  #########################################
  # Programmatic Cascade Delete Service   #
  #########################################
  
  services.JetspeedSecurity.programmatic.cascade.delete=false
  
  # This is used by the SecurityService to make the password checking
  # secure. When enabled, passwords are transformed by a one-way
  # function into a sequence of bytes that is base64 encoded.
  # It is impossible to guess the plain-text form of the password
  # from the representation. When user logs in, the entered password
  # is transformed the same way and then compared with stored value.
  #
  # Default: false
  #
  
  services.JetspeedSecurity.secure.passwords=false
  
  #
  # This property lets you choose what digest algorithm will be used
  # for encrypting passwords. Check documentation of your JRE for
  # available algorithms.
  #
  # Default: SHA
  #
  
  services.JetspeedSecurity.secure.passwords.algorithm=SHA
  
  # Role(s) to assign to new user.  Multiple Role must be comma separated.
  services.JetspeedSecurity.newuser.roles=user
  
  # Default permission(s) when object have no permissions defined
  # The follow permissions are define in the default Jetspeed installation:
  #     view, customize, minimize, maximize, close
  #     * = All permissions
  services.JetspeedSecurity.permission.default.anonymous=view
  
  services.JetspeedSecurity.permission.default.loggedin=*
  
  # During logon, username and password can be case sensitive or case insensitive
  # This option configures the logon username and password to be case sensitive or 
insensitive
  # if its case insensitive, then "logon.casesensitive.upper" controls whether the 
username and
  # password or converted to upper or lower case before passing on to the database
  services.JetspeedSecurity.caseinsensitive.username=false
  services.JetspeedSecurity.caseinsensitive.password=false
  services.JetspeedSecurity.caseinsensitive.upper=true
  
  # Auto-Account-Disable Feature
  services.JetspeedSecurity.logon.auto.disable=false
  
  # 3 logon strikes per 300 seconds and your out
  services.JetspeedSecurity.logon.strike.count=3
  services.JetspeedSecurity.logon.strike.interval=300
  # dont allow more than 10 over any time period
  services.JetspeedSecurity.logon.strike.max=10
  
  # anonymous user
  services.JetspeedSecurity.user.anonymous=anon
  
  # Caching
  services.JetspeedSecurity.caching.enable=true
  
  #
  # Number of days until password expires. To disable
  # this feature, set it to 0.
  #
  # Default:  0
  #
  services.JetspeedSecurity.password.expiration.period=0
  
  #########################################
  # Action buttons                        #
  #########################################
  services.JetspeedSecurity.actions.anon.disable=true
  services.JetspeedSecurity.action.allusers.disable=false
  
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/4/TurbineResources.properties.merge
  
  Index: TurbineResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 4
  #
  # -------------------------------------------------------------------
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/5/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 5
  #
  # -------------------------------------------------------------------
  # automatically save user state on logout
  automatic.logout.save = false
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/6/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 6
  #
  # -------------------------------------------------------------------
  # Jetspeed can automatically create/instantiate all your Portlets and place them
  # in the cache when Jetspeed starts up.  
  autocreate.portlets=false
  
  #########################################
  # Portlet Cache                         #
  #########################################
  # TimeToLive.default = number of milliseconds an unused portlet will remain in cache.
  #                      Default 2700000 which is 45 minutes (45 * 60 * 1000)
  services.PortletCache.TimeToLive.default=2700000
  
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/7/JetspeedResources.properties.merge
  
  Index: JetspeedResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 7
  #
  # -------------------------------------------------------------------
  services.TemplateLocator.templateRoot=/WEB-INF/templates
  
  # The Default Template Locator (resolver)
  
services.TemplateLocator.classname=org.apache.jetspeed.services.template.JetspeedTemplateLocatorService
  
  
  
  
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/7/JetspeedSecurity.properties.merge
  
  Index: JetspeedSecurity.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 7
  #
  # -------------------------------------------------------------------
  services.JetspeedSecurity.actions.anon.disable=true
  
  
  1.1                  
jakarta-jetspeed/tutorial/tutorials/7/TurbineResources.properties.merge
  
  Index: TurbineResources.properties.merge
  ===================================================================
  # -------------------------------------------------------------------
  #
  #  Tutorial 7
  #
  # -------------------------------------------------------------------
  
  services.VelocityService.velocimacro.library = GlobalMacros.vm
  
  # This parameter supports a comma separated list of directories
  # Each directory is searched in order to find a template.
  # This is useful for example, in defining application specific templates in a 
separate structure from 
  # the jetspeed core templates
  # Note this needs to be set in 3 places - for the jsp loader and vm loader in TR.p 
and for the template locator in JR.p
  services.VelocityService.file.resource.loader.path = /WEB-INF/templates/vm
  
  
  
  

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

Reply via email to