You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2006/04/07 22:19:04 UTC

svn commit: r392378 - in /lenya/trunk/tools/anttasks: CopyPublicationsTask.java org/apache/lenya/cms/ant/CopyPublicationsTask.class

Author: michi
Date: Fri Apr  7 13:19:01 2006
New Revision: 392378

URL: http://svn.apache.org/viewcvs?rev=392378&view=rev
Log:
allow patching of ac.xconf with local version

Modified:
    lenya/trunk/tools/anttasks/CopyPublicationsTask.java
    lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyPublicationsTask.class

Modified: lenya/trunk/tools/anttasks/CopyPublicationsTask.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/CopyPublicationsTask.java?rev=392378&r1=392377&r2=392378&view=diff
==============================================================================
--- lenya/trunk/tools/anttasks/CopyPublicationsTask.java (original)
+++ lenya/trunk/tools/anttasks/CopyPublicationsTask.java Fri Apr  7 13:19:01 2006
@@ -76,6 +76,14 @@
                     log("Patch config file with local version: " + localPublicationXConf + " " + publicationXConf);
                     CopyJavaSourcesTask.copyFile(localPublicationXConf, publicationXConf, twoTuple, this, true);
                 }
+
+                File localAccessControlXConf = new File(pubDir, "/config/ac/local.ac.xconf");
+                if (localAccessControlXConf.isFile()) {
+                    File accessControlXConf = new File(this.toDir.toString() + "/" + pubDir.getName() + "/config/ac/ac.xconf");
+                    log("Patch access control config file with local version: " + localAccessControlXConf + " " + accessControlXConf);
+                    CopyJavaSourcesTask.copyFile(localAccessControlXConf, accessControlXConf, twoTuple, this, true);
+                }
+
             // In the case the pubsRootDir is module dir
 	    } else if (new File(pubsRootDir, "module.xml").isFile()) {
                 log("Copy module: " + pubsRootDir);

Modified: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyPublicationsTask.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyPublicationsTask.class?rev=392378&r1=392377&r2=392378&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org