Remove some hacks necessary for 4.0M1
git-svn-id: https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0@1766055 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
index 58c1fce..bb8d0d2 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
@@ -125,7 +125,7 @@
# modules before the others.
#
# Note: org.apache.turbine.modules will always be added to the search
-# path. If it is not explictly added here, it will be added to the
+# path. If it is not explicitly added here, it will be added to the
# end.
#
# Default: org.apache.turbine.modules
@@ -545,8 +545,6 @@
#
# -------------------------------------------------------------------
-services.VelocityService.earlyInit= true
-
# The location of Velocity configuration file, relative to webapp root
# These properties will override the default properties set by Velocity.
# You should specify the path to the templates directories as well as
@@ -564,7 +562,6 @@
# Set this to true to catch Velocity Errors and display them in the log file
services.VelocityService.catch.errors = true
-services.VelocityService.runtime.log=/logs/velocity.log
services.VelocityService.input.encoding=UTF-8
#
@@ -594,7 +591,7 @@
#
# Set enabled to true to start the scheduler. The scheduler can be
-# stopped and started after Turbine has been intialized. See the
+# stopped and started after Turbine has been initialized. See the
# javadocs for org.apache.turbine.services.schedule.TurbineScheduler
# for the methods calls.
#
@@ -631,13 +628,11 @@
#
# Name and location to the configuration file for the components.
#
-services.AvalonComponentService.containerConfiguration = #var("applicationRoot")/WEB-INF/conf/containerConfiguration.xml
-services.AvalonComponentService.earlyInit= true
+services.AvalonComponentService.containerConfiguration = /WEB-INF/conf/containerConfiguration.xml
#
# Name and location to the configuration file for the component roles.
#
-#services.AvalonComponentService.componentRoles = #var("applicationRoot")/WEB-INF/conf/roleConfiguration.xml
-
+#services.AvalonComponentService.componentRoles = /WEB-INF/conf/roleConfiguration.xml
#
#services.AvalonComponentService.componentConfiguration = /WEB-INF/conf/componentConfiguration.xml
