You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/02/12 19:23:33 UTC
cvs commit: jakarta-turbine-2/conf componentConfiguration.xml roleConfiguration.xml TurbineResources.properties
epugh 2004/02/12 10:23:33
Modified: conf componentConfiguration.xml roleConfiguration.xml
TurbineResources.properties
Log:
Update default configuration!
Revision Changes Path
1.2 +25 -1 jakarta-turbine-2/conf/componentConfiguration.xml
Index: componentConfiguration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/componentConfiguration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- componentConfiguration.xml 20 Jun 2003 00:11:04 -0000 1.1
+++ componentConfiguration.xml 12 Feb 2004 18:23:33 -0000 1.2
@@ -11,4 +11,28 @@
<torque>
<configfile>/WEB-INF/conf/Torque.properties</configfile>
</torque>
+ <cache cacheInitialSize="20" cacheCheckFrequency="5"/>
+ <mimetype/>
+ <crypto>
+ <algorithm>
+ <unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
+ <clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
+ <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
+ <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
+ </algorithm>
+ </crypto>
+ <localization>
+ <bundles>
+ <bundle>org.apache.fulcrum.localization.BarBundle</bundle>
+ <bundle>org.apache.fulcrum.localization.FooBundle</bundle>
+ <bundle>org.apache.fulcrum.localization.MissingBundle</bundle>
+ </bundles>
+ </localization>
+ <intake>
+ <serialDataPath>target/appData.ser</serialDataPath>
+ <xmlPaths>
+ <xmlPath>conf/test/intake.xml</xmlPath>
+ </xmlPaths>
+ </intake>
+ <factory/>
</componentConfig>
1.3 +31 -1 jakarta-turbine-2/conf/roleConfiguration.xml
Index: roleConfiguration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/roleConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- roleConfiguration.xml 20 Jun 2003 00:31:36 -0000 1.2
+++ roleConfiguration.xml 12 Feb 2004 18:23:33 -0000 1.3
@@ -11,5 +11,35 @@
<role name="org.apache.torque.avalon.Torque"
shorthand="torque"
default-class="org.apache.torque.avalon.TorqueComponent" />
+
+ <role
+ name="org.apache.fulcrum.cache.GlobalCacheService"
+ shorthand="cache"
+ default-class="org.apache.fulcrum.cache.DefaultGlobalCacheService"/>
+
+ <role
+ name="org.apache.fulcrum.mimetype.MimeTypeService"
+ shorthand="mimetype"
+ default-class="org.apache.fulcrum.mimetype.DefaultMimeTypeService"/>
+
+ <role
+ name="org.apache.fulcrum.crypto.CryptoService"
+ shorthand="crypto"
+ default-class="org.apache.fulcrum.crypto.DefaultCryptoService"/>
+
+ <role
+ name="org.apache.fulcrum.localization.LocalizationService"
+ shorthand="localization"
+ default-class="org.apache.fulcrum.localization.DefaultLocalizationService"/>
+
+ <role
+ name="org.apache.fulcrum.intake.IntakeService"
+ shorthand="intake"
+ default-class="org.apache.fulcrum.intake.IntakeServiceImpl"/>
+
+ <role
+ name="org.apache.fulcrum.factory.FactoryService"
+ shorthand="factory"
+ default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
</role-list>
1.54 +5 -175 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TurbineResources.properties 16 Oct 2003 11:37:44 -0000 1.53
+++ TurbineResources.properties 12 Feb 2004 18:23:33 -0000 1.54
@@ -318,23 +318,18 @@
# that depend on other services during initialization.
# -------------------------------------------------------------------
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.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
services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
-services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
-services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
-services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
services.SecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
-#services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
services.XSLTService.classname=org.apache.turbine.services.xslt.TurbineXSLTService
#services.SessionService.classname=org.apache.turbine.services.session.TurbineSessionService
@@ -356,16 +351,6 @@
services.RunDataService.default.parameter.parser=org.apache.turbine.util.parser.DefaultParameterParser
services.RunDataService.default.cookie.parser=org.apache.turbine.util.parser.DefaultCookieParser
-# -------------------------------------------------------------------
-#
-# C A C H E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Interval at which the cache will be checked. The default is
-# 5000ms or 5 seconds.
-
-services.GlobalCacheService.cache.check.frequency = 5000
# -------------------------------------------------------------------
#
@@ -632,49 +617,6 @@
# -------------------------------------------------------------------
#
-# L O C A L I Z A T I O N S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Default ResourceBundle and language/country codes used by the
-# TurbineLocalizationService.
-#
-locale.default.bundle=MyBundle
-locale.default.language=en
-locale.default.country=US
-
-#
-# This will set the charset= portion of the ContentType: header.
-# Leave commented out unless you want to return stuff as a different
-# charset.
-#
-# locale.default.charset=
-
-# -------------------------------------------------------------------
-#
-# M I M E T Y P E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# This property specifies a file containing mappings between MIME
-# content types and the corresponding file name extensions. The
-# service itself contains a hardcoded set of most common mappings.
-# The file must use the same syntax as the mime.types file of
-# the Apache Server, i.e.
-# <mimetype> <ext1> <ext2>...
-#
-#services.MimeTypeService.mime.types=/WEB-INF/conf/mime.types
-
-# This property specifies a file containing mappings between locales
-# and the corresponding character encodings. The service itself
-# contains a hardcoded set of most common mappings.
-# The file should use the Java property file syntax, i.e.
-# <lang_country_variant>=<charset>
-#
-#services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
-
-# -------------------------------------------------------------------
-#
# S C H E D U L E R S E R V I C E
#
# -------------------------------------------------------------------
@@ -697,37 +639,6 @@
# -------------------------------------------------------------------
#
-# C R Y P T O S E R V I C E
-#
-# -------------------------------------------------------------------
-
-#
-# Standard Unix crypt(3) password encryption.
-#
-services.CryptoService.algorithm.unix = org.apache.turbine.services.crypto.provider.UnixCrypt
-#
-# This providers allows access to the Java Message Digest encryption algorithms
-#
-services.CryptoService.algorithm.java = org.apache.turbine.services.crypto.provider.JavaCrypt
-#
-# This is a simple, cleartext "encryption" provider.
-#
-services.CryptoService.algorithm.cleartext = org.apache.turbine.services.crypto.provider.ClearCrypt
-#
-# Use this provider if you upgrade from Turbine 2.1 to current. It provides bug-to-bug
-# compatibility for passwords created with the old Security Service. See the javadocs for
-# OldJavaCrypt
-#
-services.CryptoService.algorithm.oldjava = org.apache.turbine.services.crypto.provider.OldJavaCrypt
-#
-# This is the default crypto provider. It implements the normal Java MessageDigest ciphers
-# You need not to have this, it is the default if no algorithms are given. The default
-# provider gives you all the Java MessageDigest Ciphers
-#
-services.CryptoService.algorithm.default = org.apache.turbine.services.crypto.provider.JavaCrypt
-
-# -------------------------------------------------------------------
-#
# S E C U R I T Y S E R V I C E
#
# -------------------------------------------------------------------
@@ -1067,30 +978,7 @@
services.XSLTService.path = /path/to/stylesheets
services.XSLTService.cache = false
-# -------------------------------------------------------------------
-#
-# I N T A K E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# The location of the xml file specifying valid inputs
-#
-# If you need to define multiple definition files, you can should
-# seperate them with commas.
-#
-# Default: WEB-INF/conf/intake.xml
-#
-services.IntakeService.xml.path=WEB-INF/conf/intake.xml
-# This file is used to cache the XML definitions after they are
-# parsed. It provides for a small performance gain on startup.
-#
-# Note: Even if you have multiple XML definition files, you will
-# only need one serialization file!
-#
-# Default: WEB-INF/appData.ser
-#
-services.IntakeService.serialize.path=WEB-INF/appData.ser
#--------------------------------------------------------------------
#
@@ -1107,56 +995,6 @@
url.case.folding=lower
-# -------------------------------------------------------------------
-#
-# C O M P O N E N T S E R V I C E
-#
-# -------------------------------------------------------------------
-# Components implementing the lifecycle interfaces can be loaded,
-# configured and initialized by Turbine
-# -------------------------------------------------------------------
-# THE COMPOINENTSERVICE IS DEPRECATED!!!!
-# You should use the AvalonComponentService instead!
-# -------------------------------------------------------------------
-
-#
-# Here you define the names of the various components to load. These
-# names are used as identifiers later so you can choose them freely. It
-# is, however, sensible to use the same names as the component projects
-# that you want to load.
-#
-services.ComponentService.name = torque
-
-#
-# This is the class of the component to be loaded.
-#
-# It must implement the org.apache.stratum.lifecycle.Initializable and
-# org.apache.stratum.lifecycle.Configurable interface to be loaded.
-#
-# It may implement the org.apache.stratum.lifecycle.Disposable interface.
-# If it does, the Component is disposed at shutdown (Servlet destroy()) time.
-#
-services.ComponentService.torque.classname = org.apache.torque.Torque
-
-#
-# This is the path to the Config file of the Component. It is relative
-# to the Root of the Application (either the Webroot given by the Servlet
-# Container or the Root given to TurbineConfig at startup time)
-#
-services.ComponentService.torque.config = /WEB-INF/conf/Torque.properties
-
-#
-# Properties can be given directly to Components. This sets the "foo"
-# property for torque to "bar".
-#
-#services.ComponentService.torque.property.foo = bar
-
-#
-# This is an example of how to load Fulcrum as a component
-#
-#services.ComponentService.name = fulcrum
-#services.ComponentService.fulcrum.classname = org.apache.fulcrum.Fulcrum
-#services.ComponentService.fulcrum.config = /WEB-INF/conf/Fulcrum.properties
# -------------------------------------------------------------------
#
@@ -1182,6 +1020,10 @@
# at startup time
services.AvalonComponentService.lookup = org.apache.torque.avalon.Torque
+#
+# Other services you want to startup early
+#
+services.AvalonComponentService.lookup = org.apache.fulcrum.cache.GlobalCacheService
# -------------------------------------------------------------------
#
@@ -1190,17 +1032,5 @@
# -------------------------------------------------------------------
services.SessionService.earlyInit=true
-
-# -------------------------------------------------------------------
-#
-# A D D I T I O N A L P R O P E R T I E S
-#
-# -------------------------------------------------------------------
-# The full path name to an additional properties file. Properties in
-# this file will be included in this property set. Duplicate name
-# values will be replaced, so be careful.
-#
-# Default: none
-# -------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org