You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bo...@apache.org on 2014/11/09 21:01:02 UTC
svn commit: r1637731 - in
/tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki: Page.java
SiteExporter.java
Author: bobharner
Date: Sun Nov 9 20:01:02 2014
New Revision: 1637731
URL: http://svn.apache.org/r1637731
Log:
Copying in all of Dan Kulp's changes to these files from his /repos/asf/cxf/web project.
Modified:
tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/Page.java
tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Modified: tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/Page.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/Page.java?rev=1637731&r1=1637730&r2=1637731&view=diff
==============================================================================
--- tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/Page.java (original)
+++ tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/Page.java Sun Nov 9 20:01:02 2014
@@ -168,7 +168,7 @@ public class Page extends AbstractPage i
private void checkContentV2(final String c) {
try {
- //if ("JAX-WS Dispatch API".equals(title)) {
+ //if ("Content Based Router".equals(title)) {
// System.out.println(c);
//}
@@ -466,6 +466,7 @@ public class Page extends AbstractPage i
private State state = State.NONE;
private Map<String, String> params = new HashMap<String, String>();
private String paramName;
+ private boolean unmigrated;
V2ContentHandler(Page pg) {
page = pg;
@@ -500,15 +501,20 @@ public class Page extends AbstractPage i
state = State.CODE;
} else if ("snippet".equals(s)) {
state = State.CODE;
- } else if ("unmigrated-wiki-markup".equals(s)) {
- System.out.println("WARNING: Page " + page.title + " has unmigrated wiki content.");
- //no idea what is in there, lets just turn on the code highlighting
- if (page.codeTypes == null) {
- page.codeTypes = new CopyOnWriteArraySet<String>();
+ } else if ("unmigrated-wiki-markup".equals(s)
+ || "unmigrated-inline-wiki-markup".equals(s)) {
+ if (!unmigrated) {
+ System.out.println("WARNING: Page \"" + page.title + "\" ("
+ + page.spaceKey + ") has unmigrated wiki content.");
+ unmigrated = true;
+ //no idea what is in there, lets just turn on the code highlighting
+ if (page.codeTypes == null) {
+ page.codeTypes = new CopyOnWriteArraySet<String>();
+ }
+ page.codeTypes.add("java");
+ page.codeTypes.add("xml");
+ page.codeTypes.add("plain");
}
- page.codeTypes.add("java");
- page.codeTypes.add("xml");
- page.codeTypes.add("plain");
} else {
//System.out.println("Unknown macro: " + s);
}
@@ -577,8 +583,19 @@ public class Page extends AbstractPage i
System.out.println("WARNING Page " + page.title + " has a broken code block");
}
}
+ } else if ("default-parameter".equals(ent.getKey())) {
+ String s = ent.getValue();
+ if ("xml".equals(s) || "java".equals(s)) {
+ lang = s;
+ }
}
}
+ /*
+ if (page.getTitle().equals("Security")) {
+ System.out.println(params);
+ System.out.println("lang: " + lang);
+ }
+ */
if (StringUtils.isEmpty(lang)) {
lang = "java";
}
Modified: tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/SiteExporter.java?rev=1637731&r1=1637730&r2=1637731&view=diff
==============================================================================
--- tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/SiteExporter.java (original)
+++ tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/SiteExporter.java Sun Nov 9 20:01:02 2014
@@ -256,10 +256,12 @@ public class SiteExporter implements Run
//forcePage("DOSGi Architecture");
//forcePage("Book In One Page");
+ /*
if (modifiedPages.isEmpty() && checkRSS()) {
System.out.println("(" + spaceKey + ") No changes detected from RSS");
return false;
}
+ */
doLogin();
checkVersion();
@@ -827,6 +829,7 @@ public class SiteExporter implements Run
}
public void loadBlog() throws Exception {
+ System.out.println("Loading Blog entries for " + spaceKey);
Document doc = DOMUtils.createDocument();
Element el = doc.createElementNS(SOAPNS, "ns1:getBlogEntries");
Element el2 = doc.createElement("in0");
@@ -846,8 +849,13 @@ public class SiteExporter implements Run
BlogEntrySummary entry = new BlogEntrySummary((Element)nd);
entry.setVersion(getBlogVersion(entry.id));
BlogEntrySummary oldEntry = blog.put(entry.getId(), entry);
+ System.out.println("Found Blog entry for " + entry.getTitle() + " " + entry.getPath());
+
if (oldEntry == null || oldEntry.getVersion() != entry.getVersion()) {
+ System.out.println(" and it's modified");
modifiedBlog.add(entry);
+ } else {
+ System.out.println(" but it's not modified");
}
oldBlog.remove(entry.getId());
}