Author: brett
Date: Wed Nov 23 20:09:06 2005
New Revision: 348639
URL: http://svn.apache.org/viewcvs?rev=348639&view=rev
Log:
convert resource directory consistently with Maven 1.0.2 settings
PR: MRM-22
Modified:
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
Modified:
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java?rev=348639&r1=348638&r2=348639&view=diff
==============================================================================
---
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
(original)
+++
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
Wed Nov 23 20:09:06 2005
@@ -30,8 +30,6 @@
import org.apache.maven.model.Notifier;
import org.apache.maven.model.Organization;
import org.apache.maven.model.Plugin;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
@@ -46,8 +44,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* @author jdcasey
@@ -248,6 +244,7 @@
return scm;
}
+/*
private Reporting translateReports( List v3Reports, Reporter reporter )
throws ReportWriteException
{
@@ -297,6 +294,7 @@
return reports;
}
+*/
private Organization translateOrganization(
org.apache.maven.model.v3_0_0.Organization v3Organization,
Reporter reporter )
@@ -462,7 +460,7 @@
distributionManagement.setRepository( repository );
- distributionManagement.setStatus("converted");
+ distributionManagement.setStatus( "converted" );
if ( site == null && repository == null )
{
@@ -590,7 +588,7 @@
String optional = v3Dep.getProperty( "optional" );
if ( StringUtils.isNotEmpty( optional ) )
{
- dep.setOptional( Boolean.parseBoolean(optional) );
+ dep.setOptional( Boolean.parseBoolean( optional ) );
}
deps.add( dep );
@@ -748,7 +746,14 @@
org.apache.maven.model.v3_0_0.Resource v3Resource =
(org.apache.maven.model.v3_0_0.Resource) it.next();
Resource resource = new Resource();
- resource.setDirectory( v3Resource.getDirectory() );
+ if ( v3Resource.getDirectory() == null )
+ {
+ resource.setDirectory( "." );
+ }
+ else
+ {
+ resource.setDirectory( v3Resource.getDirectory() );
+ }
List excludes = new ArrayList( v3Resource.getExcludes() );
Modified:
maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java?rev=348639&r1=348638&r2=348639&view=diff
==============================================================================
---
maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
(original)
+++
maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
Wed Nov 23 20:09:06 2005
@@ -20,22 +20,26 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.Resource;
import org.apache.maven.tools.repoclean.report.DummyReporter;
+import org.apache.maven.tools.repoclean.report.ReportWriteException;
import org.apache.maven.tools.repoclean.report.Reporter;
import org.codehaus.plexus.PlexusTestCase;
+import java.util.Arrays;
+
public class PomV3ToV4TranslatorTest
extends PlexusTestCase
{
-
+
private PomV3ToV4Translator translator;
private Reporter reporter;
-
+
private org.apache.maven.model.v3_0_0.Dependency v3Dep;
-
+
private org.apache.maven.model.v3_0_0.Model v3Model;
-
+
protected void setUp()
throws Exception
{
@@ -50,6 +54,19 @@
v3Dep.setVersion( "1.0" );
v3Model = new org.apache.maven.model.v3_0_0.Model();
+ v3Model.setBuild( new org.apache.maven.model.v3_0_0.Build() );
+ }
+
+ public void testConvertedEmptyResourceDirectory()
+ throws ReportWriteException
+ {
+ org.apache.maven.model.v3_0_0.Resource v3Resource = new
org.apache.maven.model.v3_0_0.Resource();
+ v3Resource.setIncludes( Arrays.asList( new String[]{"**/*.properties"}
) );
+ v3Model.getBuild().addResource( v3Resource );
+
+ Model result = translator.translate( v3Model, reporter );
+ Resource resource = (Resource) result.getBuild().getResources().get( 0
);
+ assertEquals( "check directory of v3Resource", ".",
resource.getDirectory() );
}
public void testShouldConvertScopePropertyToDependencyScope()
