You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/08/06 16:17:57 UTC
svn commit: r563146 - /lenya/trunk/src/modules-core/ac/config/cocoon-xconf/
Author: nettings
Date: Mon Aug 6 07:17:56 2007
New Revision: 563146
URL: http://svn.apache.org/viewvc?view=rev&rev=563146
Log:
no functional changes.
removed erroneous comments from xpatch files.
whitenoise.
Modified:
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-control-input-module.xconf
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-controller-resolvers.xconf
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/accreditable-manager-factory.xconf
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authenticator.xconf
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authorizers.xconf
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/bypassable-access-controller.xconf
lenya/trunk/src/modules-core/ac/config/cocoon-xconf/policy-managers.xconf
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-control-input-module.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-control-input-module.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-control-input-module.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-control-input-module.xconf Mon Aug 6 07:17:56 2007
@@ -16,12 +16,7 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon/input-modules" unless="/cocoon/input-modules/component-instance[@name = 'access-control']">
- <component-instance logger="core.modules.input.access-control" name="access-control"
- class="org.apache.lenya.cms.cocoon.components.modules.input.AccessControlModule"/>
- </xconf>
+<xconf xpath="/cocoon/input-modules" unless="/cocoon/input-modules/component-instance[@name = 'access-control']">
+ <component-instance logger="core.modules.input.access-control" name="access-control"
+ class="org.apache.lenya.cms.cocoon.components.modules.input.AccessControlModule"/>
+</xconf>
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-controller-resolvers.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-controller-resolvers.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-controller-resolvers.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/access-controller-resolvers.xconf Mon Aug 6 07:17:56 2007
@@ -16,27 +16,22 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon" unless="/cocoon/access-controller-resolvers">
- <access-controller-resolvers>
- <component-instance name="publication"
- class="org.apache.lenya.cms.ac.PublicationAccessControllerResolver"
- logger="lenya.ac.accesscontrollerresolver.publication">
- </component-instance>
- <component-instance name="global"
- class="org.apache.lenya.ac.impl.ConfigurableAccessControllerResolver"
- logger="lenya.ac.accesscontrollerresolver.global">
- <access-controller type="global"/>
- </component-instance>
- <component-instance name="composable"
- class="org.apache.lenya.ac.impl.ComposableAccessControllerResolver"
- logger="lenya.ac.accesscontrollerresolver.composable">
- <resolver type="publication"/>
- <!-- <resolver type="global"/>-->
- </component-instance>
- </access-controller-resolvers>
- </xconf>
+<xconf xpath="/cocoon" unless="/cocoon/access-controller-resolvers">
+ <access-controller-resolvers>
+ <component-instance name="publication"
+ class="org.apache.lenya.cms.ac.PublicationAccessControllerResolver"
+ logger="lenya.ac.accesscontrollerresolver.publication">
+ </component-instance>
+ <component-instance name="global"
+ class="org.apache.lenya.ac.impl.ConfigurableAccessControllerResolver"
+ logger="lenya.ac.accesscontrollerresolver.global">
+ <access-controller type="global"/>
+ </component-instance>
+ <component-instance name="composable"
+ class="org.apache.lenya.ac.impl.ComposableAccessControllerResolver"
+ logger="lenya.ac.accesscontrollerresolver.composable">
+ <resolver type="publication"/>
+ <!-- <resolver type="global"/>-->
+ </component-instance>
+ </access-controller-resolvers>
+</xconf>
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/accreditable-manager-factory.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/accreditable-manager-factory.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/accreditable-manager-factory.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/accreditable-manager-factory.xconf Mon Aug 6 07:17:56 2007
@@ -16,13 +16,8 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.ac.AccreditableManagerFactory']">
- <component logger="lenya.ac.accreditablemanager"
- role="org.apache.lenya.ac.AccreditableManagerFactory"
- class="org.apache.lenya.ac.file.FileAccreditableManagerFactory"/>
- </xconf>
+<xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.ac.AccreditableManagerFactory']">
+ <component logger="lenya.ac.accreditablemanager"
+ role="org.apache.lenya.ac.AccreditableManagerFactory"
+ class="org.apache.lenya.ac.file.FileAccreditableManagerFactory"/>
+</xconf>
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authenticator.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authenticator.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authenticator.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authenticator.xconf Mon Aug 6 07:17:56 2007
@@ -16,22 +16,17 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.ac.Authenticator']">
- <component logger="lenya.ac.authenticator"
- class="org.apache.lenya.ac.impl.UserAuthenticator"
- role="org.apache.lenya.ac.Authenticator"/>
-
- <!--
- Enable this authenticator and disable the UserAuthenticator for anonymous authentication (useful for client certs, for instance)
-
- <component logger="lenya.ac.authenticator"
- class="org.apache.lenya.ac.impl.AnonymousAuthenticator"
- role="org.apache.lenya.ac.Authenticator"/>
- -->
+<xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.ac.Authenticator']">
+ <component logger="lenya.ac.authenticator"
+ class="org.apache.lenya.ac.impl.UserAuthenticator"
+ role="org.apache.lenya.ac.Authenticator"/>
+
+ <!--
+ Enable this authenticator and disable the UserAuthenticator for anonymous authentication (useful for client certs, for instance)
- </xconf>
+ <component logger="lenya.ac.authenticator"
+ class="org.apache.lenya.ac.impl.AnonymousAuthenticator"
+ role="org.apache.lenya.ac.Authenticator"/>
+ -->
+
+</xconf>
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authorizers.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authorizers.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authorizers.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/authorizers.xconf Mon Aug 6 07:17:56 2007
@@ -16,16 +16,10 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon" unless="/cocoon/authorizers/component-instance[@name = 'policy']">
- <authorizers>
- <component-instance name="policy"
- class="org.apache.lenya.ac.impl.PolicyAuthorizer"
- logger="lenya.ac.authorizer.policy"/>
- </authorizers>
- </xconf>
-
+<xconf xpath="/cocoon" unless="/cocoon/authorizers/component-instance[@name = 'policy']">
+ <authorizers>
+ <component-instance name="policy"
+ class="org.apache.lenya.ac.impl.PolicyAuthorizer"
+ logger="lenya.ac.authorizer.policy"/>
+ </authorizers>
+</xconf>
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/bypassable-access-controller.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/bypassable-access-controller.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/bypassable-access-controller.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/bypassable-access-controller.xconf Mon Aug 6 07:17:56 2007
@@ -16,21 +16,16 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.ac.AccessController/bypassable']">
- <component logger="lenya.ac.accesscontroller.bypassable"
- class="org.apache.lenya.ac.impl.BypassableAccessController"
- role="org.apache.lenya.ac.AccessController/bypassable">
-
- <public-extensions>css,jpg,gif,png,rng,xsl</public-extensions>
-
- <!-- bad performance, use only for complex patterns
- <public>.*[.]css|.*[.]jpg|.*[.]gif|.*[.]png|.*[.]rng|.*[.]xsl</public>
- -->
-
- </component>
- </xconf>
+<xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.ac.AccessController/bypassable']">
+ <component logger="lenya.ac.accesscontroller.bypassable"
+ class="org.apache.lenya.ac.impl.BypassableAccessController"
+ role="org.apache.lenya.ac.AccessController/bypassable">
+
+ <public-extensions>css,jpg,gif,png,rng,xsl</public-extensions>
+
+ <!-- bad performance, use only for complex patterns
+ <public>.*[.]css|.*[.]jpg|.*[.]gif|.*[.]png|.*[.]rng|.*[.]xsl</public>
+ -->
+
+ </component>
+</xconf>
Modified: lenya/trunk/src/modules-core/ac/config/cocoon-xconf/policy-managers.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/cocoon-xconf/policy-managers.xconf?view=diff&rev=563146&r1=563145&r2=563146
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/cocoon-xconf/policy-managers.xconf (original)
+++ lenya/trunk/src/modules-core/ac/config/cocoon-xconf/policy-managers.xconf Mon Aug 6 07:17:56 2007
@@ -16,22 +16,17 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon" unless="/cocoon/policy-managers">
- <policy-managers>
- <component-instance name="document"
- class="org.apache.lenya.cms.ac.DocumentPolicyManagerWrapper"
- logger="lenya.ac.policymanager.document"/>
- <component-instance name="file"
- class="org.apache.lenya.ac.file.FilePolicyManager"
- logger="lenya.ac.policymanager.file"/>
- <component-instance name="sitemap"
- class="org.apache.lenya.cms.ac.SitemapPolicyManager"
- logger="lenya.ac.policymanager.sitemap"/>
- </policy-managers>
-
- </xconf>
+<xconf xpath="/cocoon" unless="/cocoon/policy-managers">
+ <policy-managers>
+ <component-instance name="document"
+ class="org.apache.lenya.cms.ac.DocumentPolicyManagerWrapper"
+ logger="lenya.ac.policymanager.document"/>
+ <component-instance name="file"
+ class="org.apache.lenya.ac.file.FilePolicyManager"
+ logger="lenya.ac.policymanager.file"/>
+ <component-instance name="sitemap"
+ class="org.apache.lenya.cms.ac.SitemapPolicyManager"
+ logger="lenya.ac.policymanager.sitemap"/>
+ </policy-managers>
+
+</xconf>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org