jvanzyl 2004/05/07 16:48:43
Modified: maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven
plugin.xml
maven-plugins/maven-scm-plugin project.xml
maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc
XdocPlugin.java
maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render
Xpp3Dom.java
maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element
AbstractXdocElementRenderer.java
DocumentRenderer.java PropertiesRenderer.java
maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render
IntegratedPluginGoalTestCase.java
Log:
o updating for the changes to the plugin request/response.
Revision Changes Path
1.6 +83 -0
maven-components/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.xml 22 Mar 2004 18:09:15 -0000 1.5
+++ plugin.xml 7 May 2004 23:48:42 -0000 1.6
@@ -9,6 +9,89 @@
<field-name>compilers</field-name>
</requirement>
</requirements>
+
+ <!--
+ <parameters>
+ <parameter>
+ <name>sourceDirectory</name>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>outputDirectory</name>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>compiler</name>
+ <description></description>
+ </parameter>
+ </parameters>
+
+ <goals>
+ <goal>
+ <name>compile</name>
+ <expressions>
+ <expression>#project.build.sourceDirectory</expression>
+ <expression>#maven.build.dest</expression>
+ <expression>#project.classpathElements</expression>
+ <expression>javac</expression>
+ </expressions>
+ </goal>
+ </goals>
+ -->
+
+ <goals>
+ <goal>
+ <name>compile</name>
+ <parameters>
+ <parameter>
+ <name>sourceDirectory</name>
+ <expression>#project.build.sourceDirectory</expression>
+ </parameter>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.build.dest</expression>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <expression>#project.classpathElements</expression>
+ </parameter>
+ <parameter>
+ <name>compiler</name>
+ <expression>javac</expression>
+ </parameter>
+ </parameters>
+ </goal>
+ <goal>
+ <name>test:compile</name>
+ <prereqs>
+ <prereq>compile</prereq>
+ </prereqs>
+ <parameters>
+ <parameter>
+ <name>sourceDirectory</name>
+ <expression>#project.build.unitTestSourceDirectory</expression>
+ </parameter>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.test.dest</expression>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <expression>#project.classpathElements</expression>
+ </parameter>
+ <parameter>
+ <name>compiler</name>
+ <expression>javac</expression>
+ </parameter>
+ </parameters>
+ </goal>
+ </goals>
+
+
<goals>
<goal>
<name>compile</name>
1.4 +1 -1 maven-components/maven-plugins/maven-scm-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-scm-plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 12 Apr 2004 20:14:19 -0000 1.3
+++ project.xml 7 May 2004 23:48:42 -0000 1.4
@@ -34,7 +34,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>scm-api</artifactId>
- <version>1.0-beta-1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
1.10 +3 -1
maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/XdocPlugin.java
Index: XdocPlugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/XdocPlugin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XdocPlugin.java 15 Apr 2004 03:22:09 -0000 1.9
+++ XdocPlugin.java 7 May 2004 23:48:43 -0000 1.10
@@ -114,6 +114,8 @@
catch ( Exception e )
{
System.out.println( "error rendering: " + file );
+
+ e.printStackTrace();
}
}
}
1.2 +2 -14
maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/Xpp3Dom.java
Index: Xpp3Dom.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/Xpp3Dom.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xpp3Dom.java 7 Apr 2004 01:36:05 -0000 1.1
+++ Xpp3Dom.java 7 May 2004 23:48:43 -0000 1.2
@@ -13,9 +13,9 @@
private Map attributes;
- private List childList;
+ private List childList = new ArrayList();
- private Map childMap;
+ private Map childMap = new HashMap();
private Xpp3Dom parent;
@@ -71,13 +71,6 @@
public void addChild( Xpp3Dom xpp3Dom )
{
- if ( null == childList )
- {
- childList = new ArrayList();
-
- childMap = new HashMap();
- }
-
xpp3Dom.setParent( this );
childList.add( xpp3Dom );
@@ -87,11 +80,6 @@
public int getChildCount()
{
- if ( null == childList )
- {
- return 0;
- }
-
return childList.size();
}
1.2 +9 -3
maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element/AbstractXdocElementRenderer.java
Index: AbstractXdocElementRenderer.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element/AbstractXdocElementRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractXdocElementRenderer.java 14 Apr 2004 20:35:44 -0000 1.1
+++ AbstractXdocElementRenderer.java 7 May 2004 23:48:43 -0000 1.2
@@ -22,12 +22,18 @@
protected void renderElement( Xpp3Dom element, XMLWriter writer,
RenderingContext renderingContext )
throws Exception
{
- xdocRenderer.renderElement( element, writer, renderingContext );
+ if ( element != null )
+ {
+ xdocRenderer.renderElement( element, writer, renderingContext );
+ }
}
public void renderChildren( Xpp3Dom element, XMLWriter writer, RenderingContext
renderingContext )
throws Exception
{
- xdocRenderer.renderChildren( element, writer, renderingContext );
+ if ( element != null )
+ {
+ xdocRenderer.renderChildren( element, writer, renderingContext );
+ }
}
}
1.2 +14 -2
maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element/DocumentRenderer.java
Index: DocumentRenderer.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element/DocumentRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentRenderer.java 14 Apr 2004 20:34:15 -0000 1.1
+++ DocumentRenderer.java 7 May 2004 23:48:43 -0000 1.2
@@ -26,7 +26,19 @@
writer.startElement( "title" );
- writer.writeText( element.getChild( "properties" ).getChild( "title"
).getValue() );
+ Xpp3Dom properties = element.getChild( "properties" );
+
+ if ( properties != null )
+ {
+ if ( properties.getChild( "title" ) != null )
+ {
+ writer.writeText( properties.getChild( "title" ).getValue() );
+ }
+ else
+ {
+ writer.writeText( "No title specified" );
+ }
+ }
writer.endElement();
1.2 +7 -2
maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element/PropertiesRenderer.java
Index: PropertiesRenderer.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/main/java/org/apache/maven/xdoc/render/element/PropertiesRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertiesRenderer.java 14 Apr 2004 20:34:15 -0000 1.1
+++ PropertiesRenderer.java 7 May 2004 23:48:43 -0000 1.2
@@ -40,7 +40,12 @@
writer.addAttribute( "name", "email" );
- writer.addAttribute( "content", child.getAttribute( "email" ) );
+ String email = child.getAttribute( "email" );
+
+ if ( email != null )
+ {
+ writer.addAttribute( "content", child.getAttribute( "email" ) );
+ }
writer.endElement();
}
1.2 +6 -2
maven-components/maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render/IntegratedPluginGoalTestCase.java
Index: IntegratedPluginGoalTestCase.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render/IntegratedPluginGoalTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntegratedPluginGoalTestCase.java 12 Apr 2004 18:59:19 -0000 1.1
+++ IntegratedPluginGoalTestCase.java 7 May 2004 23:48:43 -0000 1.2
@@ -3,6 +3,7 @@
import org.apache.maven.plugin.Plugin;
import org.apache.maven.plugin.PluginExecutionRequest;
import org.apache.maven.plugin.PluginExecutionResponse;
+import org.apache.maven.plugin.manager.DefaultPluginManagerManager;
import org.apache.maven.plugin.descriptor.GoalDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
@@ -14,6 +15,7 @@
import java.io.File;
import java.io.InputStreamReader;
import java.util.Iterator;
+import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
@@ -83,7 +85,9 @@
GoalDescriptor goalDescriptor = findGoalDescriptor( pluginDescriptor, goal
);
- PluginExecutionRequest request = new PluginExecutionRequest(
pluginDescriptor, goalDescriptor, project );
+ Map parameters = DefaultPluginManagerManager.createParameters(
goalDescriptor, project );
+
+ PluginExecutionRequest request = new PluginExecutionRequest( parameters );
return request;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
