cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1688249 - in /cxf/web: pom.xml src/main/java/org/apache/cxf/cwiki/Page.java src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Date Mon, 29 Jun 2015 15:07:35 GMT
Author: dkulp
Date: Mon Jun 29 15:07:34 2015
New Revision: 1688249

URL: http://svn.apache.org/r1688249
Log:
Update to latest cxf, support new "code" storage format

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=1688249&r1=1688248&r2=1688249&view=diff
==============================================================================
--- cxf/web/pom.xml (original)
+++ cxf/web/pom.xml Mon Jun 29 15:07:34 2015
@@ -28,11 +28,11 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.5.10</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>
-        <cxf.version>2.7.4</cxf.version>
+        <cxf.version>3.1.1</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=1688249&r1=1688248&r2=1688249&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 Jun 29 15:07:34 2015
@@ -489,7 +489,7 @@ public class Page extends AbstractPage i
 
         public void startElement(String uri, String localName, String qName, Attributes atts)
             throws SAXException {
-            if ("macro".equals(localName)) {
+            if ("macro".equals(localName) || "structured-macro".equals(localName)) {
                 String s = atts.getValue(uri, "name");
                 if ("children".equals(s)) {
                     state = State.CHILDREN;
@@ -528,7 +528,7 @@ public class Page extends AbstractPage i
         }
 
         public void endElement(String uri, String localName, String qName) throws SAXException
{
-            if ("macro".equals(localName)) {
+            if ("macro".equals(localName) || "structured-macro".equals(localName)) {
                 switch (state) {
                 case CHILDREN: {
                     String pageName = params.get("page");

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=1688249&r1=1688248&r2=1688249&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 Jun 29 15:07:34 2015
@@ -77,7 +77,6 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.FileUtils;
 import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.staxutils.StaxUtils;
@@ -255,6 +254,7 @@ public class SiteExporter implements Run
         //forcePage("JavaDoc");
         //forcePage("DOSGi Architecture");
         //forcePage("Book In One Page");
+        //forcePage("FAQ");
         
         /*
         if (modifiedPages.isEmpty() && checkRSS()) {
@@ -719,7 +719,7 @@ public class SiteExporter implements Run
     }
 
     private String renderPage(AbstractPage p) throws ParserConfigurationException {
-        Document doc = XMLUtils.newDocument();
+        Document doc = DOMUtils.newDocument();
         Element el = doc.createElementNS(SOAPNS, "ns1:renderContent");
         Element el2 = doc.createElement("in0");
         el.appendChild(el2);
@@ -811,7 +811,7 @@ public class SiteExporter implements Run
     }
     
     public int getBlogVersion(String pageId) throws Exception {
-        Document doc = XMLUtils.newDocument();
+        Document doc = DOMUtils.newDocument();
         Element el = doc.createElementNS(SOAPNS, "ns1:getBlogEntry");
         Element el2 = doc.createElement("in0");
         el.appendChild(el2);
@@ -903,7 +903,7 @@ public class SiteExporter implements Run
     }
     
     public void loadPages() throws Exception {
-        Document doc = XMLUtils.newDocument();
+        Document doc = DOMUtils.newDocument();
         Element el = doc.createElementNS(SOAPNS, "ns1:getPages");
         Element el2 = doc.createElement("in0");
         el.appendChild(el2);
@@ -995,7 +995,7 @@ public class SiteExporter implements Run
             try {
                 doLogin();
                 
-                Document doc = XMLUtils.newDocument();
+                Document doc = DOMUtils.newDocument();
                 Element el = doc.createElementNS(SOAPNS, "ns1:getSpace");
                 Element el2 = doc.createElement("in0");
                 el.appendChild(el2);
@@ -1018,7 +1018,7 @@ public class SiteExporter implements Run
     public Future<?> loadPage(Element pageSumEl,
                          final Set<String> allPages,
                          final Set<Page> newPages) throws Exception {
-        Document doc = XMLUtils.newDocument();
+        Document doc = DOMUtils.newDocument();
         Element el = doc.createElementNS(SOAPNS, "ns1:getPage");
         Element el2 = doc.createElement("in0");
         el.appendChild(el2);



Mime
View raw message