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/04/13 17:59:30 UTC
svn commit: r528540 - in /lenya/trunk: src/pubs/blog/ src/pubs/default/
tools/anttasks/build/classes/org/apache/lenya/cms/ant/
tools/anttasks/src/org/apache/lenya/cms/ant/
Author: nettings
Date: Fri Apr 13 08:59:29 2007
New Revision: 528540
URL: http://svn.apache.org/viewvc?view=rev&rev=528540
Log:
removed pubs/*/publication.xml for good.
thanks to richard frovarp for the patch.
this touches the build tasks. the .class files are being included in
this commit, but if you run into problems, do
# ./build.sh compile-build-tasks
(this is not included in the normal build targets)
Removed:
lenya/trunk/src/pubs/blog/publication.xml
lenya/trunk/src/pubs/default/publication.xml
Modified:
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyPublicationsTask.class
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/JavaFilenameFilter.class
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/SCMFilenameFilter.class
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/TwoTuple.class
lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyPublicationsTask.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyPublicationsTask.class?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/JavaFilenameFilter.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/JavaFilenameFilter.class?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/SCMFilenameFilter.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/SCMFilenameFilter.class?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/TwoTuple.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/TwoTuple.class?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
--- lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java (original)
+++ lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java Fri Apr 13 08:59:29 2007
@@ -71,7 +71,7 @@
if (path.isDirectory()) {
// In the case of a publication
- if (new File(path, "publication.xml").isFile()) {
+ if (new File(path, "/config/publication.xconf").isFile()) {
copyContentOfDir(new File(path, this.javaDir),
absoluteBuildDir,
twoTuple,
Modified: lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java?view=diff&rev=528540&r1=528539&r2=528540
==============================================================================
--- lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java (original)
+++ lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java Fri Apr 13 08:59:29 2007
@@ -67,7 +67,7 @@
*/
public void copy(String pubsRootDir, FilenameFilter filter, TwoTuple twoTuple) {
// In the case the pubsRootDir is publication dir
- if (new File(pubsRootDir, "publication.xml").isFile()) {
+ if (new File(pubsRootDir, "/config/publication.xconf").isFile()) {
File pubDir = new File(pubsRootDir);
log("Copy publication: " + pubDir);
CopyJavaSourcesTask.copyDir(pubDir, new File(this.toDir.toString()), twoTuple, filter, this);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org