You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2009/04/13 18:55:03 UTC
svn commit: r764526 - in /turbine/core/trunk/conf:
TurbineResources.properties roleConfiguration.xml
test/CompleteTurbineResources.properties test/fulcrumRoleConfiguration.xml
Author: tv
Date: Mon Apr 13 16:55:02 2009
New Revision: 764526
URL: http://svn.apache.org/viewvc?rev=764526&view=rev
Log:
Use Fulcrum XSLT-Service, remove configuration traces of old implementations
Modified:
turbine/core/trunk/conf/TurbineResources.properties
turbine/core/trunk/conf/roleConfiguration.xml
turbine/core/trunk/conf/test/CompleteTurbineResources.properties
turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml
Modified: turbine/core/trunk/conf/TurbineResources.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/TurbineResources.properties?rev=764526&r1=764525&r2=764526&view=diff
==============================================================================
--- turbine/core/trunk/conf/TurbineResources.properties (original)
+++ turbine/core/trunk/conf/TurbineResources.properties Mon Apr 13 16:55:02 2009
@@ -818,104 +818,6 @@
# services.SecurityService.ldap.user.password=userPassword
-
-# -------------------------------------------------------------------
-#
-# X M L R P C S E R V I C E
-#
-# -------------------------------------------------------------------
-# This property specifies which class should be used to parse
-# xml for XmlRpc functionality.
-#
-# Default: org.apache.xerces.parsers.SAXParser
-
-services.XmlRpcService.parser=org.apache.xerces.parsers.SAXParser
-
-# This property specifies which network interface the server part of
-# XmlRpc should bind to (if it is active). If not specified, the
-# server will bind to all addresses configured for your host.
-#
-# Default: 127.0.0.1
-
-# services.XmlRpcService.address=127.0.0.1
-
-# This property specifies which TCP port the web server part of
-# XmlRpc should listen on (if it is active).
-#
-# Default: 12345
-
-services.XmlRpcService.port=12345
-
-# If any classes are specified here, the Service will create an
-# instance of them here and start up a listener on the specified
-# port.
-#
-# Note that the handlers demonstrated are not very useful. You
-# will have to invent your own services. They do however
-# illustrate that any class with a default constructor can be
-# added here
-#
-# The handler parameter without further extension determines
-# the default handler for the service
-#
-# Default: no classes are specified by default
-
-# services.XmlRpcService.handler.$default=java.util.Hashtable
-# services.XmlRpcService.handler.stringhandler=java.lang.String
-
-# The following properties allow the transfer of data between
-# separate Turbine applications running on different servers.
-# This allows B2B type behavior such as sending database
-# updates in the form of XML or whatever type of data
-# that needs to be shared between Turbine applications
-# running on separate servers.
-
-services.XmlRpcService.handler.file = org.apache.turbine.services.xmlrpc.util.FileHandler
-services.XmlRpcService.paranoid = false
-services.XmlRpcService.acceptClient = 192.168.1.*
-services.XmlRpcService.denyClient =
-
-# Do we want a secure server
-
-services.XmlRpcService.secure.server = false
-
-# Secure server options
-
-services.XmlRpcService.secure.server.option.java.protocol.handler.pkgs = \
- com.sun.net.ssl.internal.www.protocol
-
-services.XmlRpcService.secure.server.option.security.provider = \
- com.sun.net.ssl.internal.ssl.Provider
-
-services.XmlRpcService.secure.server.option.security.protocol = TLS
-
-# You probably want to keep your key stores and trust stores
-# clear out of your webapp.
-
-services.XmlRpcService.secure.server.option.javax.net.ssl.keyStore = /tmp/keystore
-services.XmlRpcService.secure.server.option.javax.net.ssl.keyStoreType = jks
-services.XmlRpcService.secure.server.option.javax.net.ssl.keyStorePassword = password
-services.XmlRpcService.secure.server.option.javax.net.ssl.trustStore = /tmp/truststore
-services.XmlRpcService.secure.server.option.javax.net.ssl.trustStoreType = jks
-services.XmlRpcService.secure.server.option.javax.net.ssl.trustStorePassword = password
-
-services.XmlRpcService.secure.server.option.sun.ssl.keymanager.type = SunX509
-services.XmlRpcService.secure.server.option.sun.ssl.trust.manager.type = SunX509
-
-# These values should be set to 'all' for debugging purposes.
-
-services.XmlRpcService.secure.server.option.javax.net.debug = none
-services.XmlRpcService.secure.server.option.java.security.debug = none
-
-# --------------------------------------------------------------------
-#
-# X S L T S E R V I C E
-#
-# --------------------------------------------------------------------
-
-services.XSLTService.path = /path/to/stylesheets
-services.XSLTService.cache = false
-
# -------------------------------------------------------------------
#
# A V A L O N C O M P O N E N T S E R V I C E
@@ -953,4 +855,3 @@
services.SessionService.earlyInit=true
-
Modified: turbine/core/trunk/conf/roleConfiguration.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/roleConfiguration.xml?rev=764526&r1=764525&r2=764526&view=diff
==============================================================================
--- turbine/core/trunk/conf/roleConfiguration.xml (original)
+++ turbine/core/trunk/conf/roleConfiguration.xml Mon Apr 13 16:55:02 2009
@@ -76,5 +76,9 @@
shorthand="parser"
default-class="org.apache.fulcrum.parser.DefaultParserService"/>
+ <role
+ name="org.apache.fulcrum.xslt.XSLTService"
+ shorthand="xslt"
+ default-class="org.apache.fulcrum.xslt.DefaultXSLTService"/>
</role-list>
Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=764526&r1=764525&r2=764526&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Mon Apr 13 16:55:02 2009
@@ -767,104 +767,6 @@
# services.SecurityService.ldap.user.password=userPassword
-
-# -------------------------------------------------------------------
-#
-# X M L R P C S E R V I C E
-#
-# -------------------------------------------------------------------
-# This property specifies which class should be used to parse
-# xml for XmlRpc functionality.
-#
-# Default: org.apache.xerces.parsers.SAXParser
-
-services.XmlRpcService.parser=org.apache.xerces.parsers.SAXParser
-
-# This property specifies which network interface the server part of
-# XmlRpc should bind to (if it is active). If not specified, the
-# server will bind to all addresses configured for your host.
-#
-# Default: 127.0.0.1
-
-# services.XmlRpcService.address=127.0.0.1
-
-# This property specifies which TCP port the web server part of
-# XmlRpc should listen on (if it is active).
-#
-# Default: 12345
-
-services.XmlRpcService.port=12345
-
-# If any classes are specified here, the Service will create an
-# instance of them here and start up a listener on the specified
-# port.
-#
-# Note that the handlers demonstrated are not very useful. You
-# will have to invent your own services. They do however
-# illustrate that any class with a default constructor can be
-# added here
-#
-# The handler parameter without further extension determines
-# the default handler for the service
-#
-# Default: no classes are specified by default
-
-# services.XmlRpcService.handler.$default=java.util.Hashtable
-# services.XmlRpcService.handler.stringhandler=java.lang.String
-
-# The following properties allow the transfer of data between
-# separate Turbine applications running on different servers.
-# This allows B2B type behavior such as sending database
-# updates in the form of XML or whatever type of data
-# that needs to be shared between Turbine applications
-# running on separate servers.
-
-services.XmlRpcService.handler.file = org.apache.turbine.services.xmlrpc.util.FileHandler
-services.XmlRpcService.paranoid = false
-services.XmlRpcService.acceptClient = 192.168.1.*
-services.XmlRpcService.denyClient =
-
-# Do we want a secure server
-
-services.XmlRpcService.secure.server = false
-
-# Secure server options
-
-services.XmlRpcService.secure.server.option.java.protocol.handler.pkgs = \
- com.sun.net.ssl.internal.www.protocol
-
-services.XmlRpcService.secure.server.option.security.provider = \
- com.sun.net.ssl.internal.ssl.Provider
-
-services.XmlRpcService.secure.server.option.security.protocol = TLS
-
-# You probably want to keep your key stores and trust stores
-# clear out of your webapp.
-
-services.XmlRpcService.secure.server.option.javax.net.ssl.keyStore = /tmp/keystore
-services.XmlRpcService.secure.server.option.javax.net.ssl.keyStoreType = jks
-services.XmlRpcService.secure.server.option.javax.net.ssl.keyStorePassword = password
-services.XmlRpcService.secure.server.option.javax.net.ssl.trustStore = /tmp/truststore
-services.XmlRpcService.secure.server.option.javax.net.ssl.trustStoreType = jks
-services.XmlRpcService.secure.server.option.javax.net.ssl.trustStorePassword = password
-
-services.XmlRpcService.secure.server.option.sun.ssl.keymanager.type = SunX509
-services.XmlRpcService.secure.server.option.sun.ssl.trust.manager.type = SunX509
-
-# These values should be set to 'all' for debugging purposes.
-
-services.XmlRpcService.secure.server.option.javax.net.debug = none
-services.XmlRpcService.secure.server.option.java.security.debug = none
-
-# --------------------------------------------------------------------
-#
-# X S L T S E R V I C E
-#
-# --------------------------------------------------------------------
-
-services.XSLTService.path = /path/to/stylesheets
-services.XSLTService.cache = false
-
# -------------------------------------------------------------------
#
# A V A L O N C O M P O N E N T S E R V I C E
Modified: turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml?rev=764526&r1=764525&r2=764526&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml (original)
+++ turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml Mon Apr 13 16:55:02 2009
@@ -67,6 +67,11 @@
name="org.apache.fulcrum.parser.ParserService"
shorthand="parser"
default-class="org.apache.fulcrum.parser.DefaultParserService"/>
+
+ <role
+ name="org.apache.fulcrum.xslt.XSLTService"
+ shorthand="xslt"
+ default-class="org.apache.fulcrum.xslt.DefaultXSLTService"/>
<!--role name="org.apache.torque.avalon.Torque"
shorthand="torque"