You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/07/02 15:30:56 UTC
svn commit: r552489 - in
/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence:
ConfluenceExportMojo.java DocGenerator.java
Author: aadamchik
Date: Mon Jul 2 06:30:55 2007
New Revision: 552489
URL: http://svn.apache.org/viewvc?view=rev&rev=552489
Log:
better disgnostics during the docs build
Modified:
cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/ConfluenceExportMojo.java
cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java
Modified: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/ConfluenceExportMojo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/ConfluenceExportMojo.java?view=diff&rev=552489&r1=552488&r2=552489
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/ConfluenceExportMojo.java (original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/ConfluenceExportMojo.java Mon Jul 2 06:30:55 2007
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.cayenne.maven.plugin.confluence;
+import java.io.File;
import java.net.URL;
import org.apache.maven.plugin.AbstractMojo;
@@ -78,21 +79,21 @@
* in your ~/.m2/settings.xml file like this;
*
* <pre>
- * <profiles>
- * <profile>
- * <properties>
- * <property>
- * <name>confluence.userName</name>
- * <value>user name</value>
- * </property>
- * <property>
- * <name>confluence.password</name>
- * <value>password</value>
- * </property>
- * </properties>
- * <id>confluence</id>
- * </profile>
- * </profiles>
+ * <profiles>
+ * <profile>
+ * <properties>
+ * <property>
+ * <name>confluence.userName</name>
+ * <value>user name</value>
+ * </property>
+ * <property>
+ * <name>confluence.password</name>
+ * <value>password</value>
+ * </property>
+ * </properties>
+ * <id>confluence</id>
+ * </profile>
+ * </profiles>
* </pre>
*
* @parameter expression="${confluence.userName}"
@@ -113,8 +114,11 @@
* Worker method.
*/
public void execute() throws MojoExecutionException, MojoFailureException {
+ File thisDir = new File(System.getProperty("user.dir"));
+ File output = new File(thisDir, outputDirectory);
getLog().info(
- "Exporting space '" + spaceName + "' to " + outputDirectory);
+ "Exporting space '" + spaceName + "' to "
+ + output.getAbsolutePath());
try {
DocGenerator generator = new DocGenerator(baseUrl.toString(),
Modified: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java?view=diff&rev=552489&r1=552488&r2=552489
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java (original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java Mon Jul 2 06:30:55 2007
@@ -22,8 +22,6 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
-import java.io.InputStream;
-import java.net.URL;
import java.util.Iterator;
import org.objectstyle.confluence.rpc.soap_axis.confluenceservice_v1.ConfluenceSoapService;
@@ -106,10 +104,6 @@
login();
- // only works for adminstrators
- // String url = service.exportSite(token, true);
-
- // URL foo = new URL(url);
createPath(docBase);
// Build a page hierarchy first..
@@ -119,7 +113,6 @@
// Now render the content nodes..
renderPage(page, docBase);
-
}
protected void iterateChildren(DocPage parent) throws Exception {
@@ -130,9 +123,7 @@
DocPage child = getPage(parent, children[i].getTitle());
parent.addChild(child);
iterateChildren(child);
-
}
-
}
protected void renderPage(DocPage page, String basePath) throws Exception {