You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2006/06/13 00:18:06 UTC
svn commit: r413757 - in /maven/sandbox/plugins/maven-maven1-plugin/src:
main/java/org/apache/maven/maven1converter/plugins/
test/java/org/apache/maven/maven1converter/plugins/
Author: dennisl
Date: Mon Jun 12 15:18:04 2006
New Revision: 413757
URL: http://svn.apache.org/viewvc?rev=413757&view=rev
Log:
[MNG-2336] Tweak the configuration xml syntax
Modified:
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java
Modified: maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java?rev=413757&r1=413756&r2=413757&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java (original)
+++ maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java Mon Jun 12 15:18:04 2006
@@ -23,7 +23,6 @@
import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import java.io.StringReader;
import java.util.Iterator;
@@ -78,7 +77,9 @@
{
if ( value != null )
{
- configuration.addChild( newXpp3Dom( "<" + mavenTwoElement + ">" + value + "</" + mavenTwoElement + ">" ) );
+ Xpp3Dom child = new Xpp3Dom( mavenTwoElement );
+ child.setValue( value );
+ configuration.addChild( child );
}
}
@@ -88,7 +89,7 @@
{
boolean addPlugin = false;
- Xpp3Dom configuration = newXpp3Dom( "<configuration></configuration>" );
+ Xpp3Dom configuration = new Xpp3Dom( "configuration" );
buildConfiguration( configuration, v3Model, projectProperties );
@@ -196,17 +197,4 @@
protected abstract void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
throws MojoExecutionException;
-
- protected Xpp3Dom newXpp3Dom( String input )
- throws MojoExecutionException
- {
- try
- {
- return Xpp3DomBuilder.build( new StringReader( input ) );
- }
- catch ( Exception e )
- {
- throw new MojoExecutionException( "Unable to generate a new Xpp3Dom for " + input, e );
- }
- }
}
Modified: maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java?rev=413757&r1=413756&r2=413757&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java (original)
+++ maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java Mon Jun 12 15:18:04 2006
@@ -29,8 +29,7 @@
* @author Dennis Lundberg
* @version $Id$
*/
-public class PCCSurefire
- extends AbstractPluginConfigurationConverter
+public class PCCSurefire extends AbstractPluginConfigurationConverter
{
/**
* @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
@@ -84,15 +83,12 @@
StringTokenizer tokenizer = new StringTokenizer( sysproperties );
if ( tokenizer.hasMoreTokens() )
{
- Xpp3Dom systemProperties = newXpp3Dom( "<systemProperties></systemProperties>" );
+ Xpp3Dom systemProperties = new Xpp3Dom( "systemProperties" );
while ( tokenizer.hasMoreTokens() )
{
String name = tokenizer.nextToken();
String value = projectProperties.getProperty( name );
- if ( value != null )
- {
- systemProperties.addChild( newXpp3Dom( "<" + name + ">" + value + "</" + name + ">" ) );
- }
+ addConfigurationChild( systemProperties, name, value );
}
if ( systemProperties.getChildCount() > 0 )
{
@@ -112,25 +108,24 @@
List excludes = v3UnitTest.getExcludes();
if ( excludes != null && excludes.size() > 0 )
{
- Xpp3Dom includesConf = newXpp3Dom( "<excludes></excludes>" );
+ Xpp3Dom excludesConf = new Xpp3Dom( "excludes" );
for ( Iterator iter = excludes.iterator(); iter.hasNext(); )
{
- includesConf.addChild( newXpp3Dom( "<exclude>" + iter.next() + "</exclude>" ) );
+ addConfigurationChild( excludesConf, "exclude", (String) iter.next() );
}
- configuration.addChild( includesConf );
+ configuration.addChild( excludesConf );
}
List includes = v3UnitTest.getIncludes();
if ( includes != null && includes.size() > 0 )
{
- Xpp3Dom includesConf = newXpp3Dom( "<includes></includes>" );
+ Xpp3Dom includesConf = new Xpp3Dom( "includes" );
for ( Iterator iter = includes.iterator(); iter.hasNext(); )
{
- includesConf.addChild( newXpp3Dom( "<include>" + iter.next() + "</include>" ) );
+ addConfigurationChild( includesConf, "include", (String) iter.next() );
}
configuration.addChild( includesConf );
}
-
}
}
}
Modified: maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java?rev=413757&r1=413756&r2=413757&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java (original)
+++ maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java Mon Jun 12 15:18:04 2006
@@ -16,20 +16,19 @@
* limitations under the License.
*/
-import java.util.Properties;
-
import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.util.Properties;
+
/**
* @author Fabrizio Giustina
+ * @author Dennis Lundberg
* @version $Id$
*/
-public class PCCWar
- extends AbstractPluginConfigurationConverter
+public class PCCWar extends AbstractPluginConfigurationConverter
{
-
/**
* @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
@@ -44,16 +43,11 @@
}
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
- Properties projectProperties )
+ Properties projectProperties )
throws MojoExecutionException
{
-
String warSourceDirectory = projectProperties.getProperty( "maven.war.src" );
- if ( warSourceDirectory != null )
- {
- configuration.addChild( newXpp3Dom( "<warSourceDirectory>"
- + StringUtils.replace( warSourceDirectory, "${basedir}/", "" ) + "</warSourceDirectory>" ) );
- }
+ addConfigurationChild( configuration, "warSourceDirectory",
+ StringUtils.replace( warSourceDirectory, "${basedir}/", "" ) );
}
-
}
Modified: maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java?rev=413757&r1=413756&r2=413757&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java (original)
+++ maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java Mon Jun 12 15:18:04 2006
@@ -18,9 +18,7 @@
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import java.io.StringReader;
import java.util.Properties;
/**
@@ -39,7 +37,7 @@
{
super.setUp();
- configuration = Xpp3DomBuilder.build( new StringReader( "<configuration></configuration>" ) );
+ configuration = new Xpp3Dom( "configuration" );
projectProperties = new Properties();