You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/08/12 23:55:12 UTC
svn commit: r232399 - in /maven/components/trunk:
maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/
maven-core-it/it1013/ maven-core-it/it1013/src/
maven-core-it/it1013/src/main/ maven-core-it/it1013/src/main/java/
maven-core-it...
Author: jdcasey
Date: Fri Aug 12 14:55:00 2005
New Revision: 232399
URL: http://svn.apache.org/viewcvs?rev=232399&view=rev
Log:
o Improving toString for Dependency in the 4.0.0 version codeSegment in maven.mdo
o Improving error messages for ResourceDoesNotExistException in the transformations
o Adding specificity to the dependency validation stuff, to output which dependency is offending...
o Added it1013 to show off the new dependency validation stuff.
Added:
maven/components/trunk/maven-core-it/it1013/
maven/components/trunk/maven-core-it/it1013/expected-results.txt (with props)
maven/components/trunk/maven-core-it/it1013/goals.txt (with props)
maven/components/trunk/maven-core-it/it1013/pom.xml (with props)
maven/components/trunk/maven-core-it/it1013/src/
maven/components/trunk/maven-core-it/it1013/src/main/
maven/components/trunk/maven-core-it/it1013/src/main/java/
maven/components/trunk/maven-core-it/it1013/src/main/java/org/
maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/
maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java (with props)
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=232399&r1=232398&r2=232399&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Fri Aug 12 14:55:00 2005
@@ -98,7 +98,9 @@
}
catch ( ResourceDoesNotExistException e )
{
- getLogger().debug( "Error resolving artifact version from metadata.", e );
+ getLogger().debug(
+ "Artifact version metadata for: " + artifact.getId()
+ + " could not be found on repository: " + repository.getId(), e );
continue;
}
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=232399&r1=232398&r2=232399&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Fri Aug 12 14:55:00 2005
@@ -69,6 +69,10 @@
}
catch ( ResourceDoesNotExistException e )
{
+ getLogger().debug(
+ "Snapshot version metadata for: " + artifact.getId()
+ + " not found. Creating a new metadata instance.", e );
+
// ignore. We'll be creating this metadata if it doesn't exist...
metadata = (SnapshotArtifactMetadata) createMetadata( artifact );
}
Added: maven/components/trunk/maven-core-it/it1013/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1013/expected-results.txt?rev=232399&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1013/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it1013/expected-results.txt Fri Aug 12 14:55:00 2005
@@ -0,0 +1,3 @@
+target/classes/org/apache/maven/it0000/Person.class
+target/test-classes/org/apache/maven/it0000/PersonTest.class
+target/maven-core-it0000-1.0.jar
Propchange: maven/components/trunk/maven-core-it/it1013/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1013/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1013/goals.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1013/goals.txt?rev=232399&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1013/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it1013/goals.txt Fri Aug 12 14:55:00 2005
@@ -0,0 +1 @@
+package
Propchange: maven/components/trunk/maven-core-it/it1013/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1013/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1013/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1013/pom.xml?rev=232399&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1013/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it1013/pom.xml Fri Aug 12 14:55:00 2005
@@ -0,0 +1,14 @@
+<model>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it1001</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</model>
Propchange: maven/components/trunk/maven-core-it/it1013/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1013/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java?rev=232399&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java (added)
+++ maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java Fri Aug 12 14:55:00 2005
@@ -0,0 +1,5 @@
+package org.apache.maven.it1000;
+
+public class Dummy
+{
+}
Propchange: maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1013/src/main/java/org/apache/maven/it1001/Dummy.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=232399&r1=232398&r2=232399&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Fri Aug 12 14:55:00 2005
@@ -1265,11 +1265,20 @@
</fields>
<codeSegments>
<codeSegment>
- <version>3.0.0+</version>
+ <version>3.0.0</version>
<code><![CDATA[
public String toString()
{
return groupId + "/" + type + "s:" + artifactId + "-" + version;
+ }
+ ]]></code>
+ </codeSegment>
+ <codeSegment>
+ <version>4.0.0</version>
+ <code><![CDATA[
+ public String toString()
+ {
+ return "Dependency {groupId=" + groupId + ", artifactId=" + artifactId + ", version=" + version + ", type=" + type + "}";
}
]]></code>
</codeSegment>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=232399&r1=232398&r2=232399&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Fri Aug 12 14:55:00 2005
@@ -55,13 +55,13 @@
{
Dependency d = (Dependency) it.next();
- validateStringNotEmpty( "dependencies.dependency.artifactId", result, d.getArtifactId() );
+ validateSubElementStringNotEmpty( d, "dependencies.dependency.artifactId", result, d.getArtifactId() );
- validateStringNotEmpty( "dependencies.dependency.groupId", result, d.getGroupId() );
+ validateSubElementStringNotEmpty( d, "dependencies.dependency.groupId", result, d.getGroupId() );
- validateStringNotEmpty( "dependencies.dependency.type", result, d.getType() );
+ validateSubElementStringNotEmpty( d, "dependencies.dependency.type", result, d.getType() );
- validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion() );
+ validateSubElementStringNotEmpty( d, "dependencies.dependency.version", result, d.getVersion() );
}
DependencyManagement mgmt = model.getDependencyManagement();
@@ -71,14 +71,11 @@
{
Dependency d = (Dependency) it.next();
- validateStringNotEmpty( "dependencyManagement.dependencies.dependency.artifactId", result,
+ validateSubElementStringNotEmpty( d, "dependencyManagement.dependencies.dependency.artifactId", result,
d.getArtifactId() );
- validateStringNotEmpty( "dependencyManagement.dependencies.dependency.groupId", result,
+ validateSubElementStringNotEmpty( d, "dependencyManagement.dependencies.dependency.groupId", result,
d.getGroupId() );
-
- validateStringNotEmpty( "dependencyManagement.dependencies.dependency.version", result,
- d.getVersion() );
}
}
@@ -164,7 +161,32 @@
return true;
}
- result.addMessage( "'" + fieldName + "' is empty." );
+ result.addMessage( "'" + fieldName + "' is missing." );
+
+ return false;
+ }
+
+ /**
+ * Asserts:
+ * <p/>
+ * <ul>
+ * <li><code>string.length != null</code>
+ * <li><code>string.length > 0</code>
+ * </ul>
+ */
+ private boolean validateSubElementStringNotEmpty( Object subElementInstance, String fieldName, ModelValidationResult result, String string )
+ {
+ if ( !validateSubElementNotNull( subElementInstance, fieldName, result, string ) )
+ {
+ return false;
+ }
+
+ if ( string.length() > 0 )
+ {
+ return true;
+ }
+
+ result.addMessage( "In " + subElementInstance + ":\n\n -> '" + fieldName + "' is missing." );
return false;
}
@@ -184,6 +206,25 @@
}
result.addMessage( "'" + fieldName + "' is missing." );
+
+ return false;
+ }
+
+ /**
+ * Asserts:
+ * <p/>
+ * <ul>
+ * <li><code>string != null</code>
+ * </ul>
+ */
+ private boolean validateSubElementNotNull( Object subElementInstance, String fieldName, ModelValidationResult result, Object object )
+ {
+ if ( object != null )
+ {
+ return true;
+ }
+
+ result.addMessage( "In " + subElementInstance + ":\n\n -> '" + fieldName + "' is missing." );
return false;
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=232399&r1=232398&r2=232399&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java Fri Aug 12 14:55:00 2005
@@ -72,7 +72,7 @@
assertEquals( 1, result.getMessageCount() );
- assertEquals( "'packaging' is empty.", result.getMessage( 0 ) );
+ assertEquals( "'packaging' is missing.", result.getMessage( 0 ) );
}
public void testMissingVersion()
@@ -92,7 +92,7 @@
assertEquals( 1, result.getMessageCount() );
- assertEquals( "'dependencies.dependency.artifactId' is missing.", result.getMessage( 0 ) );
+ assertTrue( result.getMessage( 0 ).indexOf( "'dependencies.dependency.artifactId' is missing." ) > -1 );
}
public void testMissingDependencyGroupId()
@@ -102,7 +102,7 @@
assertEquals( 1, result.getMessageCount() );
- assertEquals( "'dependencies.dependency.groupId' is missing.", result.getMessage( 0 ) );
+ assertTrue( result.getMessage( 0 ).indexOf( "'dependencies.dependency.groupId' is missing." ) > -1 );
}
public void testMissingDependencyVersion()
@@ -112,7 +112,7 @@
assertEquals( 1, result.getMessageCount() );
- assertEquals( "'dependencies.dependency.version' is missing.", result.getMessage( 0 ) );
+ assertTrue( result.getMessage( 0 ).indexOf( "'dependencies.dependency.version' is missing." ) > -1 );
}
public void testMissingDependencyManagementArtifactId()
@@ -122,7 +122,7 @@
assertEquals( 1, result.getMessageCount() );
- assertEquals( "'dependencyManagement.dependencies.dependency.artifactId' is missing.", result.getMessage( 0 ) );
+ assertTrue( result.getMessage( 0 ).indexOf( "'dependencyManagement.dependencies.dependency.artifactId' is missing." ) > -1 );
}
public void testMissingDependencyManagementGroupId()
@@ -132,17 +132,7 @@
assertEquals( 1, result.getMessageCount() );
- assertEquals( "'dependencyManagement.dependencies.dependency.groupId' is missing.", result.getMessage( 0 ) );
- }
-
- public void testMissingDependencyManagementVersion()
- throws Exception
- {
- ModelValidationResult result = validate( "missing-dependency-mgmt-version-pom.xml" );
-
- assertEquals( 1, result.getMessageCount() );
-
- assertEquals( "'dependencyManagement.dependencies.dependency.version' is missing.", result.getMessage( 0 ) );
+ assertTrue( result.getMessage( 0 ).indexOf( "'dependencyManagement.dependencies.dependency.groupId' is missing." ) > -1 );
}
public void testMissingAll()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org