You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/06/22 15:53:11 UTC
svn commit: r416370 - in /lenya/trunk/src:
java/org/apache/lenya/cms/cocoon/acting/ modules-core/ac-impl/config/sitemap/
modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/
webapp/lenya/config/sitemap/
Author: andreas
Date: Thu Jun 22 06:53:10 2006
New Revision: 416370
URL: http://svn.apache.org/viewvc?rev=416370&view=rev
Log:
Moved access control actions to ac-impl module
Added:
lenya/trunk/src/modules-core/ac-impl/config/sitemap/
lenya/trunk/src/modules-core/ac-impl/config/sitemap/actions.xmap
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/AccessControlAction.java (props changed)
- copied unchanged from r416326, lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/AccessControlAction.java
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/DelegatingAuthenticatorAction.java
- copied unchanged from r416326, lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthenticatorAction.java
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java (props changed)
- copied unchanged from r416326, lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java
Removed:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/AccessControlAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthenticatorAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java
Modified:
lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap
Added: lenya/trunk/src/modules-core/ac-impl/config/sitemap/actions.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac-impl/config/sitemap/actions.xmap?rev=416370&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/ac-impl/config/sitemap/actions.xmap (added)
+++ lenya/trunk/src/modules-core/ac-impl/config/sitemap/actions.xmap Thu Jun 22 06:53:10 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id: actions.xmap 280060 2005-09-11 01:56:31Z chestnut $ -->
+
+<xmap xpath="/sitemap/components/actions" unless="/sitemap/components/actions/action[@name = 'authenticator']">
+ <map:action name="authenticator" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthenticatorAction" logger="lenya.sitemap.action.authenticator"/>
+ <map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthorizerAction" logger="lenya.sitemap.action.authorizer"/>
+</xmap>
\ No newline at end of file
Propchange: lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/AccessControlAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/AccessControlAction.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap?rev=416370&r1=416369&r2=416370&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap Thu Jun 22 06:53:10 2006
@@ -16,9 +16,7 @@
-->
<!-- $Id: actions.xmap 280060 2005-09-11 01:56:31Z chestnut $ -->
-<xmap xpath="/sitemap/components/actions" unless="/sitemap/components/actions/action[@name = 'authenticator']">
- <map:action name="authenticator" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthenticatorAction" logger="lenya.sitemap.action.authenticator"/>
- <map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthorizerAction" logger="lenya.sitemap.action.authorizer"/>
+<xmap xpath="/sitemap/components/actions" unless="/sitemap/components/actions/action[@name = 'language-exists']">
<map:action name="language-exists" logger="lenya.sitemap.action.language-exists" src="org.apache.lenya.cms.cocoon.acting.LanguageExistsAction"/>
<map:action name="request-parameter-exists" logger="sitemap.action.requestParameterExists" src="org.apache.cocoon.acting.RequestParameterExistsAction" />
<map:action name="reserved-checkin" src="org.apache.lenya.cms.cocoon.acting.ReservedCheckinAction" logger="sitemap.action.reserved-checkin"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org