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

[dk...@apache.org]

Author: dkulp
Date: Thu Mar  3 16:28:07 2011
New Revision: 1076668

URL: http://svn.apache.org/viewvc?rev=1076668&view=rev
Log:
Pull creds out of code

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

Modified: cxf/web/README
URL: http://svn.apache.org/viewvc/cxf/web/README?rev=1076668&r1=1076667&r2=1076668&view=diff
==============================================================================
--- cxf/web/README (original)
+++ cxf/web/README Thu Mar  3 16:28:07 2011
@@ -5,13 +5,29 @@ confluence spaces to the sites.
 Build:
 mvn install
 
+You will need to pass credentials for a valid confluence user.  This can be
+done in one of two ways:
+
+1) Command line:
+   -Dconfluence.user=username -Dconfluence.password=password
+
+2) Profile in .m2/settings.xml
+       <profile>
+            <id>confluence</id>
+            <properties>
+                <confluence.user>user</confluence.user>
+                <confluence.password>passwd</confluence.password>
+            </properties>
+        </profile>
+   
+
 To export the docs space:
-mvn -Pdocs exec:java
+mvn -Pdocs,confluence exec:java
 should appear in target/docs
 
 
 To export the main space:
-mvn -Pmain exec:java
+mvn -Pmain,confluence exec:java
 should appear in target/main
 
 

Added: cxf/web/bin/update-site
URL: http://svn.apache.org/viewvc/cxf/web/bin/update-site?rev=1076668&view=auto
==============================================================================
--- cxf/web/bin/update-site (added)
+++ cxf/web/bin/update-site Thu Mar  3 16:28:07 2011
@@ -0,0 +1,5 @@
+#!/bin/sh
+mvn package -Pnochecks $@  2>&1  
+mvn -Pconfluence,main,nochecks exec:java -Doutput.dir=/www/cxf.apache.org $@ 2>&1
+mvn -Pconfluence,docs,nochecks exec:java -Doutput.dir=/www/cxf.apache.org/docs  $@  2>&1
+

Modified: cxf/web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/web/pom.xml?rev=1076668&r1=1076667&r2=1076668&view=diff
==============================================================================
--- cxf/web/pom.xml (original)
+++ cxf/web/pom.xml Thu Mar  3 16:28:07 2011
@@ -83,6 +83,10 @@
                             <argument>${space.key}</argument>
                             <argument>-template</argument>
                             <argument>${basedir}/template/template.vm</argument>
+                            <argument>-password</argument>
+                            <argument>${confluence.password}</argument>
+                            <argument>-user</argument>
+                            <argument>${confluence.user}</argument>
                             <!--argument>-svn</argument>
                             <argument>-commit</argument>
                             <argument>-force</argument-->

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=1076668&r1=1076667&r2=1076668&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 Thu Mar  3 16:28:07 2011
@@ -98,7 +98,7 @@ public class SiteExporter {
     List<Page> modifiedPages = new LinkedList<Page>();
     
     String userName = "cxf-export-user";
-    String password = "autoexport-cxf";
+    String password;
     String spaceKey = "CXF";
     String pageCacheFile = "pagesConfig.obj";
     String templateName = "template.vm";