[Ogoglio-commits] SF.net SVN: ogoglio: [394] maven/trunk/dev-plugins/src/main/java/com/ ogoglio/plugin

[<ian...@us...>]

Revision: 394
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=394&view=rev
Author:   iansmith
Date:     2007-09-11 19:30:41 -0700 (Tue, 11 Sep 2007)

Log Message:
-----------
Adding support for post-populate maven mojo.

Modified Paths:
--------------
    maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java
    maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java

Modified: maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java
===================================================================
--- maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java	2007-09-11 20:45:06 UTC (rev 393)
+++ maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java	2007-09-12 02:30:41 UTC (rev 394)
@@ -16,9 +16,9 @@
 
 public abstract class OgServiceMojoBase extends AbstractMojo {
 
-    protected static final String SPACE_PREFIX = "space-";
+    public static final String SPACE_PREFIX = "space-";
 
-    protected static final String TEMPLATE_PREFIX = "template-";
+    public static final String TEMPLATE_PREFIX = "template-";
 
     /**
      * @parameter
@@ -30,7 +30,7 @@
      */
     protected String serviceURI;
 
-    /**
+    /**"space-"
      * @parameter
      */
     protected String username;
@@ -38,7 +38,7 @@
     /**
      * @parameter
      */
-    private String password;
+    protected String password;
 
     protected WebAPIClient validateArgsAndConnect() {
         if (populateDir == null) {

Modified: maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java
===================================================================
--- maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java	2007-09-11 20:45:06 UTC (rev 393)
+++ maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java	2007-09-12 02:30:41 UTC (rev 394)
@@ -12,6 +12,7 @@
 import nanoxml.XMLElement;
 
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 
 import com.ogoglio.client.WebAPIClient;
 import com.ogoglio.util.StreamUtils;
@@ -53,9 +54,10 @@
         patchSpaces(client);
     }
 
-    private void patchSpaces(WebAPIClient client) throws MojoExecutionException {
+    private SpaceDocument[] patchSpaces(WebAPIClient client) throws MojoExecutionException {
         SpaceDocument fakeSpaceDoc, realSpaceDoc;
-
+        SpaceDocument[] result=new SpaceDocument[spaces.size()];
+        
         for (int i = 0; i < spaces.size(); ++i) {
             fakeSpaceDoc = spaces.get(i);
             try {
@@ -93,10 +95,12 @@
                 }
 
                 getLog().info("Patched up space " + realSpaceDoc.getDisplayName());
+                result[i]=realSpaceDoc;
             } catch (IOException e) {
                 throw new MojoExecutionException("IOException patching space (" + fakeSpaceDoc.getDisplayName() + ":" + fakeSpaceDoc.getSpaceID() + ")", e);
             }
         }
+        return result;
 
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.