commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prick...@apache.org
Subject cvs commit: jakarta-commons-sandbox/periodicity/conf/turbine TurbineResources.properties
Date Mon, 25 Mar 2002 06:07:44 GMT
prickett    02/03/24 22:07:44

  Modified:    periodicity build.xml
               periodicity/conf/tomcat web.xml
               periodicity/conf/torque build.jars.properties
               periodicity/conf/turbine TurbineResources.properties
  Log:
  Added turbine jar to the build classpath
  Added default velocity templates from the TDK to the web archive
  Fixed url pattern matching bug in the web.xml configuration file
  Added turbine.jar property to the build.jars.properties file
  Added a default template service to the TurbineResources configuration file
  Added org.apache.commons.periodicity.turbine to the turbine module path
      in the TurbineResources configuration file
  
  Revision  Changes    Path
  1.18      +10 -0     jakarta-commons-sandbox/periodicity/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	24 Mar 2002 05:48:10 -0000	1.17
  +++ build.xml	25 Mar 2002 06:07:43 -0000	1.18
  @@ -34,6 +34,7 @@
       <pathelement location="${stratum.jar}"/>
       <pathelement location="${tdk.jar}"/>
       <pathelement location="${torque.jar}"/>
  +    <pathelement location="${turbine.jar}"/>
     </path>
   
     <target name="mv-src">
  @@ -142,6 +143,8 @@
             todir="${build.war}/WEB-INF/templates/navigations"/>
       <copy file="${tdk.home}/Index.vm"
             todir="${build.war}/WEB-INF/templates/screens"/>
  +    <copy file="${tdk.home}/Menu.vm"
  +          todir="${build.war}/WEB-INF/templates/navigations"/>
       <copy todir="${build.war}/${javadoc.dir}">
         <fileset dir="${javadoc.dir}"/>
       </copy>  
  @@ -191,13 +194,20 @@
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/layouts/Default.vm"
dest="${tdk.home}/Default.vm"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultTop.vm"
dest="${tdk.home}/DefaultTop.vm"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultBottom.vm"
dest="${tdk.home}/DefaultBottom.vm"/>
  +    <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/Menu.vm"
dest="${tdk.home}/Menu.vm"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/screens/Index.vm"
dest="${tdk.home}/Index.vm"/>
  +    <tar tarfile="${lib.repo}/tdk-templates.tar"
  +         basedir="${tdk.home}"/>
  +    <gzip src="${lib.repo}/tdk-templates.tar" 
  +          zipfile="${lib.repo}/tdk-templates.tar.gz"/>
  +    <delete file="${lib.repo}/tdk-templates.tar"/>      
     </target>  
   
     <target name="update-dependencies">
       <mkdir dir="${torque.home}"/>
       <antcall target="update-jars"/>
       <antcall target="update-id-xml"/>
  +    <antcall target="update-tdk-templates"/>
     </target>  
   
     <target name="generate-create-sql" depends="extract-torque-files">
  
  
  
  1.2       +1 -1      jakarta-commons-sandbox/periodicity/conf/tomcat/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/conf/tomcat/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml	25 Mar 2002 00:29:03 -0000	1.1
  +++ web.xml	25 Mar 2002 06:07:43 -0000	1.2
  @@ -17,6 +17,6 @@
      </servlet-mapping>   
      <servlet-mapping>
         <servlet-name>turbine</servlet-name>
  -      <url-pattern>/turbine*</url-pattern>
  +      <url-pattern>/turbine/*</url-pattern>
      </servlet-mapping>   
   </web-app>   
  
  
  
  1.4       +1 -0      jakarta-commons-sandbox/periodicity/conf/torque/build.jars.properties
  
  Index: build.jars.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/conf/torque/build.jars.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.jars.properties	17 Mar 2002 21:04:24 -0000	1.3
  +++ build.jars.properties	25 Mar 2002 06:07:43 -0000	1.4
  @@ -11,3 +11,4 @@
   stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
   torque.jar=${lib.repo}/torque-3.0-dev.jar
   tdk.jar= ${lib.repo}/tdk.jar
  +turbine.jar=${lib.repo}/turbine-2.2-b2-dev.jar
  
  
  
  1.2       +13 -2     jakarta-commons-sandbox/periodicity/conf/turbine/TurbineResources.properties
  
  Index: TurbineResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/conf/turbine/TurbineResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TurbineResources.properties	25 Mar 2002 00:36:41 -0000	1.1
  +++ TurbineResources.properties	25 Mar 2002 06:07:43 -0000	1.2
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.1 2002/03/25 00:36:41 prickett Exp $
  +# $Id: TurbineResources.properties,v 1.2 2002/03/25 06:07:43 prickett Exp $
   #
   # This is the configuration file for Turbine.
   #
  @@ -8,6 +8,17 @@
   #
   # -------------------------------------------------------------------
   
  +layout.default=VelocityECSLayout
  +page.default=VelocityPage
  +
  +template.default.extension=vm
  +template.path=/templates
  +template.default.navigation=VelocityNavigation
  +template.default.screen=VelocityScreen
  +template.default.layout=/Default.vm
  +template.error=/Error.vm
  +template.service=services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
  +
   # -------------------------------------------------------------------
   #
   #  L O G S
  @@ -152,7 +163,7 @@
   # Default: org.apache.turbine.modules
   # -------------------------------------------------------------------
   
  -module.packages=org.apache.turbine.modules
  +module.packages=org.apache.turbine.modules,org.apache.commons.periodicity.turbine
   
   # -------------------------------------------------------------------
   #
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message