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 2007/01/15 15:40:49 UTC
svn commit: r496339 - in /lenya/trunk/src: modules-core/ac-impl/
modules-core/ac-impl/config/cocoon-xconf/
modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/usecases/
modules-core/acusecases/ modules-core/acusecases/config/
modules-core/acusecases/...
Author: andreas
Date: Mon Jan 15 06:40:47 2007
New Revision: 496339
URL: http://svn.apache.org/viewvc?view=rev&rev=496339
Log:
Refactoring: merge modules usecase and usecase-impl
Added:
lenya/trunk/src/modules-core/acusecases/
lenya/trunk/src/modules-core/acusecases/config/
lenya/trunk/src/modules-core/acusecases/config/cocoon-xconf/
lenya/trunk/src/modules-core/acusecases/config/cocoon-xconf/usecase-ac-login.xconf
- copied unchanged from r494821, lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/usecase-ac-login.xconf
lenya/trunk/src/modules-core/acusecases/config/cocoon-xconf/usecase-ac-logout.xconf
- copied unchanged from r494821, lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/usecase-ac-logout.xconf
lenya/trunk/src/modules-core/acusecases/java/
lenya/trunk/src/modules-core/acusecases/java/src/
lenya/trunk/src/modules-core/acusecases/java/src/org/
lenya/trunk/src/modules-core/acusecases/java/src/org/apache/
lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/
lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/
lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/
lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/
- copied from r494821, lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/usecases/
lenya/trunk/src/modules-core/acusecases/module.xml
lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/test-usecase-invoker.xconf
- copied unchanged from r496301, lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf
lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecase-authorizer.xconf
- copied, changed from r496301, lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf
lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecasecronjob.xconf
- copied unchanged from r496301, lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/
- copied from r496301, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/gui/impl/
- copied from r496301, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/
- copied from r496301, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/
- copied from r496301, lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/
lenya/trunk/src/modules-core/usecase/xslt/
- copied from r494821, lenya/trunk/src/modules-core/usecase-impl/xslt/
Removed:
lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/usecase-ac-login.xconf
lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/usecase-ac-logout.xconf
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/usecases/
lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/test-usecase-invoker.xconf
lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf
lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecasecronjob.xconf
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/ac/usecase/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/gui/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/impl/
lenya/trunk/src/modules-core/usecase-impl/java/src/org/apache/lenya/cms/usecase/scheduling/impl/
lenya/trunk/src/modules-core/usecase-impl/xslt/
Modified:
lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/authorizers.xconf
lenya/trunk/src/modules-core/ac-impl/module.xml
lenya/trunk/src/modules-core/cache/module.xml
lenya/trunk/src/modules-core/usecase/module.xml
lenya/trunk/src/modules/sourcerepository/module.xml
Modified: lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/authorizers.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/authorizers.xconf?view=diff&rev=496339&r1=496338&r2=496339
==============================================================================
--- lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/authorizers.xconf (original)
+++ lenya/trunk/src/modules-core/ac-impl/config/cocoon-xconf/authorizers.xconf Mon Jan 15 06:40:47 2007
@@ -21,7 +21,7 @@
This file defines the publication specific use-cases
-->
- <xconf xpath="/cocoon" unless="/cocoon/authorizers">
+ <xconf xpath="/cocoon" unless="/cocoon/authorizers/component-instance[@name = 'policy']">
<authorizers>
<component-instance name="policy"
class="org.apache.lenya.ac.impl.PolicyAuthorizer"
Modified: lenya/trunk/src/modules-core/ac-impl/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac-impl/module.xml?view=diff&rev=496339&r1=496338&r2=496339
==============================================================================
--- lenya/trunk/src/modules-core/ac-impl/module.xml (original)
+++ lenya/trunk/src/modules-core/ac-impl/module.xml Mon Jan 15 06:40:47 2007
@@ -21,12 +21,10 @@
<module xmlns="http://apache.org/lenya/module/1.0">
<id>org.apache.lenya.modules.ac-impl</id>
<export package="org.apache.lenya.ac.file"/>
- <export package="org.apache.lenya.cms.ac.usecases"/>
- <depends module="org.apache.lenya.modules.usecase"/>
<depends module="org.apache.lenya.modules.cache"/>
<package>org.apache.lenya.modules</package>
<version>0.1-dev</version>
- <name>Access control implementation</name>
+ <name>Access control</name>
<lenya-version>@lenya.version@</lenya-version>
- <description>Access control implementation</description>
+ <description>Access control</description>
</module>
Added: lenya/trunk/src/modules-core/acusecases/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/acusecases/module.xml?view=auto&rev=496339
==============================================================================
--- lenya/trunk/src/modules-core/acusecases/module.xml (added)
+++ lenya/trunk/src/modules-core/acusecases/module.xml Mon Jan 15 06:40:47 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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: publication.xml 374687 2006-02-03 15:24:55Z michi $ -->
+
+<module xmlns="http://apache.org/lenya/module/1.0">
+ <id>org.apache.lenya.modules.acusecases</id>
+ <export package="org.apache.lenya.cms.ac.usecases"/>
+ <depends module="org.apache.lenya.modules.usecase"/>
+ <package>org.apache.lenya.modules</package>
+ <version>0.1-dev</version>
+ <name>Access control usecases</name>
+ <lenya-version>@lenya.version@</lenya-version>
+ <description>Access control usecases</description>
+</module>
Modified: lenya/trunk/src/modules-core/cache/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/cache/module.xml?view=diff&rev=496339&r1=496338&r2=496339
==============================================================================
--- lenya/trunk/src/modules-core/cache/module.xml (original)
+++ lenya/trunk/src/modules-core/cache/module.xml Mon Jan 15 06:40:47 2007
@@ -21,7 +21,6 @@
<module xmlns="http://apache.org/lenya/module/1.0">
<id>org.apache.lenya.modules.cache</id>
<export package="org.apache.lenya.ac.cache"/>
- <depends module="org.apache.lenya.modules.usecase"/>
<package>org.apache.lenya.modules</package>
<version>0.1-dev</version>
<name>Source cache</name>
Copied: lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecase-authorizer.xconf (from r496301, lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecase-authorizer.xconf?view=diff&rev=496339&p1=lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf&r1=496301&p2=lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecase-authorizer.xconf&r2=496339
==============================================================================
--- lenya/trunk/src/modules-core/usecase-impl/config/cocoon-xconf/usecase-authorizer.xconf (original)
+++ lenya/trunk/src/modules-core/usecase/config/cocoon-xconf/usecase-authorizer.xconf Mon Jan 15 06:40:47 2007
@@ -20,10 +20,10 @@
<!--
This file defines the publication specific use-cases
-->
-
- <xconf xpath="/cocoon/authorizers" unless="/cocoon/authorizers/component-instance[@name = 'usecase']">
+
+ <xconf xpath="/cocoon/authorizers" unless="/cocoon/authorizers/component-instance[@name = 'usecase']">
<component-instance name="usecase"
class="org.apache.lenya.cms.ac.usecase.impl.UsecaseAuthorizerImpl"
- logger="lenya.ac.authorizer.usecase"/>
+ logger="lenya.ac.authorizer.usecase"/>
</xconf>
Modified: lenya/trunk/src/modules-core/usecase/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/module.xml?view=diff&rev=496339&r1=496338&r2=496339
==============================================================================
--- lenya/trunk/src/modules-core/usecase/module.xml (original)
+++ lenya/trunk/src/modules-core/usecase/module.xml Mon Jan 15 06:40:47 2007
@@ -24,6 +24,8 @@
<export package="org.apache.lenya.cms.usecase"/>
<export package="org.apache.lenya.cms.usecase.scheduling"/>
<export package="org.apache.lenya.cms.usecase.xml"/>
+ <depends module="org.apache.lenya.modules.ac-impl"/>
+ <depends module="org.apache.lenya.modules.cache"/>
<package>org.apache.lenya.modules</package>
<version>0.1-dev</version>
<name>Usecase framework API</name>
Modified: lenya/trunk/src/modules/sourcerepository/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/module.xml?view=diff&rev=496339&r1=496338&r2=496339
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/module.xml (original)
+++ lenya/trunk/src/modules/sourcerepository/module.xml Mon Jan 15 06:40:47 2007
@@ -22,7 +22,7 @@
<id>org.apache.lenya.modules.sourcerepository</id>
<export package="org.apache.lenya.cms.repository"/>
<depends module="org.apache.lenya.modules.ac-impl"/>
- <depends module="org.apache.lenya.modules.usecase-impl"/>
+ <depends module="org.apache.lenya.modules.usecase"/>
<package>org.apache.lenya.modules</package>
<version>0.1-dev</version>
<name>Repository Module</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org