Author: henning Date: Mon Sep 12 01:34:26 2005 New Revision: 280289 URL: http://svn.apache.org/viewcvs?rev=280289&view=rev Log: cleaned up comments. Moved TurbineResources.properties into the 2.3 and 2.3.1 flavors, because 2.3.2 has a different TurbineResources.properties file.
Added: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/conf/ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/conf/TurbineResources.properties - copied, changed from r280287, jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/conf/ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/conf/TurbineResources.properties - copied, changed from r280287, jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties Removed: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties Modified: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/normal.properties jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/setup/setup.properties Modified: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties?rev=280289&r1=280288&r2=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties Mon Sep 12 01:34:26 2005 @@ -6,11 +6,11 @@ # # ------------------------------------------------------------------- -######################################################################## +# ####################################################################### # # Additional Packages for loading Modules # -######################################################################## +# ####################################################################### # This is the package for your application classes module.packages = @[EMAIL PROTECTED] @@ -63,10 +63,10 @@ # services.IntakeService.xml.path = WEB-INF/conf/@[EMAIL PROTECTED] -######################################################################## +# ####################################################################### # # Add your application specific extensions here. # -######################################################################## +# ####################################################################### Modified: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties?rev=280289&r1=280288&r2=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties Mon Sep 12 01:34:26 2005 @@ -48,11 +48,11 @@ [EMAIL PROTECTED]@ = DEBUG, app [EMAIL PROTECTED]@ = false -######################################################################## +# ####################################################################### # # Logfile definitions # -######################################################################## +# ####################################################################### # # turbine.log Copied: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/conf/TurbineResources.properties (from r280287, jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties) URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/conf/TurbineResources.properties?p2=jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/conf/TurbineResources.properties&p1=jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties&r1=280287&r2=280289&rev=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/conf/TurbineResources.properties Mon Sep 12 01:34:26 2005 @@ -185,7 +185,7 @@ # as first action and does not allow any operation before the user has # logged in # -#action.sessionvalidator=sessionvalidator.TemplateSecureSessionValidator +# action.sessionvalidator=sessionvalidator.TemplateSecureSessionValidator # This is the timeout in seconds for sessions. If left commented out, the # servlet container's default timeout will be left as is. @@ -262,7 +262,7 @@ # ------------------------------------------------------------------- services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService -#services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService +# services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService @@ -409,7 +409,7 @@ tool.request.page=org.apache.turbine.util.template.HtmlPageAttributes tool.request.content=org.apache.turbine.services.pull.tools.ContentTool -#This pull tool is to allow for easy formatting of Date object into Strings +# This pull tool is to allow for easy formatting of Date object into Strings tool.request.dateFormatter=org.apache.turbine.services.pull.util.DateFormatter # Use this tool if you need a place to store data that will persist between @@ -417,11 +417,11 @@ tool.session.sessionData=org.apache.turbine.services.pull.util.SessionData # These are intake tools. -#tool.request.om=org.apache.turbine.om.OMTool +# tool.request.om=org.apache.turbine.om.OMTool tool.request.intake=org.apache.turbine.services.intake.IntakeTool # This is a tool that allows access to the scheduler service. -#tool.request.scheduler=org.apache.turbine.services.SchedulerTool +# tool.request.scheduler=org.apache.turbine.services.SchedulerTool # # The content tool can put its URIs through the Servlet container, @@ -467,7 +467,7 @@ services.VelocityService.default.layout.template = Default.vm services.VelocityService.runtime.log=/logs/velocity.log -#services.VelocityService.input.encoding=UTF-8 +# services.VelocityService.input.encoding=UTF-8 # # Class Path Loader, Turbine jar @@ -591,7 +591,7 @@ # Class specific capacities used instead of the default if specified. # -#services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512 +# services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512 # ------------------------------------------------------------------- # @@ -603,7 +603,7 @@ # # Example: org.foo.bar.MyClassLoader, org.ack.joe.YourClassLoader # -#services.FactoryService.class.loaders= +# services.FactoryService.class.loaders= # Customized factories to be used instead of the default factory. # E.g. to instantiate XML parsers, SSL sockets, etc., which require @@ -634,13 +634,13 @@ # Default: WEB-INF/appData.ser # services.IntakeService.serialize.path= none -#WEB-INF/appData.ser +# WEB-INF/appData.ser -#-------------------------------------------------------------------- +# -------------------------------------------------------------------- # # P A R A M E T E R P A R S E R # -#-------------------------------------------------------------------- +# -------------------------------------------------------------------- # # This variable controls the case folding applied to URL variable # names. Copied: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/conf/TurbineResources.properties (from r280287, jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties) URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/conf/TurbineResources.properties?p2=jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/conf/TurbineResources.properties&p1=jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties&r1=280287&r2=280289&rev=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/conf/TurbineResources.properties Mon Sep 12 01:34:26 2005 @@ -185,7 +185,7 @@ # as first action and does not allow any operation before the user has # logged in # -#action.sessionvalidator=sessionvalidator.TemplateSecureSessionValidator +# action.sessionvalidator=sessionvalidator.TemplateSecureSessionValidator # This is the timeout in seconds for sessions. If left commented out, the # servlet container's default timeout will be left as is. @@ -262,7 +262,7 @@ # ------------------------------------------------------------------- services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService -#services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService +# services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService @@ -409,7 +409,7 @@ tool.request.page=org.apache.turbine.util.template.HtmlPageAttributes tool.request.content=org.apache.turbine.services.pull.tools.ContentTool -#This pull tool is to allow for easy formatting of Date object into Strings +# This pull tool is to allow for easy formatting of Date object into Strings tool.request.dateFormatter=org.apache.turbine.services.pull.util.DateFormatter # Use this tool if you need a place to store data that will persist between @@ -417,11 +417,11 @@ tool.session.sessionData=org.apache.turbine.services.pull.util.SessionData # These are intake tools. -#tool.request.om=org.apache.turbine.om.OMTool +# tool.request.om=org.apache.turbine.om.OMTool tool.request.intake=org.apache.turbine.services.intake.IntakeTool # This is a tool that allows access to the scheduler service. -#tool.request.scheduler=org.apache.turbine.services.SchedulerTool +# tool.request.scheduler=org.apache.turbine.services.SchedulerTool # # The content tool can put its URIs through the Servlet container, @@ -467,7 +467,7 @@ services.VelocityService.default.layout.template = Default.vm services.VelocityService.runtime.log=/logs/velocity.log -#services.VelocityService.input.encoding=UTF-8 +# services.VelocityService.input.encoding=UTF-8 # # Class Path Loader, Turbine jar @@ -591,7 +591,7 @@ # Class specific capacities used instead of the default if specified. # -#services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512 +# services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512 # ------------------------------------------------------------------- # @@ -603,7 +603,7 @@ # # Example: org.foo.bar.MyClassLoader, org.ack.joe.YourClassLoader # -#services.FactoryService.class.loaders= +# services.FactoryService.class.loaders= # Customized factories to be used instead of the default factory. # E.g. to instantiate XML parsers, SSL sockets, etc., which require @@ -634,13 +634,13 @@ # Default: WEB-INF/appData.ser # services.IntakeService.serialize.path= none -#WEB-INF/appData.ser +# WEB-INF/appData.ser -#-------------------------------------------------------------------- +# -------------------------------------------------------------------- # # P A R A M E T E R P A R S E R # -#-------------------------------------------------------------------- +# -------------------------------------------------------------------- # # This variable controls the case folding applied to URL variable # names. Modified: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties?rev=280289&r1=280288&r2=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties Mon Sep 12 01:34:26 2005 @@ -13,7 +13,7 @@ # development mailing list at turbine-dev@jakarta.apache.org # -###################################################################### +# ##################################################################### # # You don't need to change anything below this line. These parameters # are for plugin internal use. If you change them and the compilation Modified: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/normal.properties URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/normal.properties?rev=280289&r1=280288&r2=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/normal.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/mode/normal.properties Mon Sep 12 01:34:26 2005 @@ -13,7 +13,7 @@ # development mailing list at turbine-dev@jakarta.apache.org # -###################################################################### +# ##################################################################### # # You don't need to change anything below this line. These parameters # are for plugin internal use. If you change them and the compilation Modified: jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/setup/setup.properties URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/setup/setup.properties?rev=280289&r1=280288&r2=280289&view=diff ============================================================================== --- jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/setup/setup.properties (original) +++ jakarta/turbine/core/trunk/extensions/maven-plugin/src/plugin-resources/setup/setup.properties Mon Sep 12 01:34:26 2005 @@ -51,7 +51,7 @@ # Shall we create id table SQL @[EMAIL PROTECTED] = @TURBINE_APP_TORQUE_USE_IDTABLE@ -###################################################################### +# ##################################################################### # # You don't need to change anything below this line. These parameters # are for plugin internal use. If you change them and the compilation --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]