[xdoclet-scm] [CVS maven2-plugin] * fixed jelly dependencies.. maybe. (but using jakarta repo)

[gjoseph]

Commit in maven2-plugin on MAIN
pom.xml	+21		1.2 -> 1.3
src/main/java/org/codehaus/xdoclet/Config.java	+11	-1	1.1.1.1 -> 1.2
/XDocletMojo.java	+23	-3	1.1.1.1 -> 1.2
	+55	-4

3 modified files

* fixed jelly dependencies.. maybe. (but using jakarta repo)
* added sources to compile path...

---

maven2-plugin

pom.xml 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- pom.xml	23 Dec 2005 01:32:38 -0000	1.2
+++ pom.xml	2 Jan 2006 14:08:48 -0000	1.3
@@ -18,6 +18,8 @@

             </extension>
         </extensions>
     </build>

+
+

     <dependencies>
         <dependency>
             <!--<groupId>org.codehaus.xdoclet</groupId>-->

@@ -42,6 +44,12 @@

 
         <dependency>
             <groupId>commons-jelly</groupId>

+            <artifactId>commons-jelly</artifactId>
+            <version>20050813.225330</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-jelly</groupId>

             <artifactId>commons-jelly-tags-xml</artifactId>
             <version>20050823.222913</version>
             <scope>runtime</scope>

@@ -79,6 +87,11 @@

             <layout>legacy</layout>
             <url>http://dist.codehaus.org</url>
         </repository>

+        <repository>
+            <id>apache</id>
+            <layout>legacy</layout>
+            <url>http://cvs.apache.org/repository/</url>
+        </repository>

     </repositories>
 
     <distributionManagement>

@@ -93,5 +106,13 @@

             <url>scp://beaver.codehaus.org/home/projects/xdoclet/public_html/maven</url>
         </site>
     </distributionManagement>

+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>

 
 </project>

---

maven2-plugin/src/main/java/org/codehaus/xdoclet

Config.java 1.1.1.1 -> 1.2

diff -u -r1.1.1.1 -r1.2
--- Config.java	23 Dec 2005 00:44:41 -0000	1.1.1.1
+++ Config.java	2 Jan 2006 14:08:49 -0000	1.2
@@ -8,7 +8,7 @@

 /**
  * @author Espen Amble Kolstad
  *

- * @version $Revision: 1.1.1.1 $

+ * @version $Revision: 1.2 $

  */
 public class Config {
     private String plugin;

@@ -16,6 +16,7 @@

     private Set excludes = new HashSet();
     private String encoding = System.getProperty("file.encoding");
     private Map params = new HashMap();

+    private boolean addToSources = true;

 
     public String getPlugin() {
         return plugin;

@@ -57,12 +58,21 @@

         this.params = params;
     }
 

+    public boolean isAddToSources() {
+        return addToSources;
+    }
+
+    public void setAddToSources(boolean addToSources) {
+        this.addToSources = addToSources;
+    }
+

     public String toString() {
         return "Config{" +
                 "plugin='" + plugin + '\'' +
                 ", includes=" + includes +
                 ", excludes=" + excludes +
                 ", encoding='" + encoding + '\'' +

+                ", addToSources='" + addToSources + '\'' +

                 ", params=" + params +
                 '}';
     }

---

maven2-plugin/src/main/java/org/codehaus/xdoclet

XDocletMojo.java 1.1.1.1 -> 1.2

diff -u -r1.1.1.1 -r1.2
--- XDocletMojo.java	23 Dec 2005 00:44:41 -0000	1.1.1.1
+++ XDocletMojo.java	2 Jan 2006 14:08:49 -0000	1.2
@@ -25,11 +25,11 @@

 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.UndeclaredThrowableException;

+import java.util.HashMap;

 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

-import java.util.HashMap;

 
 /**
  * @author Espen Amble Kolstad

@@ -87,7 +87,8 @@

             final Config config = (Config) it.next();
             getLog().info(config.toString());
             if (getSourceRoot() != null) {

-                final ContainerComposer containerComposer = new PluginContainerComposer(createGenerama(config), config, defaultPluginProps);

+                final Generama generama = createGenerama(config);
+                final ContainerComposer containerComposer = new PluginContainerComposer(generama, config, defaultPluginProps);

                 final ContainerBuilder containerBuilder = new PluginLifecycleContainerBuilder(containerComposer);
                 try {
                     containerBuilder.buildContainer(containerRef, null, null, true);

@@ -99,7 +100,14 @@

                     }
                     throw new MojoExecutionException("Undeclared: ", ex);
                 } catch (RuntimeException e) {

-                    throw new MojoFailureException(e.getMessage());

+                    throw new MojoExecutionException("XDoclet plugin failed: " + e.getMessage(), e);
+                }
+                if (config.isAddToSources()) {
+                    String addedSourceRoot = resolveOutputDir(config, outputDir);
+                    if (project != null) {
+                        getLog().info("Adding " + addedSourceRoot + " to compiler path");
+                        project.addCompileSourceRoot(addedSourceRoot);
+                    }

                 }
             }
         }

@@ -108,6 +116,18 @@

         resource.setDirectory(outputDir);
         //resource.addInclude("* * / *.xml");
         project.addResource(resource);

+    }
+
+    private String resolveOutputDir(Config config, String defaultOuputPath) {
+        String out = defaultOuputPath;
+        Map params = config.getParams();
+        if (params != null) {
+            String destDir = (String) params.get("destdir");
+            if (destDir != null) {
+                out = destDir;
+            }
+        }
+        return out;

     }
 
     private File getSourceRoot() {

CVSspam 0.2.8