svn commit: r532494 - in /lenya/trunk/src: modules-core/ac/java/src/org/apache/lenya/cms/ac/ modules/lucene/ pubs/blog/ pubs/default/config/ pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/

Author: nettings
Date: Wed Apr 25 14:48:44 2007
New Revision: 532494

URL: http://svn.apache.org/viewvc?view=rev&rev=532494
Log:
finish renaming from ac/ac.xconf to
access-controller/access-controller.xml
patch by richard frovarp, thanks!

Modified:
    
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
    lenya/trunk/src/modules/lucene/README.txt
    lenya/trunk/src/pubs/blog/README.txt
    lenya/trunk/src/pubs/default/config/publication.xconf
    
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java

Modified: 
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java?view=diff&rev=532494&r1=532493&r2=532494
==============================================================================
--- 
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
 (original)
+++ 
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
 Wed Apr 25 14:48:44 2007
@@ -41,7 +41,7 @@
 import org.apache.lenya.cms.publication.URLInformation;
 
 /**
- * Resolves the access controller according to the <code>ac.xconf</code> file 
of a publication.
+ * Resolves the access controller according to the 
<code>access-control.xml</code> file of a publication.
  */
 public class PublicationAccessControllerResolver extends 
AbstractAccessControllerResolver implements
         Initializable {

Modified: lenya/trunk/src/modules/lucene/README.txt
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/README.txt?view=diff&rev=532494&r1=532493&r2=532494
==============================================================================
--- lenya/trunk/src/modules/lucene/README.txt (original)
+++ lenya/trunk/src/modules/lucene/README.txt Wed Apr 25 14:48:44 2007
@@ -6,7 +6,7 @@
   Configuration
   -------------
 
-  Each publication has a configuration at PUB/config/lucene_index.xconf which 
is being defined
+  Each publication has a configuration at PUB/config/search/lucene_index.xconf 
which is being defined
   by 
java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
 
 

Modified: lenya/trunk/src/pubs/blog/README.txt
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/README.txt?view=diff&rev=532494&r1=532493&r2=532494
==============================================================================
--- lenya/trunk/src/pubs/blog/README.txt (original)
+++ lenya/trunk/src/pubs/blog/README.txt Wed Apr 25 14:48:44 2007
@@ -3,7 +3,7 @@
   Changing the Publication Prefix "blog"
   ======================================
 
-  - config/ac/ac.xconf
+  - config/access-control/access-control.xml
   - xslt/global.xsl (CSS)
 
   QUESTION: Is publication templating also possible for the blog publication?

Modified: lenya/trunk/src/pubs/default/config/publication.xconf
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/publication.xconf?view=diff&rev=532494&r1=532493&r2=532494
==============================================================================
--- lenya/trunk/src/pubs/default/config/publication.xconf (original)
+++ lenya/trunk/src/pubs/default/config/publication.xconf Wed Apr 25 14:48:44 
2007
@@ -89,7 +89,7 @@
   -->
 
   <!-- You can specify a custom location for your content, outside the Lenya 
build tree. Note that you will probably also want
-       to specify custom locations for access control (see ac/ac.xconf), so 
that all your dynamically generated data is in one place
+       to specify custom locations for access control (see 
access-control/access-control.xml), so that all your dynamically generated data 
is in one place
        for easy backup. -->
   <!--
        Relative to webapp context: 

Modified: 
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java?view=diff&rev=532494&r1=532493&r2=532494
==============================================================================
--- 
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
 (original)
+++ 
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
 Wed Apr 25 14:48:44 2007
@@ -61,7 +61,8 @@
 
     protected static final String[] sourcesToCopy = { 
             "config/publication.xconf",
-            "config/ac/ac.xconf", "config/ac/policies/", 
"config/ac/usecase-policies.xml", 
+            "config/access-control/access-control.xml", 
"config/access-control/policies/", 
+            "config/access-control/usecase-policies.xml", 
             "config/workflow/workflow.xml",
             "config/" + 
org.apache.cocoon.components.search.components.impl.IndexManagerImpl.INDEX_CONF_FILE};
 
@@ -214,7 +215,7 @@
             String indexDir = "lenya/pubs/" + newPublicationId + 
"/work/lucene/index";
 
             indexSource = (ModifiableSource) 
resolver.resolveURI(publicationsUri + "/"
-                    + newPublicationId + "/config/lucene_index.xconf");
+                    + newPublicationId + "/config/search/lucene_index.xconf");
             Document indexDoc = 
DocumentHelper.readDocument(indexSource.getInputStream());
             Element[] indexElement = 
DocumentHelper.getChildren(indexDoc.getDocumentElement(), null, "index");