svn commit: r1297204 - in /cxf/web: bin/update-site pom.xml src/main/java/org/apache/cxf/cwiki/SiteExporter.java

[dk...@apache.org]

Author: dkulp
Date: Mon Mar  5 19:55:10 2012
New Revision: 1297204

URL: http://svn.apache.org/viewvc?rev=1297204&view=rev
Log:
Couple updates that joe wants

Modified:
    cxf/web/bin/update-site
    cxf/web/pom.xml
    cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java

Modified: cxf/web/bin/update-site
URL: http://svn.apache.org/viewvc/cxf/web/bin/update-site?rev=1297204&r1=1297203&r2=1297204&view=diff
==============================================================================
--- cxf/web/bin/update-site (original)
+++ cxf/web/bin/update-site Mon Mar  5 19:55:10 2012
@@ -1,5 +1,8 @@
 #!/bin/sh
 mvn package -Pnochecks $@  2>&1  
+[ $? -eq 0 ] || exit -1
 mvn -Pconfluence,main,nochecks exec:java  $@ 2>&1
+[ $? -eq 0 ] || exit -1
 mvn -Pconfluence,docs,nochecks exec:java  $@  2>&1
+[ $? -eq 0 ] || exit -1
 

Modified: cxf/web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/web/pom.xml?rev=1297204&r1=1297203&r2=1297204&view=diff
==============================================================================
--- cxf/web/pom.xml (original)
+++ cxf/web/pom.xml Mon Mar  5 19:55:10 2012
@@ -36,6 +36,7 @@
         <extra.arg></extra.arg>
         <svn.arg1></svn.arg1>
         <svn.arg2></svn.arg2>
+        <site.output>${basedir}/content</site.output>
     </properties>
 
     <dependencies>
@@ -113,16 +114,16 @@
         <profile>
             <id>docs</id>
             <properties>
-                <cache.file>${basedir}/content/cache/docs.pageCache</cache.file>
-                <output.dir>${basedir}/content/docs</output.dir>
+                <cache.file>${site.output}/cache/docs.pageCache</cache.file>
+                <output.dir>${site.output}/docs</output.dir>
                 <space.key>CXF20DOC</space.key>
             </properties>
         </profile>
         <profile>
             <id>main</id>
             <properties>
-                <cache.file>${basedir}/content/cache/main.pageCache</cache.file>
-                <output.dir>${basedir}/content</output.dir>
+                <cache.file>${site.output}/cache/main.pageCache</cache.file>
+                <output.dir>${site.output}/</output.dir>
                 <space.key>CXF</space.key>
             </properties>
         </profile>

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=1297204&r1=1297203&r2=1297204&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 Mar  5 19:55:10 2012
@@ -215,7 +215,7 @@ public class SiteExporter {
         URL url = new URL(ROOT + "/createrssfeed.action?types=page&types=blogpost&types=mail&"
                           //+ "types=comment&"  //cannot handle comment updates yet
                           + "types=attachment&statuses=created&statuses=modified"
-                          + "&spaces=" + spaceKey + "&rssType=atom&maxResults=20&timeSpan=5"
+                          + "&spaces=" + spaceKey + "&rssType=atom&maxResults=20&timeSpan=60"
                           + "&publicFeed=true");
         InputStream ins = url.openStream();
         Document doc = StaxUtils.read(ins);
@@ -223,6 +223,7 @@ public class SiteExporter {
         List<Element> els = DOMUtils.getChildrenWithName(doc.getDocumentElement(),
                                                         "http://www.w3.org/2005/Atom", 
                                                         "entry");
+        //XMLUtils.printDOM(doc);
         for (Element el : els) {
             Element e2 = DOMUtils.getFirstChildWithName(el, "http://www.w3.org/2005/Atom", "updated");
             String val = DOMUtils.getContent(e2);