You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/04/29 20:21:58 UTC
svn commit: r1477248 - in /cxf/web: pom.xml
src/main/java/org/apache/cxf/cwiki/Page.java
src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Author: dkulp
Date: Mon Apr 29 18:21:58 2013
New Revision: 1477248
URL: http://svn.apache.org/r1477248
Log:
Record if a page has blog entries and re-render if blogs change
Modified:
cxf/web/pom.xml
cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java
cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Modified: cxf/web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/web/pom.xml?rev=1477248&r1=1477247&r2=1477248&view=diff
==============================================================================
--- cxf/web/pom.xml (original)
+++ cxf/web/pom.xml Mon Apr 29 18:21:58 2013
@@ -22,17 +22,17 @@
<artifactId>cxf-site-export</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Apache CXF Condfluence Site Exporter</name>
+ <name>Apache CXF Confluence Site Exporter</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.6.5</version>
+ <version>2.5.10</version>
</parent>
<properties>
- <cxf.version>2.6.5</cxf.version>
+ <cxf.version>2.7.4</cxf.version>
<extra.arg></extra.arg>
<svn.arg1></svn.arg1>
<svn.arg2></svn.arg2>
Modified: cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java
URL: http://svn.apache.org/viewvc/cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java?rev=1477248&r1=1477247&r2=1477248&view=diff
==============================================================================
--- cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java (original)
+++ cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java Mon Apr 29 18:21:58 2013
@@ -48,6 +48,7 @@ public class Page extends AbstractPage i
Map<String, String> attachments;
Set<String> includes;
Map<String, Integer> childrenOf;
+ boolean hasBlog;
transient String renderedContent;
transient String renderedDivContent;
@@ -111,6 +112,10 @@ public class Page extends AbstractPage i
includes.add(inc);
idx = c.indexOf("{include:", idx2);
}
+ idx = c.indexOf("{blog-posts");
+ if (idx != -1) {
+ hasBlog = true;
+ }
}
}
@@ -126,6 +131,7 @@ public class Page extends AbstractPage i
this.includes = source.includes;
this.childrenOf = source.childrenOf;
this.exporter = source.exporter;
+ this.hasBlog = source.hasBlog;
}
public boolean hasChildrenOf(String t, int d) {
@@ -226,5 +232,9 @@ public class Page extends AbstractPage i
protected SiteExporter getExporter() {
return exporter;
}
+
+ public boolean hasBlog() {
+ return hasBlog;
+ }
}
Modified: cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
URL: http://svn.apache.org/viewvc/cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java?rev=1477248&r1=1477247&r2=1477248&view=diff
==============================================================================
--- cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java (original)
+++ cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java Mon Apr 29 18:21:58 2013
@@ -280,7 +280,14 @@ public class SiteExporter implements Run
modifiedBlog.clear();
modifiedBlog.addAll(blog.values());
}
-
+ if (!modifiedBlog.isEmpty()) {
+ //blogs changed, see if any pages have blogs
+ for (Page p : pages.values()) {
+ if (p.hasBlog()) {
+ modifiedPages.add(p);
+ }
+ }
+ }
if (!modifiedPages.isEmpty() || !modifiedBlog.isEmpty()) {
renderBlog();
renderPages();