svn commit: r747837 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-core/src/test/java/org/apache/maven/doxia/sink/ doxia-modules/doxia-module-confluence/src
Author: ltheussl
Date: Wed Feb 25 15:50:39 2009
New Revision: 747837
URL: http://svn.apache.org/viewvc?rev=747837view=rev
Log:
Replace deprecated verbatim( boxed ).
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java?rev=747837r1=747836r2=747837view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java
Wed Feb 25 15:50:39 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import javax.swing.text.MutableAttributeSet;
+
/**
* Empty implementation of the codeSink/code interface. Useful for testing
purposes.
*
@@ -804,12 +806,13 @@
/** {...@inheritdoc} */
public void verbatim( SinkEventAttributes attributes )
{
+MutableAttributeSet atts = SinkUtils.filterAttributes( attributes,
SinkUtils.SINK_VERBATIM_ATTRIBUTES );
+
boolean boxed = false;
-if ( attributes != null attributes.isDefined( boxed ) )
+if ( atts != null atts.isDefined( SinkEventAttributes.DECORATION ) )
{
-boxed = Boolean.valueOf(
-(String) attributes.getAttribute( boxed ) ).booleanValue();
+boxed = boxed.equals( atts.getAttribute(
SinkEventAttributes.DECORATION ).toString() );
}
verbatim( boxed );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?rev=747837r1=747836r2=747837view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Wed Feb 25 15:50:39 2009
@@ -476,14 +476,14 @@
}
/**
- * Checks that the sequence code[verbatim( true ), text( text ),
+ * Checks that the sequence code[verbatim( SinkEventAttributeSet.BOXED
), text( text ),
* verbatim_()]/code, invoked on the current sink, produces the
* same result as {...@link #getVerbatimBlock getVerbatimBlock}( text ).
*/
public void testVerbatim()
{
String text = Text;
-sink.verbatim( true );
+sink.verbatim( SinkEventAttributeSet.BOXED );
sink.text( text );
sink.verbatim_();
sink.flush();
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java?rev=747837r1=747836r2=747837view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
Wed Feb 25 15:50:39 2009
@@ -85,7 +85,7 @@
generateList( sink );
-sink.verbatim( true );
+sink.verbatim( SinkEventAttributeSet.BOXED );
sink.text( Verbatim text not contained in list item 3 );
sink.verbatim_();
@@ -266,7 +266,7 @@
sink.definedTerm_();
sink.definition();
sink.text( of definition list. );
-sink.verbatim( true );
+sink.verbatim( SinkEventAttributeSet.BOXED );
sink.text( Verbatim text + eol + in a box
);
svn commit: r747756 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc: AbstractFixJavadocMojo.java TestFixJavadocMojo.java
Author: vsiveton
Date: Wed Feb 25 11:36:26 2009
New Revision: 747756
URL: http://svn.apache.org/viewvc?rev=747756view=rev
Log:
o refactor clirr uses
- added clirrNewClasses and clirrNewMethods fields to know what it is added
- updated isNewClassFromLastVersion/isNewMethodFromLastRevision
o added writeClirr() method to write a clirr diff file when debug is enabled
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=747756r1=747755r2=747756view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Wed Feb 25 11:36:26 2009
@@ -35,10 +35,12 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -346,9 +348,14 @@
private String[] fixTagsSplitted;
/**
- * API differences found by Clirr.
+ * New classes found by Clirr.
*/
-private List clirrApiDifferences;
+private List clirrNewClasses;
+
+/**
+ * New Methods in a Class (the key) found by Clirr.
+ */
+private Map clirrNewMethods;
/** {...@inheritdoc} */
public void execute()
@@ -480,7 +487,7 @@
* @throws MojoExecutionException if any
*/
protected void executeClirr()
-throws MojoExecutionException, MojoFailureException
+throws MojoExecutionException
{
if ( ignoreClirr )
{
@@ -515,37 +522,19 @@
return;
}
-this.clirrApiDifferences =
wrapper.getClirrDiffListener().getApiDifferences();
+clirrNewClasses = wrapper.getNewClasses();
+clirrNewMethods = wrapper.getNewMethods();
if ( getLog().isInfoEnabled() )
{
-if ( clirrApiDifferences.isEmpty() )
+if ( clirrNewClasses.isEmpty() clirrNewMethods.isEmpty() )
{
-getLog().info( Clirr NOT found Api differences. );
+getLog().info( Clirr NOT found API differences. );
}
else
{
-getLog().info( Clirr found Api differences. );
-
-if ( getLog().isDebugEnabled() )
-{
-StringBuffer sb = new StringBuffer();
-
-MessageTranslator translator = new MessageTranslator();
-translator.setLocale( Locale.ENGLISH );
-for ( Iterator it = clirrApiDifferences.iterator();
it.hasNext(); )
-{
-ApiDifference diff = (ApiDifference) it.next();
-
-sb.append( diff.getReport( translator ) );
-if ( it.hasNext() )
-{
-sb.append( EOL );
-}
-}
-
-getLog().debug( sb.toString() );
-}
+getLog().info( Clirr found API differences, i.e. new classes
or new methods. );
+writeClirr();
}
}
}
@@ -700,6 +689,70 @@
}
/**
+ * In debug mode, write {...@link #clirrNewClasses} and {...@link
#clirrNewMethods} in the file
+ * codeproject.getBuild().getDirectory()/clirr.diff/code
+ */
+private void writeClirr()
+{
+if ( !getLog().isDebugEnabled() )
+{
+return;
+}
+
+StringBuffer sb = new StringBuffer();
+
+for ( Iterator it = clirrNewClasses.iterator(); it.hasNext(); )
+{
+String newClass = (String) it.next();
+
+sb.append( Added Class );
+sb.append( ' ).append( newClass ).append( ' );
+sb.append( EOL );
+}
+for ( Iterator it = clirrNewMethods.entrySet().iterator();
it.hasNext(); )
+{
+Map.Entry entry = (Map.Entry) it.next();
+
+sb.append( In the Class );
+sb.append( ' ).append( entry.getKey() ).append( ' );
+sb.append( EOL );
+
+for ( Iterator it2 = ( (List) entry.getValue() ).iterator();
it2.hasNext(); )
+{
+
svn commit: r747757 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc: AbstractFixJavadocMojo.java TestFixJavadocMojo.java
Author: vsiveton
Date: Wed Feb 25 11:42:53 2009
New Revision: 747757
URL: http://svn.apache.org/viewvc?rev=747757view=rev
Log:
o make executeClirr() private
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=747757r1=747756r2=747757view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Wed Feb 25 11:42:53 2009
@@ -365,9 +365,9 @@
{
if ( getLog().isInfoEnabled() )
{
-getLog().info( NOT fix classes, fields and methods specified.
Nothing to do. );
-return;
+getLog().info( Specified to NOT fix classes, fields and
methods. Nothing to do. );
}
+return;
}
// add warranty msg
@@ -481,64 +481,6 @@
return new URLClassLoader( (URL[]) urls.toArray( new URL[urls.size()]
), null );
}
-/**
- * Calling Clirr to find API differences via clirr-maven-plugin.
- *
- * @throws MojoExecutionException if any
- */
-protected void executeClirr()
-throws MojoExecutionException
-{
-if ( ignoreClirr )
-{
-if ( getLog().isInfoEnabled() )
-{
-getLog().info( Clirr is ignored. );
-}
-return;
-}
-
-ClirrMojoWrapper wrapper = null;
-try
-{
-wrapper =
-new ClirrMojoWrapper( getClassesDirectory(),
comparisonVersion, getArtifactType( project ),
- artifactFactory, localRepository,
mavenProjectBuilder,
- artifactMetadataSource, project,
artifactResolver, includes, excludes );
-
-wrapper.execute();
-}
-catch ( Exception e )
-{
-if ( getLog().isDebugEnabled() )
-{
-getLog().error( Error when executing Clirr: +
e.getMessage(), e );
-}
-else
-{
-getLog().error( Error when executing Clirr: +
e.getMessage() );
-}
-getLog().error( Clirr is ignored );
-return;
-}
-
-clirrNewClasses = wrapper.getNewClasses();
-clirrNewMethods = wrapper.getNewMethods();
-
-if ( getLog().isInfoEnabled() )
-{
-if ( clirrNewClasses.isEmpty() clirrNewMethods.isEmpty() )
-{
-getLog().info( Clirr NOT found API differences. );
-}
-else
-{
-getLog().info( Clirr found API differences, i.e. new classes
or new methods. );
-writeClirr();
-}
-}
-}
-
// --
// private methods
// --
@@ -689,6 +631,64 @@
}
/**
+ * Calling Clirr to find API differences via clirr-maven-plugin.
+ *
+ * @throws MojoExecutionException if any
+ */
+private void executeClirr()
+throws MojoExecutionException
+{
+if ( ignoreClirr )
+{
+if ( getLog().isInfoEnabled() )
+{
+getLog().info( Clirr is ignored. );
+}
+return;
+}
+
+ClirrMojoWrapper wrapper = null;
+try
+{
+wrapper =
+new ClirrMojoWrapper( getClassesDirectory(),
comparisonVersion, getArtifactType( project ),
+ artifactFactory, localRepository,
mavenProjectBuilder,
+ artifactMetadataSource, project,
artifactResolver, includes, excludes );
+
+wrapper.execute();
+}
+catch ( Exception e )
+{
+if ( getLog().isDebugEnabled() )
+{
+getLog().error( Error when executing Clirr: +
e.getMessage(), e );
+}
+else
+{
+getLog().error( Error when executing Clirr: +
e.getMessage() );
+}
+getLog().error( Clirr is ignored );
+return;
+}
+
+clirrNewClasses = wrapper.getNewClasses();
+clirrNewMethods =
svn commit: r747758 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Author: vsiveton
Date: Wed Feb 25 11:43:17 2009
New Revision: 747758
URL: http://svn.apache.org/viewvc?rev=747758view=rev
Log:
o added javadoc
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java?rev=747758r1=747757r2=747758view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Wed Feb 25 11:43:17 2009
@@ -84,6 +84,7 @@
return test-jar;
}
+/** {...@inheritdoc} */
public void execute()
throws MojoExecutionException, MojoFailureException
{
svn commit: r747760 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Author: vsiveton
Date: Wed Feb 25 11:56:23 2009
New Revision: 747760
URL: http://svn.apache.org/viewvc?rev=747760view=rev
Log:
o specify QDOX issueId
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=747760r1=747759r2=747760view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Wed Feb 25 11:56:23 2009
@@ -2308,7 +2308,7 @@
{
Type type = javaMethod.getParameters()[i].getType();
-// Note Qdox: type.getValue() = E instead of real class...
+// QDOX-150: type.getValue() = E instead of real class...
try
{
getClass( type.getJavaClass(), project );
svn commit: r747763 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Author: vsiveton
Date: Wed Feb 25 12:34:52 2009
New Revision: 747763
URL: http://svn.apache.org/viewvc?rev=747763view=rev
Log:
o take care of javadoc separator for since
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=747763r1=747762r2=747763view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Wed Feb 25 12:34:52 2009
@@ -1652,12 +1652,16 @@
String originalTag = getJavadocComment( originalContent,
entity, docletTag );
originalTag = removeLastEmptyJavadocLines( originalTag );
-StringTokenizer token =
-new StringTokenizer( originalTag.substring(
originalTag.indexOf( @ + THROWS_TAG ) + 7 ), EOL
-+ );
-if ( token.countTokens() 0 )
+String atThrows = @ + THROWS_TAG;
+if ( originalTag.indexOf( atThrows ) != -1 )
{
-tagThrows.add( token.nextToken() );
+StringTokenizer token =
+new StringTokenizer( originalTag.substring(
originalTag.indexOf( atThrows )
++ atThrows.length() ), EOL + );
+if ( token.countTokens() 0 )
+{
+tagThrows.add( token.nextToken() );
+}
}
}
@@ -1669,11 +1673,12 @@
String param = null;
-if ( docletTag.getName().equals( PARAM_TAG ) )
+String atParam = @ + PARAM_TAG;
+if ( docletTag.getName().equals( PARAM_TAG )
originalTag.indexOf( atParam ) != -1 )
{
StringTokenizer token =
-new StringTokenizer( originalTag.substring(
originalTag.indexOf( @ + PARAM_TAG ) + 6 ),
- EOL + );
+new StringTokenizer( originalTag.substring(
originalTag.indexOf( atParam )
++ atParam.length() ), EOL + );
if ( token.countTokens() 0 )
{
param = token.nextToken();
@@ -1974,12 +1979,6 @@
if ( fixTag( SINCE_TAG ) )
{
-if ( !addSeparator )
-{
-addSeparator( sb, indent );
-addSeparator = true;
-}
-
if ( !isJavaMethod )
{
JavaClass javaClass = (JavaClass) entity;
@@ -1988,11 +1987,23 @@
{
if ( isNewClassFromLastVersion( javaClass ) )
{
+if ( !addSeparator )
+{
+addSeparator( sb, indent );
+addSeparator = true;
+}
+
addDefaultSince( sb, indent );
}
}
else
{
+if ( !addSeparator )
+{
+addSeparator( sb, indent );
+addSeparator = true;
+}
+
addDefaultSince( sb, indent );
}
}
@@ -2004,11 +2015,23 @@
{
if ( isNewMethodFromLastRevision( javaMethod ) )
{
+if ( !addSeparator )
+{
+addSeparator( sb, indent );
+addSeparator = true;
+}
+
addDefaultSince( sb, indent );
}
}
else
{
+if ( !addSeparator )
+{
+addSeparator( sb, indent );
+addSeparator = true;
+}
+
addDefaultSince( sb, indent );
}
}
svn commit: r747764 - /maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml
Author: brett Date: Wed Feb 25 12:40:50 2009 New Revision: 747764 URL: http://svn.apache.org/viewvc?rev=747764view=rev Log: [MNG-3379] JDK14 compatibility for tests Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml?rev=747764r1=747763r2=747764view=diff == --- maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml Wed Feb 25 12:40:50 2009 @@ -68,7 +68,7 @@ /dependency dependency groupIdedu.umd.cs.mtc/groupId - artifactIdmultithreadedtc/artifactId + artifactIdmultithreadedtc-jdk14/artifactId version1.01/version scopetest/scope /dependency
svn commit: r747765 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Author: vsiveton Date: Wed Feb 25 12:42:14 2009 New Revision: 747765 URL: http://svn.apache.org/viewvc?rev=747765view=rev Log: o bump to latest version Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=747765r1=747764r2=747765view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Wed Feb 25 12:42:14 2009 @@ -133,12 +133,12 @@ dependency groupIdcommons-lang/groupId artifactIdcommons-lang/artifactId - version2.1/version + version2.4/version /dependency dependency groupIdcom.thoughtworks.qdox/groupId artifactIdqdox/artifactId - version1.8/version + version1.9/version /dependency dependency groupIdnet.sf.clirr/groupId @@ -199,7 +199,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version1.5.7/version + version1.5.8/version /dependency dependency
svn commit: r747773 - in /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli: AbstractConsoleDownloadMonitor.java ConsoleDownloadMonitor.java
Author: brett
Date: Wed Feb 25 13:35:29 2009
New Revision: 747773
URL: http://svn.apache.org/viewvc?rev=747773view=rev
Log:
[MNG-3379] guarantee that whitespace covers previous lines
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java?rev=747773r1=747772r2=747773view=diff
==
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
Wed Feb 25 13:35:29 2009
@@ -79,15 +79,33 @@
public void transferCompleted( TransferEvent transferEvent )
{
+String line = createCompletionLine( transferEvent );
+out.println( line );
+}
+
+protected String createCompletionLine( TransferEvent transferEvent )
+{
+String line;
long contentLength = transferEvent.getResource().getContentLength();
if ( contentLength != WagonConstants.UNKNOWN_LENGTH )
{
+StringBuffer buf = new StringBuffer();
String type = ( transferEvent.getRequestType() ==
TransferEvent.REQUEST_PUT ? uploaded : downloaded );
-String l = contentLength = 1024 ? ( contentLength / 1024 ) + K
: contentLength + b;
+buf.append( contentLength = 1024 ? ( contentLength / 1024 ) + K
: contentLength + b );
String name = transferEvent.getResource().getName();
name = name.substring( name.lastIndexOf( '/' ) + 1, name.length()
);
-out.println( l + + type + ( + name + )
);
+buf.append( );
+buf.append( type );
+buf.append( ( );
+buf.append( name );
+buf.append( ) );
+line = buf.toString();
+}
+else
+{
+line = ;
}
+return line;
}
public void transferError( TransferEvent transferEvent )
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=747773r1=747772r2=747773view=diff
==
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
Wed Feb 25 13:35:29 2009
@@ -38,6 +38,7 @@
extends AbstractConsoleDownloadMonitor
{
private Map/* Resource,Integer */downloads;
+private int maxLength;
public ConsoleDownloadMonitor( Logger logger )
{
@@ -80,19 +81,26 @@
downloads.put( resource, complete );
}
+StringBuffer buf = new StringBuffer();
for ( Iterator i = downloads.entrySet().iterator(); i.hasNext(); )
{
Map.Entry entry = (Map.Entry) i.next();
Long complete = (Long) entry.getValue();
String status =
getDownloadStatusForResource( complete.longValue(), (
(Resource) entry.getKey() ).getContentLength() );
-out.print( status );
+buf.append( status );
if ( i.hasNext() )
{
-out.print( );
+buf.append( );
}
}
-out.print( \r );
+
+if ( buf.length() maxLength )
+{
+maxLength = buf.length();
+}
+
+out.print( buf.toString() + \r );
}
String getDownloadStatusForResource( long progress, long total )
@@ -109,7 +117,15 @@
public synchronized void transferCompleted( TransferEvent transferEvent )
{
-super.transferCompleted( transferEvent );
+StringBuffer line = new StringBuffer( createCompletionLine(
transferEvent ) );
+
+while ( line.length() maxLength )
+{
+line.append( );
+}
+maxLength = 0;
+
+out.println( line );
downloads.remove( transferEvent.getResource() );
}
}
svn commit: r747778 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Author: vsiveton
Date: Wed Feb 25 13:50:13 2009
New Revision: 747778
URL: http://svn.apache.org/viewvc?rev=747778view=rev
Log:
o take care of new methods in interface found by clirr
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=747778r1=74r2=747778view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Wed Feb 25 13:50:13 2009
@@ -2352,7 +2352,7 @@
}
if ( !isMaybeGeneric )
{
-if ( clirrMethod.indexOf( StringUtils.join(
javaMethodParams.iterator(), , ) ) != -1 )
+if ( clirrMethod.indexOf( ( + StringUtils.join(
javaMethodParams.iterator(), , ) + ) ) != -1 )
{
return true;
}
@@ -2918,6 +2918,17 @@
list.add( diff.getAffectedMethod() );
clirrNewMethods.put( diff.getAffectedClass(), list );
}
+
+if ( msg.startsWith( Method ) msg.endsWith( added to an
interface ) )
+{
+List list = (List) clirrNewMethods.get(
diff.getAffectedClass() );
+if ( list == null )
+{
+list = new ArrayList();
+}
+list.add( diff.getAffectedMethod() );
+clirrNewMethods.put( diff.getAffectedClass(), list );
+}
}
}
svn commit: r747779 - in /maven/doxia/site/src/site: apt/modules/index.apt xdoc/references/index.xml
Author: ltheussl
Date: Wed Feb 25 13:53:37 2009
New Revision: 747779
URL: http://svn.apache.org/viewvc?rev=747779view=rev
Log:
Add info about fo module
Modified:
maven/doxia/site/src/site/apt/modules/index.apt
maven/doxia/site/src/site/xdoc/references/index.xml
Modified: maven/doxia/site/src/site/apt/modules/index.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/modules/index.apt?rev=747779r1=747778r2=747779view=diff
==
--- maven/doxia/site/src/site/apt/modules/index.apt (original)
+++ maven/doxia/site/src/site/apt/modules/index.apt Wed Feb 25 13:53:37 2009
@@ -85,8 +85,6 @@
[]
-~~ iText should be replaced by FOP
-
* {iText}
{{{http://www.lowagie.com/iText/}iText}} is a free Java/PDF library.
@@ -99,6 +97,19 @@
[]
+* {FO} (since Doxia 1.1)
+
+ XSL formatting objects (XSL-FO)
+
+ References:
+
+ * {{{http://www.w3.org/TR/xsl11/}XSL-FO Recommendation (05 December 2006)}}
+
+ * {{{http://zvon.org/xxl/xslfoReference/Output/index.html}XSL FO reference}}
+
+ * {{{http://xmlgraphics.apache.org/fop/}Apache FOP}}
+
+ []
* {LaTeX}
Modified: maven/doxia/site/src/site/xdoc/references/index.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/xdoc/references/index.xml?rev=747779r1=747778r2=747779view=diff
==
--- maven/doxia/site/src/site/xdoc/references/index.xml (original)
+++ maven/doxia/site/src/site/xdoc/references/index.xml Wed Feb 25 13:53:37 2009
@@ -115,6 +115,16 @@
/tr
tr
+tdFOsup*/sup/td
+tdXSL formatting objects (XSL-FO)/td
+td align=centerimg src=../images/icon_error_sml.gif
alt=No//td
+td align=centerimg src=../images/icon_success_sml.gif
alt=Yes//td
+td/td
+td/td
+td/td
+ /tr
+
+ tr
tdLaTeX/td
tdLaTeX typesetting system/td
td align=centerimg src=../images/icon_error_sml.gif
alt=No//td
@@ -165,6 +175,9 @@
/tr
/table
+p
+ sup*/sup Since Doxia 1.1
+/p
/section
/body
svn commit: r747780 - in /maven/doxia/doxia/trunk: doxia-book/src/main/java/org/apache/maven/doxia/book/ doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/ doxia-core/src/ma
Author: vsiveton
Date: Wed Feb 25 13:55:23 2009
New Revision: 747780
URL: http://svn.apache.org/viewvc?rev=747780view=rev
Log:
o fixed @since due to a bug in javadoc:fix
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxia.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractTextSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxia.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxia.java?rev=747780r1=747779r2=747780view=diff
==
---
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxia.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxia.java
Wed Feb 25 13:55:23 2009
@@ -71,6 +71,7 @@
* @param inputEncoding the input encoding when processing {...@link
files}.
* @param outputEncoding the output encoding when writing files in
{...@link ouputDirectory}.
* @throws org.apache.maven.doxia.book.BookDoxiaException if the model
cannot be loaded.
+ * @since 1.1
*/
void renderBook( BookModel book, String bookRendererId, List files, File
outputDirectory, Locale locale,
String inputEncoding, String outputEncoding )
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java?rev=747780r1=747779r2=747780view=diff
==
---
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
Wed Feb 25 13:55:23 2009
@@ -110,6 +110,8 @@
/**
* Writes the default LaTeX commands and preamble in the main book file.
+ *
+ * @since 1.1
*/
public void defaultBookPreamble()
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java?rev=747780r1=747779r2=747780view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
Wed Feb 25 13:55:23 2009
@@ -104,6 +104,7 @@
* @param string A string that provides the source input.
* @param sink A sink that consumes the Doxia events.
* @throws org.apache.maven.doxia.parser.ParseException if the string
could not be parsed.
+ * @since 1.1
*/
public void parse( String string, Sink sink )
throws ParseException
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java?rev=747780r1=747779r2=747780view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java
(original)
+++
svn commit: r747799 - in /maven/components/branches/maven-2.1.x/maven-settings/src/test: java/org/apache/maven/settings/ resources/ resources/org/ resources/org/apache/ resources/org/apache/maven/ res
Author: brett
Date: Wed Feb 25 14:40:02 2009
New Revision: 747799
URL: http://svn.apache.org/viewvc?rev=747799view=rev
Log:
[MNG-2387] active on proxy in settings is misleading (test cases)
Submitted by: Torben S. Giesselmann
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
(with props)
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
(with props)
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
(with props)
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
(with props)
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java?rev=747799view=auto
==
---
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
(added)
+++
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
Wed Feb 25 14:40:02 2009
@@ -0,0 +1,33 @@
+package org.apache.maven.settings;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class SettingsTest extends TestCase {
+
+ private Settings settingsNoProxies;
+ private Settings settingsOneInactiveProxy;
+ private Settings settingsOneActiveProxy;
+
+
+ protected void setUp() throws Exception {
+
+ super.setUp();
+
+ // Read different settings files for proxy testing.
+ DefaultMavenSettingsBuilder settingsBuilder = new
DefaultMavenSettingsBuilder();
+ settingsNoProxies = settingsBuilder.buildSettings(new
File(src/test/resources/org/apache/maven/settings/settings-no-proxies.xml),
false);
+ settingsOneInactiveProxy = settingsBuilder.buildSettings(new
File(src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml),
false);
+ settingsOneActiveProxy = settingsBuilder.buildSettings(new
File(src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml),
false);
+
+ }
+
+
+ public void testProxySettings() {
+
+ assertNull(settingsNoProxies.getActiveProxy());
+ assertNull(settingsOneInactiveProxy.getActiveProxy());
+ assertNotNull(settingsOneActiveProxy.getActiveProxy());
+ }
+}
Propchange:
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
--
svn:eol-style = native
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml?rev=747799view=auto
==
---
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
(added)
+++
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
Wed Feb 25 14:40:02 2009
@@ -0,0 +1,6 @@
+settings
+
+ proxies
+ /proxies
+
+/settings
Propchange:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
--
svn:eol-style = native
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml?rev=747799view=auto
==
---
svn commit: r747800 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ apache-maven/src/test/ maven-integration-tests/ maven-model/src/test/ maven-settings/src/test/java/org/apache/maven/se
Author: brett Date: Wed Feb 25 14:43:58 2009 New Revision: 747800 URL: http://svn.apache.org/viewvc?rev=747800view=rev Log: [MNG-2387] active on proxy in settings is misleading (test cases) Submitted by: Torben S. Giesselmann Merged from: r747799 Added: maven/components/branches/maven-2.0.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java - copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/ - copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/ maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/ - copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/ maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/ - copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/ maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/ - copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/ maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/ - copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/ maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml - copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml - copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml - copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml Modified: maven/components/branches/maven-2.0.x/ (props changed) maven/components/branches/maven-2.0.x/apache-maven/ (props changed) maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props changed) maven/components/branches/maven-2.0.x/maven-integration-tests/ (props changed) maven/components/branches/maven-2.0.x/maven-model/src/test/ (props changed) Propchange: maven/components/branches/maven-2.0.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 14:43:58 2009 @@ -1,3 +1,3 @@ /maven/components/branches/maven-2.0.10-RC:708790-728809,728834 -/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683 +/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799 /maven/components/trunk:720001,721902,726845,729292 Propchange: maven/components/branches/maven-2.0.x/apache-maven/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 14:43:58 2009 @@ -1,5 +1,5 @@ /maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834 /maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055 -/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683 +/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799 /maven/components/trunk/apache-maven:720001,721902,726845 /maven/components/trunk/maven-distribution:727688 Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 25 14:43:58 2009 @@ -1,2 +1,2 @@ /maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834 -/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683
svn commit: r747854 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/bootstrap/ core-it-suite/src/test/resources/mng-2690/
Author: jdcasey Date: Wed Feb 25 16:42:47 2009 New Revision: 747854 URL: http://svn.apache.org/viewvc?rev=747854view=rev Log: [MNG-2690] Adding plugin that triggers various sorts of errors during mojo loading and execution. Also adding integration tests for the NoClassDefFoundError origins in mojo loading and configuration, and ComponentLookupException from the same places. Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/mojo-complookup/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/mojo-complookup/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/noclassdef-mojo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/noclassdef-mojo/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/noclassdef-param/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/noclassdef-param/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/requirement-complookup/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2690/requirement-complookup/pom.xml (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/pom.xml (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorComponentMojo.java (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorInterfaceMojo.java (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/RequirementComponentLookupExceptionMojo.java (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=747854r1=747853r2=747854view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Wed Feb 25 16:42:47 2009 @@ -239,6 +239,7 @@ suite.addTestSuite( MavenITmng2739RequiredRepositoryElementsTest.class ); suite.addTestSuite(
svn commit: r747877 - in /maven/components/trunk/maven-repository: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java/org/apach
Author: jvanzyl
Date: Wed Feb 25 18:10:02 2009
New Revision: 747877
URL: http://svn.apache.org/viewvc?rev=747877view=rev
Log:
o adding a separate module for the repository system so that oleg can start a
mercury implementation
Added:
maven/components/trunk/maven-repository/
maven/components/trunk/maven-repository/src/
maven/components/trunk/maven-repository/src/main/
maven/components/trunk/maven-repository/src/main/java/
maven/components/trunk/maven-repository/src/main/java/org/
maven/components/trunk/maven-repository/src/main/java/org/apache/
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
- copied, changed from r747665,
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
- copied, changed from r747665,
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Copied:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(from r747665,
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?p2=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.javap1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.javar1=747665r2=747877rev=747877view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 18:10:02 2009
@@ -31,7 +31,6 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
@@ -73,6 +72,9 @@
implements MavenRepositorySystem
{
@Requirement
+private Logger logger;
+
+@Requirement
private ArtifactFactory artifactFactory;
@Requirement
@@ -85,14 +87,8 @@
private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
@Requirement
-private WagonManager wagonManager;
-
-@Requirement
private ArtifactMetadataSource artifactMetadataSource;
-@Requirement
-private Logger logger;
-
private static HashMapString, Artifact cache = new HashMapString,
Artifact();
// Artifact Creation
Copied:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(from r747665,
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?p2=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.javap1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.javar1=747665r2=747877rev=747877view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Wed Feb 25 18:10:02 2009
@@ -49,6 +49,9 @@
public interface MavenRepositorySystem
extends ArtifactMetadataSource // This needs to be removed
{
+// More then one local repository is required, could be layered locals
or workspaces
+// Remove ResolutionGroup
+// Only have one resolve() method
// Artifact creation: This needs to be reduced to fewer, if not one,
method.
Artifact createArtifact( String groupId, String artifactId, String
version, String scope, String type );
@@ -68,7 +71,7 @@
Artifact createDependencyArtifact( String groupId, String artifactId,
String version, String type, String classifier, String scope, boolean optional
);
Artifact
svn commit: r747880 - /maven/components/trunk/maven-repository/pom.xml
Author: jvanzyl Date: Wed Feb 25 18:13:25 2009 New Revision: 747880 URL: http://svn.apache.org/viewvc?rev=747880view=rev Log: o POM for the separation of the repository system Added: maven/components/trunk/maven-repository/pom.xml (with props) Added: maven/components/trunk/maven-repository/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/pom.xml?rev=747880view=auto == --- maven/components/trunk/maven-repository/pom.xml (added) +++ maven/components/trunk/maven-repository/pom.xml Wed Feb 25 18:13:25 2009 @@ -0,0 +1,55 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; + parent +artifactIdmaven/artifactId +groupIdorg.apache.maven/groupId +version3.0-SNAPSHOT/version + /parent + modelVersion4.0.0/modelVersion + artifactIdmaven-repository/artifactId + nameMaven Project/name + descriptionRepository System interface for Maven./description + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-model/artifactId +/dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-utils/artifactId +/dependency +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-compat/artifactId +/dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-container-default/artifactId +/dependency +dependency + groupIdorg.apache.maven.wagon/groupId + artifactIdwagon-file/artifactId + scopetest/scope +/dependency + /dependencies +/project Propchange: maven/components/trunk/maven-repository/pom.xml -- svn:eol-style = native Propchange: maven/components/trunk/maven-repository/pom.xml -- svn:keywords = Author Date Id Revision
svn commit: r747886 - in /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository: LegacyMavenRepositorySystem.java MavenRepositorySystem.java
Author: jvanzyl
Date: Wed Feb 25 18:28:14 2009
New Revision: 747886
URL: http://svn.apache.org/viewvc?rev=747886view=rev
Log:
o trying to decouple the interface from maven-project. we're stuck with
MavenProject at the moment
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747886r1=747885r2=747886view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 18:28:14 2009
@@ -31,6 +31,7 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
@@ -72,9 +73,6 @@
implements MavenRepositorySystem
{
@Requirement
-private Logger logger;
-
-@Requirement
private ArtifactFactory artifactFactory;
@Requirement
@@ -87,8 +85,14 @@
private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
@Requirement
+private WagonManager wagonManager;
+
+@Requirement
private ArtifactMetadataSource artifactMetadataSource;
+@Requirement
+private Logger logger;
+
private static HashMapString, Artifact cache = new HashMapString,
Artifact();
// Artifact Creation
@@ -124,7 +128,7 @@
{
return null;
}
-
+
return artifactFactory.createDependencyArtifact( groupId, artifactId,
versionRange, type, classifier, scope );
}
@@ -139,7 +143,7 @@
{
return null;
}
-
+
return artifactFactory.createDependencyArtifact( groupId, artifactId,
versionRange, type, classifier, scope, inheritedScope );
}
@@ -156,8 +160,8 @@
}
return artifactFactory.createExtensionArtifact( groupId, artifactId,
versionRange );
-}
-
+}
+
public Artifact createParentArtifact( String groupId, String artifactId,
String version )
{
return artifactFactory.createParentArtifact( groupId, artifactId,
version );
@@ -174,7 +178,7 @@
{
return null;
}
-
+
return artifactFactory.createPluginArtifact( groupId, artifactId,
versionRange );
}
@@ -344,7 +348,7 @@
// Taken from RepositoryHelper
public void findModelFromRepository( Artifact artifact, List
remoteArtifactRepositories, ArtifactRepository localRepository )
-throws ProjectBuildingException
+throws InvalidRepositoryException, ArtifactResolutionException,
ArtifactNotFoundException
{
if ( cache.containsKey( artifact.getId() ) )
@@ -370,26 +374,15 @@
projectArtifact = artifactFactory.createProjectArtifact(
artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
artifact.getScope() );
}
-try
-{
-artifactResolver.resolve( projectArtifact,
remoteArtifactRepositories, localRepository );
+artifactResolver.resolve( projectArtifact, remoteArtifactRepositories,
localRepository );
-File file = projectArtifact.getFile();
-artifact.setFile( file );
-cache.put( artifact.getId(), artifact );
-}
-catch ( ArtifactResolutionException e )
-{
-throw new ProjectBuildingException( projectId, Error getting POM
for ' + projectId + ' from the repository: + e.getMessage(), e );
-}
-catch ( ArtifactNotFoundException e )
-{
-throw new ProjectBuildingException( projectId, POM ' + projectId
+ ' not found in repository: + e.getMessage(), e );
-}
+File file = projectArtifact.getFile();
+artifact.setFile( file );
+cache.put( artifact.getId(), artifact );
}
private List normalizeToArtifactRepositories( List
remoteArtifactRepositories, String projectId )
-throws ProjectBuildingException
+throws InvalidRepositoryException
{
List normalized = new ArrayList( remoteArtifactRepositories.size() );
@@ -405,21 +398,14 @@
svn commit: r747887 - in /maven/mercury/trunk: mercury-ant-tasks/ mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/ mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercu
Author: ogusakov
Date: Wed Feb 25 18:28:29 2009
New Revision: 747887
URL: http://svn.apache.org/viewvc?rev=747887view=rev
Log:
[MERCURY-93] - added UTs for repository id hash
Modified:
maven/mercury/trunk/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Modified: maven/mercury/trunk/mercury-ant-tasks/build.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/build.xml?rev=747887r1=747886r2=747887view=diff
==
--- maven/mercury/trunk/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/build.xml Wed Feb 25 18:28:29 2009
@@ -159,10 +159,7 @@
/target
target name=deploy depends=compile
-merc:write repoid=localRepo
-name=t:t:1.0
-file=${jar.target}/t.jar
- /
+merc:write repoid=localRepo name=t:t:1.0 file=${jar.target}/t.jar/
/target
target name=deploy-verify depends=compile
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java?rev=747887r1=747886r2=747887view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
Wed Feb 25 18:28:29 2009
@@ -369,7 +369,7 @@
// ---
public void testWriteToRepository()
{
-String title = write;
+String title = deploy;
System.out.println( start + title );
System.out.flush();
@@ -379,7 +379,7 @@
File ap = new File( _writeRepoDirFile, /t/t/1.0/t-1.0.pom );
assertFalse( ap.exists() );
-executeTarget( deploy );
+executeTarget( title );
assertTrue( af.exists() );
assertTrue( ap.exists() );
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java?rev=747887r1=747886r2=747887view=diff
==
---
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
Wed Feb 25 18:28:29 2009
@@ -88,6 +88,9 @@
{
try
{
+if( id == null || (id.indexOf('/') == -1 id.indexOf('\\') ==
-1) )
+return id;
+
MessageDigest digest = MessageDigest.getInstance( SHA-1 );
digest.update( id.getBytes() );
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java?rev=747887r1=747886r2=747887view=diff
==
---
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
Wed Feb 25 18:28:29 2009
@@ -35,6 +35,10 @@
{
String res = AbstractRepository.hashId( central );
-assertEquals( 233ec5bda5fa468329234788b4ee61711ea3041e, res );
+assertEquals( central, res );
+
+res = AbstractRepository.hashId( http://central; );
+
+assertEquals( 3e447f03cb543932ff37403fe937841ff58ff788, res );
}
}
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL:
svn commit: r747888 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/plugin/ maven-embedder/src/main/java/org/apache/maven/embedder/execution/ maven-project/src/main/java/org/ap
Author: jvanzyl
Date: Wed Feb 25 18:28:39 2009
New Revision: 747888
URL: http://svn.apache.org/viewvc?rev=747888view=rev
Log: (empty)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=747888r1=747887r2=747888view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Wed Feb 25 18:28:39 2009
@@ -138,7 +138,7 @@
protected PluginVersionManager pluginVersionManager;
@Requirement
-protected MavenRepositorySystem repositoryTools;
+protected MavenRepositorySystem repositorySystem;
@Requirement
protected RuntimeInformation runtimeInformation;
@@ -393,7 +393,7 @@
try
{
-projectPluginDependencies = repositoryTools.createArtifacts(
+projectPluginDependencies = repositorySystem.createArtifacts(
plugin.getDependencies(),
null,
coreArtifactFilterManager.getCoreArtifactFilter(),
@@ -409,7 +409,7 @@
try
{
-resolutionGroup = repositoryTools.retrieve( pluginArtifact,
localRepository, project.getRemoteArtifactRepositories() );
+resolutionGroup = repositorySystem.retrieve( pluginArtifact,
localRepository, project.getRemoteArtifactRepositories() );
}
catch ( ArtifactMetadataRetrievalException e )
{
@@ -458,9 +458,9 @@
.setRemoteRepostories( repositories.isEmpty() ?
Collections.EMPTY_LIST : new ArrayList( repositories ) )
.setManagedVersionMap( pluginManagedDependencies )
.setFilter( filter )
-.setMetadataSource( repositoryTools );
+.setMetadataSource( repositorySystem );
-ArtifactResolutionResult result = repositoryTools.resolve( request );
+ArtifactResolutionResult result = repositorySystem.resolve( request );
if ( result.hasErrorArtifactExceptions() )
{
@@ -548,13 +548,13 @@
MavenProject p = (MavenProject) i.next();
resolveTransitiveDependencies( session,
- repositoryTools,
+ repositorySystem,
mojoDescriptor.isDependencyResolutionRequired(),
p,
mojoDescriptor.isAggregator() );
}
-downloadDependencies( project, session, repositoryTools );
+downloadDependencies( project, session, repositorySystem );
}
String goalName = mojoDescriptor.getFullGoalName();
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=747888r1=747887r2=747888view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Wed Feb 25 18:28:39 2009
@@ -208,8 +208,8 @@
profileManager.addProfile( profile );
-// We need to convert profile repositories to artifact
repositories
-
+// We need to convert profile repositories to artifact
repositories
+
svn commit: r747889 - /maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/
Author: bentmann Date: Wed Feb 25 18:34:39 2009 New Revision: 747889 URL: http://svn.apache.org/viewvc?rev=747889view=rev Log: o Updated license header Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorComponentMojo.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorInterfaceMojo.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/RequirementComponentLookupExceptionMojo.java Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java?rev=747889r1=747888r2=747889view=diff == --- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java (original) +++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java Wed Feb 25 18:34:39 2009 @@ -1,5 +1,24 @@ package org.apache.maven.plugin.coreit; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java?rev=747889r1=747888r2=747889view=diff == --- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java (original) +++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java Wed Feb 25 18:34:39 2009 @@ -1,19 +1,22 @@ package org.apache.maven.plugin.coreit; /* - * Copyright 2001-2005 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under
svn commit: r747890 - /maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/
Author: bentmann Date: Wed Feb 25 18:35:25 2009 New Revision: 747890 URL: http://svn.apache.org/viewvc?rev=747890view=rev Log: o Added IDE files to svn:ignore Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/ (props changed) Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-error/ -- --- svn:ignore (added) +++ svn:ignore Wed Feb 25 18:35:25 2009 @@ -0,0 +1,7 @@ +target +*.iml +.classpath +.project +.settings +target-eclipse +bin
svn commit: r747899 - /maven/core-integration-testing/trunk/core-it-suite/pom.xml
Author: bentmann
Date: Wed Feb 25 19:46:56 2009
New Revision: 747899
URL: http://svn.apache.org/viewvc?rev=747899view=rev
Log:
o Updated to emma4it-maven-plugin:1.2
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=747899r1=747898r2=747899view=diff
==
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Wed Feb 25
19:46:56 2009
@@ -226,7 +226,7 @@
artifactItem
groupIdemma/groupId
artifactIdemma/artifactId
- version2.0.5312/version
+ version2.1.5320/version
/artifactItem
/artifactItems
outputDirectory${project.build.directory}/distro/lib/outputDirectory
@@ -237,7 +237,7 @@
plugin
groupIdorg.sonatype.maven.plugin/groupId
artifactIdemma4it-maven-plugin/artifactId
-version1.2-SNAPSHOT/version
+version1.2/version
configuration
jarSets
jarSet
@@ -284,18 +284,6 @@
/plugin
/plugins
/build
- repositories
-repository
- idsonatype.org/id
- urlhttp://repository.sonatype.org/content/groups/public/url
-/repository
- /repositories
- pluginRepositories
-pluginRepository
- idsonatype.org/id
- urlhttp://repository.sonatype.org/content/groups/public/url
-/pluginRepository
- /pluginRepositories
/profile
/profiles
/project
svn commit: r747901 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven: project/ project/artifact/ repository/
Author: ogusakov
Date: Wed Feb 25 20:01:52 2009
New Revision: 747901
URL: http://svn.apache.org/viewvc?rev=747901view=rev
Log:
refactored the single repository interface to get rid of Project - replaced
with sudo-repository interface to find reactor artifacts if any
Added:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
(with props)
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=747901r1=747900r2=747901view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Wed Feb 25 20:01:52 2009
@@ -68,6 +68,7 @@
import org.apache.maven.project.artifact.ActiveProjectArtifact;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
+import org.apache.maven.repository.MavenRepositoryWrapper;
import org.apache.maven.repository.MavenRepositorySystem;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -87,7 +88,7 @@
* /ol
*/
public class MavenProject
-implements Cloneable
+implements Cloneable, MavenRepositoryWrapper
{
public static final String EMPTY_PROJECT_GROUP_ID = unknown;
@@ -1705,6 +1706,11 @@
{
return getBuild() != null ? getBuild().getDefaultGoal() : null;
}
+
+public Artifact find( Artifact artifact )
+{
+return replaceWithActiveArtifact( artifact );
+}
public Artifact replaceWithActiveArtifact( Artifact pluginArtifact )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=747901r1=747900r2=747901view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Wed Feb 25 20:01:52 2009
@@ -55,6 +55,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.validation.ModelValidationResult;
+import org.apache.maven.repository.MavenRepositoryWrapper;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -461,7 +462,7 @@
ListDependency dependencies,
String inheritedScope,
ArtifactFilter
dependencyFilter,
- MavenProject project )
+ MavenRepositoryWrapper
reactor )
throws InvalidDependencyVersionException
{
SetArtifact projectArtifacts = new LinkedHashSetArtifact(
dependencies.size() );
@@ -486,7 +487,7 @@
}
catch ( InvalidVersionSpecificationException e )
{
-throw new InvalidDependencyVersionException( project.getId(),
d, project.getFile(), e );
+throw new InvalidDependencyVersionException( reactor.getId(),
d, reactor.getFile(), e );
}
Artifact artifact = artifactFactory.createDependencyArtifact(
d.getGroupId(), d.getArtifactId(),
versionRange, d.getType(), d.getClassifier(),
@@ -527,9 +528,9 @@
artifact.setDependencyFilter( artifactFilter );
-if ( project != null )
+if ( reactor != null )
{
-artifact = project.replaceWithActiveArtifact( artifact );
+artifact = reactor.find( artifact );
}
projectArtifacts.add(
svn commit: r747904 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository: LegacyMavenRepositorySystem.java MavenRepositorySystem.java
Author: jvanzyl Date: Wed Feb 25 20:06:32 2009 New Revision: 747904 URL: http://svn.apache.org/viewvc?rev=747904view=rev Log: o remove MavenProject imports Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747904r1=747903r2=747904view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Wed Feb 25 20:06:32 2009 @@ -52,7 +52,6 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Repository; import org.apache.maven.model.RepositoryPolicy; -import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.wagon.authentication.AuthenticationInfo; Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=747904r1=747903r2=747904view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java Wed Feb 25 20:06:32 2009 @@ -33,7 +33,6 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.model.Dependency; import org.apache.maven.model.Repository; -import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.wagon.events.TransferListener;
svn commit: r747905 - in /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository: LegacyMavenRepositorySystem.java MavenRepositorySystem.java MavenRepositoryWrapper.java
Author: jvanzyl
Date: Wed Feb 25 20:09:57 2009
New Revision: 747905
URL: http://svn.apache.org/viewvc?rev=747905view=rev
Log:
o trying out some more decoupling in a separate module
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
(with props)
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747905r1=747904r2=747905view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 20:09:57 2009
@@ -52,8 +52,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
@@ -182,7 +180,7 @@
return artifactFactory.createPluginArtifact( groupId, artifactId,
versionRange );
}
-public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenProject project )
+public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
project )
throws InvalidDependencyVersionException
{
return MavenMetadataSource.createArtifacts( artifactFactory,
dependencies, inheritedScope, dependencyFilter, project );
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=747905r1=747904r2=747905view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Wed Feb 25 20:09:57 2009
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -26,20 +25,14 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DeploymentRepository;
-import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.wagon.events.TransferListener;
@@ -69,7 +62,7 @@
Artifact createDependencyArtifact( String groupId, String artifactId,
String version, String type, String classifier, String scope, String
inheritedScope );
-SetArtifact createArtifacts( ListDependency dependencies, String
inheritedScope, ArtifactFilter dependencyFilter, MavenProject project )
+SetArtifact createArtifacts( ListDependency dependencies, String
inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor
)
throws InvalidDependencyVersionException;
// Repository creation
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
URL:
svn commit: r747910 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Author: jvanzyl
Date: Wed Feb 25 20:35:29 2009
New Revision: 747910
URL: http://svn.apache.org/viewvc?rev=747910view=rev
Log:
o remove static method from MavenMetadataSource
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747910r1=747909r2=747910view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 20:35:29 2009
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -45,15 +46,17 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -180,14 +183,88 @@
return artifactFactory.createPluginArtifact( groupId, artifactId,
versionRange );
}
-public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
project )
+/**
+ * @return {...@link Set} lt; {...@link Artifact}
+ * @todo desperately needs refactoring. It's just here because it's
implementation is maven-project specific
+ */
+public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
reactor )
throws InvalidDependencyVersionException
{
-return MavenMetadataSource.createArtifacts( artifactFactory,
dependencies, inheritedScope, dependencyFilter, project );
-}
+SetArtifact projectArtifacts = new LinkedHashSetArtifact(
dependencies.size() );
+
+for ( IteratorDependency i = dependencies.iterator(); i.hasNext(); )
+{
+Dependency d = i.next();
+
+String scope = d.getScope();
+
+if ( StringUtils.isEmpty( scope ) )
+{
+scope = Artifact.SCOPE_COMPILE;
+
+d.setScope( scope );
+}
+
+VersionRange versionRange;
+try
+{
+versionRange = VersionRange.createFromVersionSpec(
d.getVersion() );
+}
+catch ( InvalidVersionSpecificationException e )
+{
+throw new InvalidDependencyVersionException( reactor.getId(),
d, reactor.getFile(), e );
+}
+Artifact artifact = artifactFactory.createDependencyArtifact(
d.getGroupId(), d.getArtifactId(),
+
versionRange, d.getType(), d.getClassifier(),
+
scope, inheritedScope, d.isOptional() );
+
+if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
+{
+artifact.setFile( new File( d.getSystemPath() ) );
+}
+
+ArtifactFilter artifactFilter = dependencyFilter;
-//
+if ( ( artifact != null ) ( ( artifactFilter == null ) ||
artifactFilter.include( artifact ) ) )
+{
+if ( ( d.getExclusions() != null )
!d.getExclusions().isEmpty() )
+{
+ListString exclusions = new ArrayListString();
+for ( IteratorExclusion j =
d.getExclusions().iterator(); j.hasNext(); )
+{
+Exclusion e = j.next();
+
svn commit: r747911 - /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Author: jvanzyl
Date: Wed Feb 25 20:35:44 2009
New Revision: 747911
URL: http://svn.apache.org/viewvc?rev=747911view=rev
Log:
o one more class to decouple which i'll leave to oleg
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747911r1=747910r2=747911view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 20:35:44 2009
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -45,15 +46,17 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -180,14 +183,88 @@
return artifactFactory.createPluginArtifact( groupId, artifactId,
versionRange );
}
-public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
project )
+/**
+ * @return {...@link Set} lt; {...@link Artifact}
+ * @todo desperately needs refactoring. It's just here because it's
implementation is maven-project specific
+ */
+public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
reactor )
throws InvalidDependencyVersionException
{
-return MavenMetadataSource.createArtifacts( artifactFactory,
dependencies, inheritedScope, dependencyFilter, project );
-}
+SetArtifact projectArtifacts = new LinkedHashSetArtifact(
dependencies.size() );
+
+for ( IteratorDependency i = dependencies.iterator(); i.hasNext(); )
+{
+Dependency d = i.next();
+
+String scope = d.getScope();
+
+if ( StringUtils.isEmpty( scope ) )
+{
+scope = Artifact.SCOPE_COMPILE;
+
+d.setScope( scope );
+}
+
+VersionRange versionRange;
+try
+{
+versionRange = VersionRange.createFromVersionSpec(
d.getVersion() );
+}
+catch ( InvalidVersionSpecificationException e )
+{
+throw new InvalidDependencyVersionException( reactor.getId(),
d, reactor.getFile(), e );
+}
+Artifact artifact = artifactFactory.createDependencyArtifact(
d.getGroupId(), d.getArtifactId(),
+
versionRange, d.getType(), d.getClassifier(),
+
scope, inheritedScope, d.isOptional() );
+
+if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
+{
+artifact.setFile( new File( d.getSystemPath() ) );
+}
+
+ArtifactFilter artifactFilter = dependencyFilter;
-//
+if ( ( artifact != null ) ( ( artifactFilter == null ) ||
artifactFilter.include( artifact ) ) )
+{
+if ( ( d.getExclusions() != null )
!d.getExclusions().isEmpty() )
+{
+ListString exclusions = new ArrayListString();
+for ( IteratorExclusion j =
d.getExclusions().iterator(); j.hasNext(); )
+{
+Exclusion e =
svn commit: r747913 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: MavenProject.java artifact/MavenMetadataSource.java
Author: jvanzyl
Date: Wed Feb 25 20:40:28 2009
New Revision: 747913
URL: http://svn.apache.org/viewvc?rev=747913view=rev
Log:
o remove MavenMetadataSource's static call
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=747913r1=747912r2=747913view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Wed Feb 25 20:40:28 2009
@@ -1661,7 +1661,7 @@
public SetArtifact createArtifacts( ArtifactFactory artifactFactory,
String inheritedScope, ArtifactFilter dependencyFilter )
throws InvalidDependencyVersionException
{
-return MavenMetadataSource.createArtifacts( artifactFactory,
getDependencies(), inheritedScope, dependencyFilter, this );
+return repositorySystem.createArtifacts( getDependencies(),
inheritedScope, dependencyFilter, this );
}
public void addProjectReference( MavenProject project )
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=747913r1=747912r2=747913view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Wed Feb 25 20:40:28 2009
@@ -454,92 +454,6 @@
return repositories;
}
-/**
- * @return {...@link Set} lt; {...@link Artifact}
- * @todo desperately needs refactoring. It's just here because it's
implementation is maven-project specific
- */
-public static SetArtifact createArtifacts( ArtifactFactory
artifactFactory,
- ListDependency dependencies,
- String inheritedScope,
- ArtifactFilter
dependencyFilter,
- MavenRepositoryWrapper
reactor )
-throws InvalidDependencyVersionException
-{
-SetArtifact projectArtifacts = new LinkedHashSetArtifact(
dependencies.size() );
-
-for ( IteratorDependency i = dependencies.iterator(); i.hasNext(); )
-{
-Dependency d = i.next();
-
-String scope = d.getScope();
-
-if ( StringUtils.isEmpty( scope ) )
-{
-scope = Artifact.SCOPE_COMPILE;
-
-d.setScope( scope );
-}
-
-VersionRange versionRange;
-try
-{
-versionRange = VersionRange.createFromVersionSpec(
d.getVersion() );
-}
-catch ( InvalidVersionSpecificationException e )
-{
-throw new InvalidDependencyVersionException( reactor.getId(),
d, reactor.getFile(), e );
-}
-Artifact artifact = artifactFactory.createDependencyArtifact(
d.getGroupId(), d.getArtifactId(),
-
versionRange, d.getType(), d.getClassifier(),
-
scope, inheritedScope, d.isOptional() );
-
-if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
-{
-artifact.setFile( new File( d.getSystemPath() ) );
-}
-
-ArtifactFilter artifactFilter = dependencyFilter;
-
-if ( ( artifact != null ) ( ( artifactFilter == null ) ||
artifactFilter.include( artifact ) ) )
-{
-if ( ( d.getExclusions() != null )
!d.getExclusions().isEmpty() )
-{
-ListString exclusions = new ArrayListString();
-for ( IteratorExclusion j =
d.getExclusions().iterator(); j.hasNext(); )
-{
-Exclusion e = j.next();
-exclusions.add( e.getGroupId() + : +
e.getArtifactId() );
-}
-
-ArtifactFilter newFilter = new ExcludesArtifactFilter(
exclusions );
-
-if ( artifactFilter != null )
-{
-
svn commit: r747919 - /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Author: jvanzyl
Date: Wed Feb 25 21:01:07 2009
New Revision: 747919
URL: http://svn.apache.org/viewvc?rev=747919view=rev
Log:
o fixing MavenMetadataSource
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=747919r1=747918r2=747919view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Wed Feb 25 21:01:07 2009
@@ -29,6 +29,7 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.MavenRepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
@@ -39,7 +40,14 @@
public class MavenMetadataSourceTest
extends PlexusTestCase
-{
+{
+private MavenRepositorySystem repositorySystem;
+
+protected void setUp()
+throws Exception
+{
+repositorySystem = lookup( MavenRepositorySystem.class );
+}
public void testShouldNotCarryExclusionsOverFromDependencyToDependency()
throws Exception
@@ -72,7 +80,7 @@
MavenProject project = new MavenProject( new Model() );
-Set result = MavenMetadataSource.createArtifacts( factory, deps, null,
dependencyFilter, project );
+Set result = repositorySystem.createArtifacts( deps, null,
dependencyFilter, project );
for ( Iterator it = result.iterator(); it.hasNext(); )
{
svn commit: r747921 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/MNG-4053/ resources/MNG-4053/test-1/ resources/MNG-4053/test-2/ resources/MNG
Author: bentmann
Date: Wed Feb 25 21:04:36 2009
New Revision: 747921
URL: http://svn.apache.org/viewvc?rev=747921view=rev
Log:
[MNG-4053] [regression] XML attributes in plugin configuration get duplicated
to other elements in combination with plugin management
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/test-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/test-1/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/test-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/test-2/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/test-3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/test-3/pom.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=747921r1=747920r2=747921view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Wed Feb 25 21:04:36 2009
@@ -91,6 +91,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng4053PluginConfigAttributesTest.class );
suite.addTestSuite( MavenITmng4040ProfileInjectedModulesTest.class );
suite.addTestSuite(
MavenITmng4036ParentResolutionFromSettingsRepoTest.class );
suite.addTestSuite( MavenITmng4034ManagedProfileDependencyTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java?rev=747921view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
Wed Feb 25 21:04:36 2009
@@ -0,0 +1,96 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-4053;MNG-4053/a.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4053PluginConfigAttributesTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng4053PluginConfigAttributesTest()
+{
+super( ALL_MAVEN_VERSIONS );
+}
+
+/**
+ * Verify that attributes in plugin configuration elements are not
erroneously duplicated to other elements when
+ * no plugin management is used.
+ */
+public void testitWithoutPluginMngt()
+throws Exception
+{
+testit( test-1 );
+}
+
+/**
+ * Verify that attributes in plugin configuration elements are not
erroneously duplicated to other elements when
+ * plugin management is used.
+ */
+public void
svn commit: r747923 - in /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository: LegacyMavenRepositorySystem.java MavenRepositorySystem.java VersionNotFoundException.java
Author: ogusakov
Date: Wed Feb 25 21:05:19 2009
New Revision: 747923
URL: http://svn.apache.org/viewvc?rev=747923view=rev
Log:
getting rid of project in the API layer
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
(with props)
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747923r1=747922r2=747923view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 21:05:19 2009
@@ -56,7 +56,7 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+//import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -188,7 +188,7 @@
* @todo desperately needs refactoring. It's just here because it's
implementation is maven-project specific
*/
public SetArtifact createArtifacts( ListDependency dependencies,
String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
reactor )
-throws InvalidDependencyVersionException
+throws VersionNotFoundException
{
SetArtifact projectArtifacts = new LinkedHashSetArtifact(
dependencies.size() );
@@ -212,7 +212,7 @@
}
catch ( InvalidVersionSpecificationException e )
{
-throw new InvalidDependencyVersionException( reactor.getId(),
d, reactor.getFile(), e );
+throw new VersionNotFoundException( reactor.getId(), d,
reactor.getFile(), e );
}
Artifact artifact = artifactFactory.createDependencyArtifact(
d.getGroupId(), d.getArtifactId(),
versionRange, d.getType(), d.getClassifier(),
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=747923r1=747922r2=747923view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Wed Feb 25 21:05:19 2009
@@ -33,7 +33,6 @@
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Repository;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.wagon.events.TransferListener;
/**
@@ -63,7 +62,7 @@
Artifact createDependencyArtifact( String groupId, String artifactId,
String version, String type, String classifier, String scope, String
inheritedScope );
SetArtifact createArtifacts( ListDependency dependencies, String
inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor
)
-throws InvalidDependencyVersionException;
+throws VersionNotFoundException;
// Repository creation
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java?rev=747923view=auto
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
(added)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
Wed Feb 25 21:05:19 2009
@@ -0,0 +1,59 @@
+package org.apache.maven.repository;
+
+import org.apache.maven.artifact.ArtifactUtils;
+import
svn commit: r747925 - /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Author: jvanzyl
Date: Wed Feb 25 21:10:31 2009
New Revision: 747925
URL: http://svn.apache.org/viewvc?rev=747925view=rev
Log:
o fixing the tests
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=747925r1=747924r2=747925view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Wed Feb 25 21:10:31 2009
@@ -46,6 +46,7 @@
protected void setUp()
throws Exception
{
+super.setUp();
repositorySystem = lookup( MavenRepositorySystem.class );
}
@@ -113,9 +114,7 @@
MavenProject project = new MavenProject( model );
-ArtifactFactory factory = lookup( ArtifactFactory.class );
-
-project.setArtifacts( project.createArtifacts( factory, null, null ) );
+project.setArtifacts( repositorySystem.createArtifacts(
project.getDependencies(), null, null, project ) );
String key = ArtifactUtils.versionlessKey( groupId, artifactId );
@@ -166,10 +165,8 @@
injector.injectDefaults( model );
-ArtifactFactory factory = lookup( ArtifactFactory.class );
-
-project.setArtifacts( project.createArtifacts( factory, null, null ) );
-
+project.setArtifacts( repositorySystem.createArtifacts(
project.getDependencies(), null, null, project ) );
+
String key = ArtifactUtils.versionlessKey( groupId, artifactId );
Map artifactMap = project.getArtifactMap();
svn commit: r747942 - /maven/plugins/trunk/maven-ejb-plugin/
Author: dennisl Date: Wed Feb 25 22:25:07 2009 New Revision: 747942 URL: http://svn.apache.org/viewvc?rev=747942view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-ejb-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-ejb-plugin/ -- bugtraq:logregex = MEJB-\d+ Propchange: maven/plugins/trunk/maven-ejb-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-ejb-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r747943 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/builder/ java/org/apache/maven/project/harness/ resources-project-builder/plugin-config-attribute
Author: bentmann
Date: Wed Feb 25 22:28:48 2009
New Revision: 747943
URL: http://svn.apache.org/viewvc?rev=747943view=rev
Log:
[MNG-4053] [regression] XML attributes in plugin configuration get duplicated
to other elements in combination with plugin management
o Added UT
Added:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
(with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-profile/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml
(with props)
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=747943r1=747942r2=747943view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Wed Feb 25 22:28:48 2009
@@ -813,19 +813,6 @@
}
/** MNG-4027
-public void testProjectInjectedDependencies()
-throws Exception
-{
-PomTestWrapper pom = buildPom( profile-injected-dependencies );
-assertEquals( 4, ( (List?) pom.getValue( dependencies ) ).size() );
-assertEquals( a, pom.getValue( dependencies[1]/artifactId ) );
-assertEquals( c, pom.getValue( dependencies[2]/artifactId ) );
-assertEquals( b, pom.getValue( dependencies[3]/artifactId ) );
-assertEquals( d, pom.getValue( dependencies[4]/artifactId ) );
-}
-//*/
-
-/** MNG-4027
public void testProfileInjectedDependencies()
throws Exception
{
@@ -853,7 +840,6 @@
}
//*/
-
/** MNG-4040 */
public void testProfileModuleInheritance()
throws Exception
@@ -862,6 +848,42 @@
assertEquals(0, ( (List?) pom.getValue( modules ) ).size());
}
+
+public void testPluginConfigurationUsingAttributesWithoutPluginManagement()
+throws Exception
+{
+PomTestWrapper pom = buildPom(
plugin-config-attributes/wo-plugin-mngt );
+assertEquals( src, pom.getValue(
build/plugins[1]/configuration/domParam/copy/@todir ) );
+assertEquals( true, pom.getValue(
build/plugins[1]/configuration/domParam/copy/@overwrite ) );
+assertEquals( target, pom.getValue(
build/plugins[1]/configuration/domParam/copy/fileset/@dir ) );
+assertEquals( null, pom.getValue(
build/plugins[1]/configuration/domParam/copy/fileset/@todir ) );
+assertEquals( null, pom.getValue(
build/plugins[1]/configuration/domParam/copy/fileset/@overwrite ) );
+}
+
+/** FIXME: MNG-4053
+public void testPluginConfigurationUsingAttributesWithPluginManagement()
+throws Exception
+{
+PomTestWrapper pom = buildPom(
plugin-config-attributes/w-plugin-mngt );
+assertEquals( src, pom.getValue(
build/plugins[1]/configuration/domParam/copy/@todir ) );
+assertEquals( true, pom.getValue(
build/plugins[1]/configuration/domParam/copy/@overwrite ) );
+assertEquals( target, pom.getValue(
build/plugins[1]/configuration/domParam/copy/fileset/@dir ) );
+assertEquals( null, pom.getValue(
build/plugins[1]/configuration/domParam/copy/fileset/@todir ) );
+assertEquals( null, pom.getValue(
build/plugins[1]/configuration/domParam/copy/fileset/@overwrite ) );
+}
+
+public void
svn commit: r747944 - /maven/plugins/trunk/maven-site-plugin/
Author: dennisl Date: Wed Feb 25 22:30:10 2009 New Revision: 747944 URL: http://svn.apache.org/viewvc?rev=747944view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-site-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-site-plugin/ -- bugtraq:logregex = MSITE-\d+ Propchange: maven/plugins/trunk/maven-site-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-site-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r747945 - /maven/plugins/trunk/maven-war-plugin/
Author: dennisl Date: Wed Feb 25 22:31:52 2009 New Revision: 747945 URL: http://svn.apache.org/viewvc?rev=747945view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-war-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-war-plugin/ -- bugtraq:logregex = MWAR-\d+ Propchange: maven/plugins/trunk/maven-war-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-war-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r747948 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml
Author: dennisl Date: Wed Feb 25 22:56:32 2009 New Revision: 747948 URL: http://svn.apache.org/viewvc?rev=747948view=rev Log: o Sync versions of Maven core dependencies with the Maven version specified in prerequisites Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=747948r1=747947r2=747948view=diff == --- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Feb 25 22:56:32 2009 @@ -53,12 +53,12 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0/version + version2.0.4/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.0/version + version2.0.4/version /dependency dependency groupIdorg.apache.maven/groupId
svn commit: r747950 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml
Author: dennisl Date: Wed Feb 25 23:02:41 2009 New Revision: 747950 URL: http://svn.apache.org/viewvc?rev=747950view=rev Log: [MEJB-35] Upgrade to Maven Archiver 2.4 Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=747950r1=747949r2=747950view=diff == --- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Feb 25 23:02:41 2009 @@ -63,7 +63,13 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId - version2.2/version + version2.4/version + exclusions +exclusion + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-component-api/artifactId +/exclusion + /exclusions /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r747953 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: dennisl Date: Wed Feb 25 23:05:08 2009 New Revision: 747953 URL: http://svn.apache.org/viewvc?rev=747953view=rev Log: [MEJB-35] Upgrade to Maven Archiver 2.4 Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=747953r1=747952r2=747953view=diff == --- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original) +++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Wed Feb 25 23:05:08 2009 @@ -176,7 +176,7 @@ /** * The archive configuration to use. * See a href=http://maven.apache.org/shared/maven-archiver/index.html;Maven Archiver Reference/a. - * This version of the EJB Plugin uses Maven Archiver 2.2. + * This version of the EJB Plugin uses Maven Archiver 2.4. * * @parameter */
svn commit: r747966 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugin/ejb/EjbMojo.java test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Author: dennisl
Date: Wed Feb 25 23:32:52 2009
New Revision: 747966
URL: http://svn.apache.org/viewvc?rev=747966view=rev
Log:
[MEJB-32] Add set classifier to client classifier
Submitted by: David Siefert
Reviewed by: Dennis Lundberg
o Patch applied with modifications (code style)
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=747966r1=747965r2=747966view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Wed Feb 25 23:32:52 2009
@@ -260,7 +260,13 @@
if ( generateClient )
{
-getLog().info( Building EJB client + jarName + -client );
+String clientJarName = jarName;
+if ( classifier != null )
+{
+clientJarName += - + classifier;
+}
+
+getLog().info( Building EJB client + clientJarName + -client
);
String[] excludes = DEFAULT_EXCLUDES;
String[] includes = DEFAULT_INCLUDES;
@@ -275,7 +281,7 @@
excludes = (String[]) clientExcludes.toArray(
EMPTY_STRING_ARRAY );
}
-File clientJarFile = new File( basedir, jarName + -client.jar );
+File clientJarFile = new File( basedir, clientJarName +
-client.jar );
MavenArchiver clientArchiver = new MavenArchiver();
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java?rev=747966r1=747965r2=747966view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Wed Feb 25 23:32:52 2009
@@ -530,20 +530,22 @@
protected void assertJarCreation( final MavenProject project, boolean
ejbJarCreated, boolean ejbClientJarCreated,
- String classifer )
+ String classifier )
{
String checkedJarFile;
-if ( classifer == null )
+String checkedClientJarFile;
+
+if ( classifier == null )
{
checkedJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + .jar;
+checkedClientJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + -client.jar;
}
else
{
-checkedJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + - + classifer + .jar;
+checkedJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + - + classifier + .jar;
+checkedClientJarFile = project.getBuild().getDirectory() + / +
DEFAULT_JAR_NAME + - + classifier + -client.jar;
}
-final String checkedClientJarFile = project.getBuild().getDirectory()
+ / + DEFAULT_JAR_NAME + -client.jar;
-
assertEquals( Invalid value for ejb-jar creation, ejbJarCreated,
FileUtils.fileExists( checkedJarFile ) );
assertEquals( Invalid value for ejb-jar client creation,
ejbClientJarCreated,
FileUtils.fileExists( checkedClientJarFile ) );
svn commit: r747974 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugin/ejb/EjbMojo.java test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Author: dennisl
Date: Thu Feb 26 00:13:18 2009
New Revision: 747974
URL: http://svn.apache.org/viewvc?rev=747974view=rev
Log:
[MEJB-13] Add support for configuring exclusion filter for main ejb jar
Submitted by: Fredrik Vraalsen
Reviewed by: Dennis Lundberg
o The patch was old and couldn't be applied to trunk, so I made the changes
manually
o Add a test case
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=747974r1=747973r2=747974view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Thu Feb 26 00:13:18 2009
@@ -45,16 +45,18 @@
public class EjbMojo
extends AbstractMojo
{
+private static final String EJB_JAR_XML = META-INF/ejb-jar.xml;
+
// TODO: will null work instead?
private static final String[] DEFAULT_INCLUDES = new String[]{**/**};
-private static final String[] DEFAULT_EXCLUDES =
+private static final String[] DEFAULT_EXCLUDES = new String[]{EJB_JAR_XML,
**/package.html};
+
+private static final String[] DEFAULT_CLIENT_EXCLUDES =
new String[]{**/*Bean.class, **/*CMP.class, **/*Session.class,
**/package.html};
private static final String[] EMPTY_STRING_ARRAY = new String[0];
-private static final String EJB_JAR_XML = META-INF/ejb-jar.xml;
-
/**
* The directory for the generated EJB.
*
@@ -128,6 +130,20 @@
private List clientIncludes;
/**
+ * The files and directories to exclude from the main EJB jar. Usage:
+ *
+ * pre
+ * lt;excludesgt;
+ * lt;excludegt;**#47;*Ejb.classlt;#47;excludegt;
+ * lt;excludegt;**#47;*Bean.classlt;#47;excludegt;
+ * lt;#47;excludesgt;
+ * /pre
+ * br/Default exclusions: META-INF#47;ejb-jar.xml, **#47;package.html
+ * @parameter
+ */
+private List excludes;
+
+/**
* The Maven project.
*
* @parameter expression=${project}
@@ -220,8 +236,13 @@
try
{
-archiver.getArchiver().addDirectory( new File( outputDirectory ),
DEFAULT_INCLUDES,
- new String[]{EJB_JAR_XML,
**/package.html} );
+String[] mainJarExcludes = DEFAULT_EXCLUDES;
+
+if ( excludes != null !excludes.isEmpty() ) {
+mainJarExcludes = (String[]) excludes.toArray(
EMPTY_STRING_ARRAY );
+}
+
+archiver.getArchiver().addDirectory( new File( outputDirectory ),
DEFAULT_INCLUDES, mainJarExcludes );
if ( deploymentDescriptor.exists() )
{
@@ -268,7 +289,7 @@
getLog().info( Building EJB client + clientJarName + -client
);
-String[] excludes = DEFAULT_EXCLUDES;
+String[] excludes = DEFAULT_CLIENT_EXCLUDES;
String[] includes = DEFAULT_INCLUDES;
if ( clientIncludes != null !clientIncludes.isEmpty() )
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java?rev=747974r1=747973r2=747974view=diff
==
---
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
Thu Feb 26 00:13:18 2009
@@ -239,7 +239,7 @@
inclusions.add( **/*Include.class );
final MavenProjectResourcesStub project = createTestProject(
client-includes );
-final EjbMojo mojo = lookupMojoWithSettings( project, inclusions, new
LinkedList() );
+final EjbMojo mojo = lookupMojoWithSettings( project, inclusions, new
LinkedList(), null );
// put this on the target output dir
project.addFile( META-INF/ejb-jar.xml,
MavenProjectResourcesStub.OUTPUT_FILE );
@@ -277,7 +277,7 @@
exclusions.add( **/*Exclude.class );
final MavenProjectResourcesStub project = createTestProject(
client-excludes );
-final EjbMojo mojo = lookupMojoWithSettings( project, new
LinkedList(), exclusions );
+final EjbMojo mojo = lookupMojoWithSettings( project, new
LinkedList(), exclusions, null );
// put this on the target output dir
project.addFile(
svn commit: r747991 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Author: sisbell
Date: Thu Feb 26 02:47:45 2009
New Revision: 747991
URL: http://svn.apache.org/viewvc?rev=747991view=rev
Log:
[MNG-4050] - Disabled empty URL check. Failure here is correct behavior, breaks
backward compatibility.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747991r1=747990r2=747991view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Thu Feb 26 02:47:45 2009
@@ -307,7 +307,10 @@
{
String id = repo.getId();
String url = repo.getUrl();
-
+/*
+MNG-4050: Temporarily disabled this check since it is breaking the
bootstrap unit tests on commons-parent pom
+ */
+/*
if ( id == null || id.trim().length() 1 )
{
throw new InvalidRepositoryException( Repository ID must not
be empty (URL is: + url + )., url );
@@ -317,7 +320,7 @@
{
throw new InvalidRepositoryException( Repository URL must not
be empty (ID is: + id + )., id );
}
-
+*/
ArtifactRepositoryPolicy snapshots =
buildArtifactRepositoryPolicy( repo.getSnapshots() );
ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy(
repo.getReleases() );
svn commit: r747993 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/ maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/ ma
Author: sisbell
Date: Thu Feb 26 03:14:14 2009
New Revision: 747993
URL: http://svn.apache.org/viewvc?rev=747993view=rev
Log:
Replaced old profile code with new.
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/empty-distMng-repo-url/
maven/components/trunk/maven-project/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/OperatingSystemMatcher.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/PropertyMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=747993r1=747992r2=747993view=diff
==
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
Thu Feb 26 03:14:14 2009
@@ -227,6 +227,7 @@
ModelContainerAction action = pluginContainer.containerAction(
managementContainer );
+//Join Execution Containers
if ( action.equals( ModelContainerAction.JOIN ) ||
action.equals( ModelContainerAction.DELETE ) )
{
ModelDataSource pluginDatasource = new
DefaultModelDataSource( pluginContainer.getProperties(),
PomTransformer.MODEL_CONTAINER_FACTORIES );
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/OperatingSystemMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/OperatingSystemMatcher.java?rev=747993r1=747992r2=747993view=diff
==
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/OperatingSystemMatcher.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/OperatingSystemMatcher.java
Thu Feb 26 03:14:14 2009
@@ -45,7 +45,16 @@
|| (key.equals(${os.family})
property.getUri().equals(ProjectUri.Profiles.Profile.Activation.Os.family))
|| (key.equals(${os.name})
property.getUri().equals(ProjectUri.Profiles.Profile.Activation.Os.name)) )
{
- return
interpolatorProperty.getValue().equals(property.getResolvedValue());
+
+if(property.getResolvedValue().startsWith(!))
+{
+return
!interpolatorProperty.getValue().equals(property.getResolvedValue());
+}
+else
+{
+return
interpolatorProperty.getValue().equals(property.getResolvedValue());
+}
+
}
}
return true;
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/PropertyMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/PropertyMatcher.java?rev=747993r1=747992r2=747993view=diff
==
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/PropertyMatcher.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/PropertyMatcher.java
Thu Feb 26 03:14:14 2009
@@ -25,10 +25,16 @@
}
}
-if(name == null || value == null) {
+if(name == null )
+{
return false;
}
+if(value == null)
+{
+return !name.startsWith(!);
+}
+
for(InterpolatorProperty ip : properties) {
if(ip.getKey().equals(${ + name + })) {
return ip.getValue().equals(value);
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL:
svn commit: r747997 - in /maven/core-integration-testing/trunk/core-it-suite/src/test/resources: MNG-4053/ mng-4053/
Author: brett Date: Thu Feb 26 03:57:30 2009 New Revision: 747997 URL: http://svn.apache.org/viewvc?rev=747997view=rev Log: fix casing Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4053/ (props changed) - copied from r747996, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/ Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/MNG-4053/ Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4053/ -- svn:mergeinfo =
svn commit: r747998 - /maven/components/trunk/pom.xml
Author: jvanzyl Date: Thu Feb 26 03:58:35 2009 New Revision: 747998 URL: http://svn.apache.org/viewvc?rev=747998view=rev Log: o add the maven-repository module Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=747998r1=747997r2=747998view=diff == --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Thu Feb 26 03:58:35 2009 @@ -244,6 +244,7 @@ modulemaven-embedder/module modulemaven-toolchain/module modulemaven-compat/module +modulemaven-repository/module /modules !--start-- dependencies
svn commit: r748017 - in /maven/components/trunk: ./ maven-core/src/main/java/org/apache/maven/plugin/ maven-project/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/main/java/
Author: ogusakov
Date: Thu Feb 26 05:04:07 2009
New Revision: 748017
URL: http://svn.apache.org/viewvc?rev=748017view=rev
Log:
got rid of project in the API layer
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/trunk/maven-repository/pom.xml
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
maven/components/trunk/pom.xml
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=748017r1=748016r2=748017view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Thu Feb 26 05:04:07 2009
@@ -79,6 +79,7 @@
import org.apache.maven.realm.RealmManagementException;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.VersionNotFoundException;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelMarshaller;
import org.apache.maven.shared.model.ModelProperty;
@@ -399,10 +400,11 @@
coreArtifactFilterManager.getCoreArtifactFilter(),
project );
}
-catch ( InvalidDependencyVersionException e )
+catch ( VersionNotFoundException e )
{
+InvalidDependencyVersionException ee = new
InvalidDependencyVersionException( e.getProjectId(), e.getDependency(),
e.getPomFile(), e.getCauseException() );
throw new InvalidPluginException( Plugin ' + plugin + ' is
invalid:
- + e.getMessage(), e );
+ + e.getMessage(), ee );
}
ResolutionGroup resolutionGroup;
@@ -1497,7 +1499,16 @@
if ( project.getDependencyArtifacts() == null )
{
// NOTE: Don't worry about covering this case with the
error-reporter bindings...it's already handled by the project error reporter.
-project.setDependencyArtifacts( repositorySystem.createArtifacts(
project.getDependencies(), null, null, project ) );
+try
+{
+project.setDependencyArtifacts(
repositorySystem.createArtifacts( project.getDependencies(), null, null,
project ) );
+}
+catch ( VersionNotFoundException e )
+{
+InvalidDependencyVersionException ee = new
InvalidDependencyVersionException( e.getProjectId(), e.getDependency(),
e.getPomFile(), e.getCauseException() );
+
+throw ee;
+}
}
ArtifactFilter filter = new ScopeArtifactFilter( scope );
Modified: maven/components/trunk/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=748017r1=748016r2=748017view=diff
==
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Thu Feb 26 05:04:07 2009
@@ -68,6 +68,10 @@
groupIdorg.apache.maven/groupId
artifactIdmaven-project-builder/artifactId
/dependency
+ dependency
+groupIdorg.apache.maven/groupId
+artifactIdmaven-repository/artifactId
+ /dependency
dependency
groupIdcommons-jxpath/groupId
svn commit: r748039 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: ogusakov Date: Thu Feb 26 06:43:01 2009 New Revision: 748039 URL: http://svn.apache.org/viewvc?rev=748039view=rev Log: organize imports Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=748039r1=748038r2=748039view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Thu Feb 26 06:43:01 2009 @@ -67,9 +67,8 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.project.artifact.ActiveProjectArtifact; import org.apache.maven.project.artifact.InvalidDependencyVersionException; -import org.apache.maven.project.artifact.MavenMetadataSource; -import org.apache.maven.repository.MavenRepositoryWrapper; import org.apache.maven.repository.MavenRepositorySystem; +import org.apache.maven.repository.MavenRepositoryWrapper; import org.apache.maven.repository.VersionNotFoundException; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom;
