svn commit: r614155 - in /maven/sandbox/trunk/doxia/doxia-module-xwiki/src: main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java test/java/org/apache/maven/doxia/module/xwiki/XWikiPa
Author: vmassol
Date: Tue Jan 22 01:16:23 2008
New Revision: 614155
URL: http://svn.apache.org/viewvc?rev=614155view=rev
Log:
DOXIA-200: Add a Parser for XWiki
* Added unit tests for parsing sections
Removed:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/resources/section.xwiki
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java?rev=614155r1=614154r2=614155view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
Tue Jan 22 01:16:23 2008
@@ -23,6 +23,7 @@
/**
* @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
+ * @todo XWiki supports 6 levels of titles.
* @version $Id: SectionBlock.java 568157 2007-08-21 15:06:04Z ltheussl $
*/
public class SectionBlock
@@ -36,6 +37,16 @@
{
this.title = title;
this.level = level;
+}
+
+public String getTitle()
+{
+return this.title;
+}
+
+public int getLevel()
+{
+return this.level;
}
public void traverse( Sink sink )
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java?rev=614155r1=614154r2=614155view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
Tue Jan 22 01:16:23 2008
@@ -23,6 +23,7 @@
import org.apache.maven.doxia.module.xwiki.blocks.FigureBlock;
import org.apache.maven.doxia.module.xwiki.blocks.ParagraphBlock;
import org.apache.maven.doxia.module.xwiki.blocks.TextBlock;
+import org.apache.maven.doxia.module.xwiki.blocks.SectionBlock;
import java.io.StringReader;
import java.util.List;
@@ -68,5 +69,32 @@
assertNull( figureBlock.getCaption() );
TextBlock textBlock2 = (TextBlock) paraBlock.getBlocks().get( 2 );
assertEquals( paragraph., textBlock2.getText() );
+}
+
+public void testSections() throws Exception
+{
+String content = 1 Section1\n
++ 1.1 Section2\n
++ 1.1.1 Section3\n
++ 1.1.1.1 Section4\n
++ 1.1.1.1.1 Section5\n
++ 1 TitleWithLeadingSpace\n
++1 TitleWithSpacesBefore;
+List blocks = parser.parse( new StringReader( content ) );
+assertEquals( 7, blocks.size() );
+assertEquals( Section1, ((SectionBlock) blocks.get( 0)).getTitle());
+assertEquals( 1, ((SectionBlock) blocks.get( 0)).getLevel());
+assertEquals( Section2, ((SectionBlock) blocks.get( 1)).getTitle());
+assertEquals( 2, ((SectionBlock) blocks.get( 1)).getLevel());
+assertEquals( Section3, ((SectionBlock) blocks.get( 2)).getTitle());
+assertEquals( 3, ((SectionBlock) blocks.get( 2)).getLevel());
+assertEquals( Section4, ((SectionBlock) blocks.get( 3)).getTitle());
+assertEquals( 4, ((SectionBlock) blocks.get( 3)).getLevel());
+assertEquals( Section5, ((SectionBlock) blocks.get( 4)).getTitle());
+assertEquals( 5, ((SectionBlock) blocks.get( 4)).getLevel());
+assertEquals( TitleWithLeadingSpace, ((SectionBlock) blocks.get(
5)).getTitle());
+assertEquals( 1, ((SectionBlock) blocks.get( 5)).getLevel());
+assertEquals( TitleWithSpacesBefore, ((SectionBlock) blocks.get(
6)).getTitle());
+assertEquals( 1, ((SectionBlock) blocks.get( 6)).getLevel());
}
}
svn commit: r614152 - in /maven/sandbox/trunk/doxia/doxia-module-xwiki/src: main/java/org/apache/maven/doxia/module/xwiki/blocks/ main/java/org/apache/maven/doxia/module/xwiki/parser/ test/java/org/ap
Author: vmassol
Date: Tue Jan 22 01:03:02 2008
New Revision: 614152
URL: http://svn.apache.org/viewvc?rev=614152view=rev
Log:
DOXIA-200: Add a Parser for XWiki
* Added more unit tests and fixed the macro parsing code
* Modified the Macro parsing to generate a FigureBlock when the macro is an
{image} macro.
Removed:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroBlock.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/resources/figure.xwiki
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/MacroBlock.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/parser/MacroParserTest.java
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/MacroBlock.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/MacroBlock.java?rev=614152r1=614151r2=614152view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/MacroBlock.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/MacroBlock.java
Tue Jan 22 01:03:02 2008
@@ -1,7 +1,5 @@
package org.apache.maven.doxia.module.xwiki.blocks;
-import org.apache.maven.doxia.module.confluence.parser.Block;
-import org.apache.maven.doxia.module.confluence.parser.FigureBlock;
import org.apache.maven.doxia.sink.Sink;
import java.util.HashMap;
@@ -25,15 +23,7 @@
public void traverse( Sink sink )
{
-if ( name.equalsIgnoreCase( image ) )
-{
-FigureBlock block = new FigureBlock( (String) parameters.get(
default ), (String) null );
-block.traverse( sink );
-}
-else
-{
-// TODO
-}
+// TODO
}
public String getName()
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java?rev=614152r1=614151r2=614152view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
Tue Jan 22 01:03:02 2008
@@ -25,7 +25,7 @@
import org.apache.maven.doxia.util.ByLineSource;
/**
- * This parser is left for performance reasons since it's very often that an
image macro is found on a line by itself.
+ * This parser is required to handle image macro not inside a paragraph (i.e.
found on a line by itself).
* However note that macros (and thus this image macro) are also parsed by
* [EMAIL PROTECTED] org.apache.maven.doxia.module.xwiki.parser.MacroParser}
when they're inside a paragraph.
*/
@@ -46,20 +46,6 @@
{
macroParser.setCompatibilityMode( isInCompatibilityMode() );
MacroParser.MacroParserResult result = macroParser.parse( line, 1 );
-
-String caption = (String) result.block.getParameters().get( alt );
-String location = (String) result.block.getParameters().get( default
);
-
-if ( location == null )
-{
-location = (String) result.block.getParameters().get( file );
-}
-
-if ( caption == null )
-{
-return new FigureBlock( location );
-}
-
-return new FigureBlock( location, caption );
+return result.block;
}
}
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java?rev=614152r1=614151r2=614152view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
(original)
+++
svn commit: r614157 - in /maven/sandbox/trunk/doxia/doxia-module-xwiki/src: main/java/org/apache/maven/doxia/module/xwiki/blocks/LinkBlock.java test/java/org/apache/maven/doxia/module/xwiki/XWikiParse
Author: vmassol
Date: Tue Jan 22 01:31:45 2008
New Revision: 614157
URL: http://svn.apache.org/viewvc?rev=614157view=rev
Log:
DOXIA-200: Add a Parser for XWiki
* Added more unit tests for the parser (for italic, bold and links)
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/LinkBlock.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/LinkBlock.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/LinkBlock.java?rev=614157r1=614156r2=614157view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/LinkBlock.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/LinkBlock.java
Tue Jan 22 01:31:45 2008
@@ -39,6 +39,16 @@
this.text = text;
}
+public String getReference()
+{
+return this.reference;
+}
+
+public String getText()
+{
+return this.text;
+}
+
public void traverse( Sink sink )
{
sink.link( reference );
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java?rev=614157r1=614156r2=614157view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
Tue Jan 22 01:31:45 2008
@@ -24,6 +24,9 @@
import org.apache.maven.doxia.module.xwiki.blocks.ParagraphBlock;
import org.apache.maven.doxia.module.xwiki.blocks.TextBlock;
import org.apache.maven.doxia.module.xwiki.blocks.SectionBlock;
+import org.apache.maven.doxia.module.xwiki.blocks.BoldBlock;
+import org.apache.maven.doxia.module.xwiki.blocks.ItalicBlock;
+import org.apache.maven.doxia.module.xwiki.blocks.LinkBlock;
import java.io.StringReader;
import java.util.List;
@@ -97,4 +100,35 @@
assertEquals( TitleWithSpacesBefore, ((SectionBlock) blocks.get(
6)).getTitle());
assertEquals( 1, ((SectionBlock) blocks.get( 6)).getLevel());
}
-}
\ No newline at end of file
+
+public void testParagraphWithBoldAndItalic() throws Exception
+{
+List blocks = parser.parse( new StringReader( Simple paragraph with
*bold* and ~~italic~~ text. ) );
+assertEquals( 1, blocks.size() );
+ParagraphBlock paraBlock = (ParagraphBlock) blocks.get( 0 );
+assertEquals( 5, paraBlock.getBlocks().size() );
+assertEquals(Simple paragraph with , ((TextBlock)
paraBlock.getBlocks().get(0)).getText());
+BoldBlock boldBlock = (BoldBlock) paraBlock.getBlocks().get(1);
+assertEquals(1, boldBlock.getBlocks().size());
+assertEquals(bold, ((TextBlock)
boldBlock.getBlocks().get(0)).getText());
+assertEquals( and , ((TextBlock)
paraBlock.getBlocks().get(2)).getText());
+ItalicBlock italicBlock = (ItalicBlock) paraBlock.getBlocks().get(3);
+assertEquals(1, italicBlock.getBlocks().size());
+assertEquals(italic, ((TextBlock)
italicBlock.getBlocks().get(0)).getText());
+assertEquals( text., ((TextBlock)
paraBlock.getBlocks().get(4)).getText());
+}
+
+/**
+ * Note: The Link parser is tested in the link parser test class. Here
we're just testing that the XWiki parser
+ * understands a link inside a paragraph.
+ */
+public void testParagraphWithLink() throws Exception
+{
+List blocks = parser.parse( new StringReader(
[JIRA|http://jira.codehaus.org]; ) );
+assertEquals( 1, blocks.size() );
+ParagraphBlock paraBlock = (ParagraphBlock) blocks.get( 0 );
+assertEquals( 1, paraBlock.getBlocks().size() );
+assertEquals(JIRA, ((LinkBlock)
paraBlock.getBlocks().get(0)).getText());
+assertEquals(http://jira.codehaus.org;, ((LinkBlock)
paraBlock.getBlocks().get(0)).getReference());
+}
+}
svn commit: r614159 - in /maven/sandbox/trunk/doxia/doxia-module-xwiki/src: main/java/org/apache/maven/doxia/module/xwiki/blocks/ main/java/org/apache/maven/doxia/module/xwiki/parser/ test/java/org/ap
Author: vmassol
Date: Tue Jan 22 01:56:46 2008
New Revision: 614159
URL: http://svn.apache.org/viewvc?rev=614159view=rev
Log:
DOXIA-200: Add a Parser for XWiki
* Reformat code
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/XWikiParserTest.java
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/test/java/org/apache/maven/doxia/module/xwiki/parser/MacroParserTest.java
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java?rev=614159r1=614158r2=614159view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/blocks/SectionBlock.java
Tue Jan 22 01:56:46 2008
@@ -23,8 +23,8 @@
/**
* @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
- * @todo XWiki supports 6 levels of titles.
* @version $Id: SectionBlock.java 568157 2007-08-21 15:06:04Z ltheussl $
+ * @todo XWiki supports 6 levels of titles.
*/
public class SectionBlock
implements Block
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java?rev=614159r1=614158r2=614159view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/FigureBlockParser.java
Tue Jan 22 01:56:46 2008
@@ -20,7 +20,6 @@
*/
import org.apache.maven.doxia.module.xwiki.blocks.Block;
-import org.apache.maven.doxia.module.xwiki.blocks.FigureBlock;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.util.ByLineSource;
Modified:
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java?rev=614159r1=614158r2=614159view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-xwiki/src/main/java/org/apache/maven/doxia/module/xwiki/parser/MacroParser.java
Tue Jan 22 01:56:46 2008
@@ -319,13 +319,14 @@
{
text.append( c );
}
-else if (isInCompatibilityMode state ==
STATE_PARAM_NAME)
+else if ( isInCompatibilityMode state ==
STATE_PARAM_NAME )
{
-parameters.put(default, text.toString());
+parameters.put( default, text.toString() );
text = new StringBuffer();
state = STATE_PARAM_NAME;
-
-} else
+
+}
+else
{
throw new ParseException( Invalid position for
character '|' in Macro );
}
@@ -363,13 +364,15 @@
i++;
}
-if (state != STATE_END || macroName == null) {
+if ( state != STATE_END || macroName == null )
+{
// This is not a valid macro. We have two choices here:
// 1) decide that the code is not a macro and reset the cursor
position at the beginning
// 2) throw a parsing exception
// For the moment we consider that the code is not a macro (option
1)).
-result.position = position;
-} else
+result.position = position;
+}
+else
{
result.block = createAppropriateBlock( macroName, parameters,
content );
result.position = i;
svn commit: r614281 - /maven/artifact/trunk/pom.xml
Author: jdcasey Date: Tue Jan 22 10:22:59 2008 New Revision: 614281 URL: http://svn.apache.org/viewvc?rev=614281view=rev Log: Shading retrotranslator to remove the need to handle it as a dependency when using maven-artifact that has been retrotranslated. Modified: maven/artifact/trunk/pom.xml Modified: maven/artifact/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/artifact/trunk/pom.xml?rev=614281r1=614280r2=614281view=diff == --- maven/artifact/trunk/pom.xml (original) +++ maven/artifact/trunk/pom.xml Tue Jan 22 10:22:59 2008 @@ -144,6 +144,40 @@ /execution /executions /plugin + plugin +artifactIdshade-maven-plugin/artifactId +groupIdorg.codehaus.mojo/groupId +version1.0-alpha-12/version +executions + execution +phasepackage/phase +goals + goalshade/goal +/goals +configuration + createDependencyReducedPomfalse/createDependencyReducedPom + keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope + transformers +transformer implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer/ + /transformers + artifactSet +includes + includenet.sf.retrotranslator:retrotranslator-runtime/include + includebackport-util-concurrent:backport-util-concurrent/include +/includes + /artifactSet + relocations +relocation + patternnet.sf.retrotranslator.runtime/pattern +/relocation +relocation + patternedu.emory.mathcs/pattern +/relocation + /relocations +/configuration + /execution +/executions + /plugin /plugins /build /project
svn commit: r614286 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134: ./ pom.xml
Author: brianf Date: Tue Jan 22 11:11:35 2008 New Revision: 614286 URL: http://svn.apache.org/viewvc?rev=614286view=rev Log: MDEP-134 added pom that breaks dependency tree Added: maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/ maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/pom.xml Added: maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/pom.xml?rev=614286view=auto == --- maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/pom.xml (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/pom.xml Tue Jan 22 11:11:35 2008 @@ -0,0 +1,1025 @@ +?xml version=1.0? + +project + modelVersion4.0.0/modelVersion + groupIdfoo.example/groupId + artifactIdexample/artifactId + version1.0-SNAPSHOT/version + urlhttp://foo.example/url + + dependencies + dependency + groupIdcommons-beanutils/groupId + artifactIdcommons-beanutils/artifactId + version1.7.1-dev/version + scopecompile/scope + /dependency + dependency + groupIdcommons-dbcp/groupId + artifactIdcommons-dbcp/artifactId + version1.2.2/version + scopecompile/scope + exclusions + exclusion + groupIdjunit/groupId + artifactIdjunit/artifactId + /exclusion + exclusion + groupIdtomcat/groupId + artifactIdnaming-common/artifactId + /exclusion + exclusion + groupIdtomcat/groupId + artifactIdnaming-java/artifactId + /exclusion + /exclusions + /dependency + dependency + groupIdcommons-chain/groupId + artifactIdcommons-chain/artifactId + version1.0/version + scopecompile/scope + exclusions + exclusion + groupIdjunit/groupId + artifactIdjunit/artifactId + /exclusion + exclusion + groupIdcommons-logging/groupId + artifactIdcommons-logging/artifactId + /exclusion + + /exclusions + /dependency + dependency + groupIdcommons-codec/groupId + artifactIdcommons-codec/artifactId + version1.3/version + scopecompile/scope + exclusions + exclusion + groupIdjunit/groupId + artifactIdjunit/artifactId + /exclusion + /exclusions + /dependency + dependency + groupIdcommons-digester/groupId + artifactIdcommons-digester/artifactId + version1.8/version + scopecompile/scope + exclusions + exclusion + groupIdcommons-logging/groupId + artifactIdcommons-logging/artifactId + /exclusion + exclusion + groupIdxml-apis/groupId + artifactIdxml-apis/artifactId + /exclusion + exclusion + groupIdjunit/groupId + artifactIdjunit/artifactId + /exclusion + /exclusions + /dependency + dependency + groupIdcommons-discovery/groupId + artifactIdcommons-discovery/artifactId + version0.4/version + scopecompile/scope + exclusions + exclusion + groupIdcommons-logging/groupId +
svn commit: r614295 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/it/mdep-134/ src/site/apt/usage.apt
Author: brianf
Date: Tue Jan 22 11:35:44 2008
New Revision: 614295
URL: http://svn.apache.org/viewvc?rev=614295view=rev
Log: (empty)
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-134/
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614295r1=614294r2=614295view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 11:35:44 2008
@@ -74,6 +74,9 @@
distributionrepo/distribution
/license
/licenses
+ properties
+maven.version2.0.8/maven.version
+ /properties
build
plugins
plugin
@@ -134,22 +137,22 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.7/version
+ version${maven.version}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.7/version
+ version${maven.version}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.7/version
+ version${maven.version}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.7/version
+ version${maven.version}/version
/dependency
dependency
groupIdorg.apache.maven.shared/groupId
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt?rev=614295r1=614294r2=614295view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Tue Jan
22 11:35:44 2008
@@ -21,7 +21,7 @@
Allan Ramirez
Brian Fox
--
- Mar 2007
+ Jan 2008
--
Usage
@@ -497,7 +497,7 @@
Since: 2.0-alpha-2
- This goal will output a classpath string of dependencies from the local
repository to a file or log. For instance, the file would contain a classpath
string like this:
+ This goal will output a classpath string of dependencies from the local
repository to a file or log and optionally attach and deploy the file. For
instance, the file would contain a classpath string like this:
+---+
/home/foo/.m2/repository/org/java/utils/util/util-1.0.jar:/home/foo/.m2/
svn commit: r614310 - in /maven/plugins/trunk/maven-changes-plugin/src/main/resources: changes-report_de.properties jira-report_de.properties
Author: dennisl Date: Tue Jan 22 12:29:25 2008 New Revision: 614310 URL: http://svn.apache.org/viewvc?rev=614310view=rev Log: [MCHANGES-95] Add german translation Submitted by: Benjamin Bentmann Reviewed by: Dennis Lundberg Added: maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties (with props) maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties (with props) Added: maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties?rev=614310view=auto == --- maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties (added) +++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties Tue Jan 22 12:29:25 2008 @@ -0,0 +1,31 @@ +# 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. + +report.changes.name=Änderungsbericht +report.changes.description=Bericht über die Änderungen zwischen den Projekt-Releases. +report.changes.header=Änderungsbericht +report.changes.label.releasehistory=Release-Geschichte +report.changes.label.release=Release +report.changes.label.version=Version +report.changes.label.date=Datum +report.changes.label.type=Typ +report.changes.label.changes=Änderungen +report.changes.label.description=Beschreibung +report.changes.label.by=Durch +report.changes.text.rssfeed=RSS-Feed der letzten Änderungen +report.changes.text.thanx=Dank gilt +report.changes.text.fixes=Schließt Propchange: maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties -- svn:eol-style = native Added: maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties?rev=614310view=auto == --- maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties (added) +++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties Tue Jan 22 12:29:25 2008 @@ -0,0 +1,33 @@ +# 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. + +report.jira.name=JIRA-Bericht +report.jira.description=Bericht über die Probleme aus dem Problemverwaltungssystem JIRA. +report.jira.error=Es ist ein Fehler aufgetreten, der die Erstellung dieses Berichts unmöglich macht. \ + Bitte werten Sie die Konsolenausgabe zur Feststellung der Ursache aus. +report.jira.header=JIRA-Bericht +report.jira.label.key=Schlüssel +report.jira.label.summary=Zusammenfassung +report.jira.label.status=Status +report.jira.label.resolution=Lösung +report.jira.label.by=Durch +report.jira.label.reporter=Reporter +report.jira.label.type=Typ +report.jira.label.priority=Priorität +report.jira.label.version=Version +report.jira.label.fixVersion=Korrigierte Version +report.jira.label.component=Komponente Propchange: maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties -- svn:eol-style = native
svn commit: r614317 - /maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Author: jdcasey
Date: Tue Jan 22 12:50:16 2008
New Revision: 614317
URL: http://svn.apache.org/viewvc?rev=614317view=rev
Log:
Improve error reporting bindings for two exception cases, to get away from
handler(..) pointcuts which are less versatile for later debugging aspects to
manipulate.
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj?rev=614317r1=614316r2=614317view=diff
==
---
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
(original)
+++
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Tue Jan 22 12:50:16 2008
@@ -2,6 +2,7 @@
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -29,6 +30,7 @@
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
import java.util.List;
@@ -60,11 +62,10 @@
getReporter().reportErrorLoadingPlugin( binding, project, cause );
}
-before( MojoBinding binding, MavenProject project, MojoExecutionException
cause ):
+after( MojoBinding binding, MavenProject project ) throwing (
MojoExecutionException cause ):
cflow( le_executeGoalAndHandleFailures( binding ) )
cflow( pm_executeMojo( project ) )
- handler( MojoExecutionException )
- args( cause )
+ call( void Mojo+.execute() )
{
// this will be covered by the reportErrorLoadingPlugin(..) method.
if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals(
binding.getGoal() ) )
@@ -179,14 +180,13 @@
err );
}
-before( MojoBinding binding, MavenProject project, String expression,
Exception cause ):
+after( MojoBinding binding, MavenProject project, String expression )
throwing ( Exception cause ):
cflow( le_executeGoalAndHandleFailures( binding ) )
cflow( pm_executeMojo( project ) )
cflow( pm_checkRequiredParameters() )
cflow( ppee_evaluate( expression ) )
within( PluginParameterExpressionEvaluator )
- handler( Exception )
- args( cause )
+ call( Object ReflectionValueExtractor.evaluate( String, Object ) )
{
getReporter().reportReflectionErrorWhileEvaluatingMojoParameter(
currentParameter,
binding,
svn commit: r614318 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Author: jdcasey Date: Tue Jan 22 12:51:00 2008 New Revision: 614318 URL: http://svn.apache.org/viewvc?rev=614318view=rev Log: remove a debugging sysout. Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=614318r1=614317r2=614318view=diff == --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Tue Jan 22 12:51:00 2008 @@ -137,8 +137,6 @@ Configuration configuration = buildEmbedderConfiguration( request, commandLine, classWorld ); -System.out.println( Using error reporter: + configuration.getErrorReporter() ); - ConfigurationValidationResult cvr = MavenEmbedder.validateConfiguration( configuration ); if ( cvr.isUserSettingsFilePresent() !cvr.isUserSettingsFileParses() )
svn commit: r614319 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven: DefaultMaven.java lifecycle/DefaultLifecycleExecutor.java
Author: jdcasey
Date: Tue Jan 22 12:52:11 2008
New Revision: 614319
URL: http://svn.apache.org/viewvc?rev=614319view=rev
Log:
Improve diagnosis when no goals are passed in via the request (the goals List
is null, not just empty). This can happen when used via the embedder in a
non-cli scenario.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=614319r1=614318r2=614319view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Tue Jan 22 12:52:11 2008
@@ -181,23 +181,26 @@
reactorManager,
dispatcher );
-for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
+if ( request.getGoals() != null )
{
-String goal = (String) i.next();
-
-if ( goal == null )
+for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
{
-i.remove();
-continue;
-}
+String goal = (String) i.next();
-TaskValidationResult tvr = lifecycleExecutor.isTaskValid( goal,
session, reactorManager.getTopLevelProject() );
+if ( goal == null )
+{
+i.remove();
+continue;
+}
-if ( !tvr.isTaskValid() )
-{
-result.addException( tvr.generateInvalidTaskException() );
+TaskValidationResult tvr = lifecycleExecutor.isTaskValid(
goal, session, reactorManager.getTopLevelProject() );
+
+if ( !tvr.isTaskValid() )
+{
+result.addException( tvr.generateInvalidTaskException() );
-return result;
+return result;
+}
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=614319r1=614318r2=614319view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Tue Jan 22 12:52:11 2008
@@ -109,7 +109,7 @@
List goals = session.getGoals();
-if ( goals.isEmpty() ( rootProject != null ) )
+if ( ( ( goals == null ) || goals.isEmpty() ) ( rootProject != null
) )
{
String goal = rootProject.getDefaultGoal();
@@ -119,7 +119,7 @@
}
}
-if ( goals.isEmpty() )
+if ( ( goals == null ) || goals.isEmpty() )
{
throw new NoGoalsSpecifiedException( \n\nYou must specify at
least one goal. Try 'install' to build or mvn -? for other options.\n See
http://maven.apache.org for more information.\n\n );
}
svn commit: r614316 - in /maven/components/trunk: maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java pom.xml
Author: jdcasey
Date: Tue Jan 22 12:49:07 2008
New Revision: 614316
URL: http://svn.apache.org/viewvc?rev=614316view=rev
Log:
Restore JDK 1.4 compat, and add a profile to do a strict build that enforces
the use of JDK 1.4.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java
maven/components/trunk/pom.xml
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java?rev=614316r1=614315r2=614316view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java
Tue Jan 22 12:49:07 2008
@@ -37,16 +37,16 @@
public static String createExtensionRealmId( Artifact extensionArtifact )
{
return /extensions/ + extensionArtifact.getGroupId() + :
- + extensionArtifact.getArtifactId() + : +
extensionArtifact.getVersion() +
- /thread: + Thread.currentThread().getId(); //add thread to
the mix to prevent clashes in paralel execution
+ + extensionArtifact.getArtifactId() + : +
extensionArtifact.getVersion() +
+ /thread: + Thread.currentThread().getName(); //add thread to
the mix to prevent clashes in paralel execution
}
public static String createProjectId( String projectGroupId,
String projectArtifactId,
String projectVersion )
{
-return /projects/ + projectGroupId + : + projectArtifactId + : +
projectVersion +
- /thread: + Thread.currentThread().getId(); //add thread to
the mix to prevent clashes in paralel execution
+return /projects/ + projectGroupId + : + projectArtifactId + : +
projectVersion +
+ /thread: + Thread.currentThread().getName(); //add thread to
the mix to prevent clashes in paralel execution
}
public static String createPluginRealmId( Plugin plugin )
@@ -87,7 +87,7 @@
}
id.append( '@' ).append( depId.toString().hashCode() )
-.append( /thread: ).append( Thread.currentThread().getId()
); //add thread to the mix to prevent clashes in paralel execution
+.append( /thread: ).append( Thread.currentThread().getName()
); //add thread to the mix to prevent clashes in paralel execution
return id.toString();
}
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=614316r1=614315r2=614316view=diff
==
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Jan 22 12:49:07 2008
@@ -304,5 +304,49 @@
modulemaven-core-it-runner/module
/modules
/profile
+profile
+ idstrict/id
+ build
+plugins
+ plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-enforcer-plugin/artifactId
+ version1.0-alpha-3/version
+ executions
+ execution
+ idenforce-jdk-14/id
+ goals
+ goalenforce/goal
+ /goals
+ configuration
+ rules
+ requireJavaVersion
+ version[1.3,1.5.0)/version
+ /requireJavaVersion
+ /rules
+ /configuration
+ /execution
+ /executions
+ /plugin
+ plugin
+ artifactIdmaven-compiler-plugin/artifactId
+ version2.0.2/version
+ configuration
+ source1.4/source
+ target1.4/target
+ /configuration
+ /plugin
+ plugin
+ groupIdorg.codehaus.mojo/groupId
+ artifactIdaspectj-maven-plugin/artifactId
+ version1.0-beta-2/version
+ configuration
+ source1.4/source
+ target1.4/target
+ /configuration
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
svn commit: r614330 - /maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Author: jdcasey
Date: Tue Jan 22 13:33:50 2008
New Revision: 614330
URL: http://svn.apache.org/viewvc?rev=614330view=rev
Log:
Widening the pointcut to catch more potential places where plugin-loading could
be a problem.
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj?rev=614330r1=614329r2=614330view=diff
==
---
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
(original)
+++
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Tue Jan 22 13:33:50 2008
@@ -55,8 +55,7 @@
args( project, .. );
after( MojoBinding binding, MavenProject project ) throwing (
PluginLoaderException cause ):
-cflow( le_executeGoalAndHandleFailures( MojoBinding ) )
- call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )
+call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )
args( binding, project, .. )
{
getReporter().reportErrorLoadingPlugin( binding, project, cause );
svn commit: r614332 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Author: brianf
Date: Tue Jan 22 13:37:06 2008
New Revision: 614332
URL: http://svn.apache.org/viewvc?rev=614332view=rev
Log:
added warning that tree mojo needs =2.0.8
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614332r1=614331r2=614332view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 13:37:06 2008
@@ -28,7 +28,7 @@
artifactIdmaven-dependency-plugin/artifactId
packagingmaven-plugin/packaging
nameMaven Dependency Plugin/name
- version2.0-alpha-5-SNAPSHOT/version
+ version2.0-SNAPSHOT/version
prerequisites
maven2.0.3/maven
/prerequisites
@@ -154,6 +154,11 @@
artifactIdmaven-model/artifactId
version${maven.version}/version
/dependency
+dependency
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-core/artifactId
+ version${maven.version}/version
+ /dependency
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-plugin-testing-tools/artifactId
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=614332r1=614331r2=614332view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Tue Jan 22 13:37:06 2008
@@ -24,6 +24,7 @@
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -32,6 +33,11 @@
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.Restriction;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -192,6 +198,13 @@
private String excludes;
/**
+ * Runtime Information used to check the Maven version
+ * @since 2.0
+ * @component role=org.apache.maven.execution.RuntimeInformation
+ */
+private RuntimeInformation rti;
+
+/**
* The computed dependency tree root node of the Maven project.
*/
private DependencyNode rootNode;
@@ -203,6 +216,24 @@
*/
public void execute() throws MojoExecutionException, MojoFailureException
{
+
+ArtifactVersion detectedMavenVersion = rti.getApplicationVersion();
+VersionRange vr;
+try
+{
+vr = VersionRange.createFromVersionSpec( [2.0.8,) );
+if ( !containsVersion( vr, detectedMavenVersion ) )
+{
+getLog().warn(
+ The tree mojo requires at least Maven 2.0.8 to
function properly. You may get eroneous results on earlier versions );
+}
+}
+catch ( InvalidVersionSpecificationException e )
+{
+throw new MojoExecutionException(e.getLocalizedMessage());
+}
+
+
if (output != null)
{
getLog().warn( The parameter output is deprecated. Use outputFile
instead. );
@@ -397,5 +428,43 @@
return filters.isEmpty() ? null : new AndDependencyNodeFilter( filters
);
}
+//following is required because the version handling in maven code
+//doesn't work properly. I ripped it out of the enforcer rules.
+
+
+
+/**
+ * Copied from Artifact.VersionRange. This is tweaked to handle singular
ranges properly. Currently the default
+ * containsVersion method assumes a singular version means allow
everything. This method assumes that 2.0.4 ==
+ * [2.0.4,)
+ *
+ * @param allowedRange range of allowed versions.
+ * @param theVersion the version to be checked.
+ * @return true if the version is contained by the range.
+ */
+public static
svn commit: r614334 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Tue Jan 22 13:39:02 2008 New Revision: 614334 URL: http://svn.apache.org/viewvc?rev=614334view=rev Log: bumped dependencies Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614334r1=614333r2=614334view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 13:39:02 2008 @@ -210,7 +210,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId - version1.0-alpha-3-SNAPSHOT/version + version1.0/version /dependency dependency groupIdorg.apache.maven.shared/groupId @@ -220,7 +220,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-common-artifact-filters/artifactId - version1.0-alpha-2-SNAPSHOT/version + version1.0/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r614335 - /maven/artifact/trunk/pom.xml
Author: jdcasey Date: Tue Jan 22 13:40:15 2008 New Revision: 614335 URL: http://svn.apache.org/viewvc?rev=614335view=rev Log: Rolling back the shade plugin execution, to avoid quadrupling the resulting artifact's size. Modified: maven/artifact/trunk/pom.xml Modified: maven/artifact/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/artifact/trunk/pom.xml?rev=614335r1=614334r2=614335view=diff == --- maven/artifact/trunk/pom.xml (original) +++ maven/artifact/trunk/pom.xml Tue Jan 22 13:40:15 2008 @@ -144,6 +144,7 @@ /execution /executions /plugin + !-- plugin artifactIdshade-maven-plugin/artifactId groupIdorg.codehaus.mojo/groupId @@ -178,6 +179,7 @@ /execution /executions /plugin +-- /plugins /build /project
svn commit: r614337 - in /maven/components/trunk: README.txt maven-core/src/main/aspect/org/apache/maven/CoreDebuggingAspect.aj
Author: jdcasey
Date: Tue Jan 22 13:52:28 2008
New Revision: 614337
URL: http://svn.apache.org/viewvc?rev=614337view=rev
Log:
adding basic bootstrapping instructions to the README.
Modified:
maven/components/trunk/README.txt
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/CoreDebuggingAspect.aj
Modified: maven/components/trunk/README.txt
URL:
http://svn.apache.org/viewvc/maven/components/trunk/README.txt?rev=614337r1=614336r2=614337view=diff
==
--- maven/components/trunk/README.txt (original)
+++ maven/components/trunk/README.txt Tue Jan 22 13:52:28 2008
@@ -1,3 +1,25 @@
See:
http://maven.apache.org/guides/development/guide-building-m2.html
+
+for complete instructions.
+
+BOOTSTRAPPING BASICS
+---
+
+You'll need:
+
+- Java 1.4
+- Ant 1.6.5 or later
+
+First, give Ant a location into which the completed Maven distro should be
installed:
+
+export M2_HOME=$HOME/apps/maven/apache-maven-2.1-SNAPSHOT
+
+Then, run Ant:
+
+ant
+
+Once the build completes, you should have a new Maven distro ready to roll in
your $M2_HOME directory!
+
+Enjoy.
\ No newline at end of file
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/CoreDebuggingAspect.aj
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/CoreDebuggingAspect.aj?rev=614337r1=614336r2=614337view=diff
==
---
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/CoreDebuggingAspect.aj
(original)
+++
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/CoreDebuggingAspect.aj
Tue Jan 22 13:52:28 2008
@@ -7,12 +7,23 @@
import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.DefaultPluginManager;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.aspectj.lang.JoinPoint;
import java.util.Iterator;
import java.util.List;
public aspect CoreDebuggingAspect
{
+
+after() throwing ( RuntimeException e ):
+//adviceexecution( )
+// args( jp )
+call( * *..*.*(..))
+ !within( CoreDebuggingAspect+ )
+ !handler( * )
+{
+System.out.println( Error: + e.getClass().getName() + \nwas in
join point: + thisJoinPoint.toLongString() + \n(at: +
thisJoinPoint.getSourceLocation() + ) );
+}
//after( MavenExecutionRequest request ) returning( List projects ):
//call( List DefaultMaven.getProjects( MavenExecutionRequest ) )
svn commit: r614338 - in /maven/components/trunk: README.bootstrap.txt README.txt
Author: jdcasey Date: Tue Jan 22 13:53:20 2008 New Revision: 614338 URL: http://svn.apache.org/viewvc?rev=614338view=rev Log: separating READMEs so the bootstrap info doesn't get into the distro. Added: maven/components/trunk/README.bootstrap.txt (with props) Modified: maven/components/trunk/README.txt Added: maven/components/trunk/README.bootstrap.txt URL: http://svn.apache.org/viewvc/maven/components/trunk/README.bootstrap.txt?rev=614338view=auto == --- maven/components/trunk/README.bootstrap.txt (added) +++ maven/components/trunk/README.bootstrap.txt Tue Jan 22 13:53:20 2008 @@ -0,0 +1,19 @@ +BOOTSTRAPPING BASICS +--- + +You'll need: + +- Java 1.4 +- Ant 1.6.5 or later + +First, give Ant a location into which the completed Maven distro should be installed: + +export M2_HOME=$HOME/apps/maven/apache-maven-2.1-SNAPSHOT + +Then, run Ant: + +ant + +Once the build completes, you should have a new Maven distro ready to roll in your $M2_HOME directory! + +Enjoy. \ No newline at end of file Propchange: maven/components/trunk/README.bootstrap.txt -- svn:eol-style = native Propchange: maven/components/trunk/README.bootstrap.txt -- svn:keywords = Author Date Id Revision Modified: maven/components/trunk/README.txt URL: http://svn.apache.org/viewvc/maven/components/trunk/README.txt?rev=614338r1=614337r2=614338view=diff == --- maven/components/trunk/README.txt (original) +++ maven/components/trunk/README.txt Tue Jan 22 13:53:20 2008 @@ -2,24 +2,3 @@ http://maven.apache.org/guides/development/guide-building-m2.html -for complete instructions. - -BOOTSTRAPPING BASICS - -You'll need: - -- Java 1.4 -- Ant 1.6.5 or later - -First, give Ant a location into which the completed Maven distro should be installed: - -export M2_HOME=$HOME/apps/maven/apache-maven-2.1-SNAPSHOT - -Then, run Ant: - -ant - -Once the build completes, you should have a new Maven distro ready to roll in your $M2_HOME directory! - -Enjoy. \ No newline at end of file
svn commit: r614339 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl Date: Tue Jan 22 13:56:32 2008 New Revision: 614339 URL: http://svn.apache.org/viewvc?rev=614339view=rev Log: o Update to latest parent. Add an scm element. o Reorder other elements. Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=614339r1=614338r2=614339view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Jan 22 13:56:32 2008 @@ -21,7 +21,7 @@ parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version8/version +version10/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-changes-plugin/artifactId @@ -88,6 +88,30 @@ /mailingList /mailingLists + developers +developer + idjruiz/id + nameJohnny Ruiz III/name + email[EMAIL PROTECTED]/email +/developer +developer + idaramirez/id + nameAllan Ramirez/name + email[EMAIL PROTECTED]/email +/developer +developer + iddennisl/id + nameDennis Lundberg/name + email[EMAIL PROTECTED]/email +/developer + /developers + + scm + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin//url + /scm + build plugins plugin @@ -116,24 +140,6 @@ /plugins /build - developers -developer - idjruiz/id - nameJohnny Ruiz III/name - email[EMAIL PROTECTED]/email -/developer -developer - idaramirez/id - nameAllan Ramirez/name - email[EMAIL PROTECTED]/email -/developer -developer - iddennisl/id - nameDennis Lundberg/name - email[EMAIL PROTECTED]/email -/developer - /developers - dependencies !-- maven -- dependency @@ -290,6 +296,7 @@ version1.5/version /dependency /dependencies + reporting plugins plugin @@ -316,6 +323,7 @@ /plugin /plugins /reporting + properties doxiaVersion1.0-alpha-9/doxiaVersion doxiaSitetoolsVersion1.0-alpha-9/doxiaSitetoolsVersion
svn commit: r614340 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Tue Jan 22 14:00:26 2008 New Revision: 614340 URL: http://svn.apache.org/viewvc?rev=614340view=rev Log: locking down plugins Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614340r1=614339r2=614340view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 14:00:26 2008 @@ -81,7 +81,6 @@ plugins plugin artifactIdmaven-enforcer-plugin/artifactId -version1.0-alpha-3/version executions execution goals @@ -96,6 +95,7 @@ /excludes messageThe new containers are not supported. You probably added a dependency that is missing the exclusions./message /bannedDependencies + !-- requirePluginVersionsbanSnapshotsfalse/banSnapshots/requirePluginVersions-- /rules failtrue/fail /configuration @@ -105,7 +105,6 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdcobertura-maven-plugin/artifactId -version2.0/version executions execution phaseclean/phase @@ -119,7 +118,6 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId -version2.3/version configuration !-- Need of more head space in order to run the unit tests !-- argLine-Xmx256m/argLine @@ -132,6 +130,65 @@ /configuration /plugin /plugins +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-resources-plugin/artifactId + version2.2/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-clean-plugin/artifactId + version2.2/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-compiler-plugin/artifactId + version2.0.2/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-deploy-plugin/artifactId + version2.3/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-install-plugin/artifactId + version2.2/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-plugin-plugin/artifactId + version2.3/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-enforcer-plugin/artifactId + version1.0-alpha-3/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-surefire-plugin/artifactId + version2.4/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-release-plugin/artifactId + version2.0-beta-7/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-site-plugin/artifactId + version2.0-beta-6/version +/plugin +plugin + groupIdorg.codehaus.mojo/groupId + artifactIdcobertura-maven-plugin/artifactId + version2.0/version +/plugin + /plugins +/pluginManagement /build dependencies dependency
svn commit: r614341 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Tue Jan 22 14:01:38 2008 New Revision: 614341 URL: http://svn.apache.org/viewvc?rev=614341view=rev Log: [maven-release-plugin] prepare release maven-dependency-plugin-2.0 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614341r1=614340r2=614341view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 14:01:38 2008 @@ -28,7 +28,7 @@ artifactIdmaven-dependency-plugin/artifactId packagingmaven-plugin/packaging nameMaven Dependency Plugin/name - version2.0-SNAPSHOT/version + version2.0/version prerequisites maven2.0.3/maven /prerequisites @@ -330,4 +330,10 @@ /dependencies + + scm + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/plugins/tags/maven-dependency-plugin-2.0/url + /scm /project
svn commit: r614342 - in /maven/components/trunk: maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPo
Author: jdcasey
Date: Tue Jan 22 14:01:57 2008
New Revision: 614342
URL: http://svn.apache.org/viewvc?rev=614342view=rev
Log:
Fixing error-reporting pointcut that I broke.
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj?rev=614342r1=614341r2=614342view=diff
==
---
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
(original)
+++
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
Tue Jan 22 14:01:57 2008
@@ -18,6 +18,7 @@
import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.lifecycle.statemgmt.StateManagementUtils;
import org.apache.maven.lifecycle.DefaultLifecycleExecutor;
+import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.LifecycleException;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.project.MavenProject;
@@ -55,7 +56,9 @@
args( project, .. );
after( MojoBinding binding, MavenProject project ) throwing (
PluginLoaderException cause ):
-call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )
+( cflow( le_executeGoalAndHandleFailures( MojoBinding ) )
+ || cflow( execution( * LifecycleExecutor+.isTaskValid( .. ) ) ) )
+ call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )
args( binding, project, .. )
{
getReporter().reportErrorLoadingPlugin( binding, project, cause );
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java?rev=614342r1=614341r2=614342view=diff
==
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Tue Jan 22 14:01:57 2008
@@ -461,7 +461,7 @@
reporter.reportErrorLoadingPlugin( null, null, null );
reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
-reporterCtl.setVoidCallable();
+reporterCtl.setVoidCallable( MockControl.ONE_OR_MORE );
reporterCtl.replay();
svn commit: r614343 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Tue Jan 22 14:03:19 2008 New Revision: 614343 URL: http://svn.apache.org/viewvc?rev=614343view=rev Log: rollback failed release Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614343r1=614342r2=614343view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 14:03:19 2008 @@ -28,7 +28,7 @@ artifactIdmaven-dependency-plugin/artifactId packagingmaven-plugin/packaging nameMaven Dependency Plugin/name - version2.0/version + version2.0-SNAPSHOT/version prerequisites maven2.0.3/maven /prerequisites @@ -330,10 +330,4 @@ /dependencies - - scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/plugins/tags/maven-dependency-plugin-2.0/url - /scm /project
svn commit: r614344 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Tue Jan 22 14:04:39 2008 New Revision: 614344 URL: http://svn.apache.org/viewvc?rev=614344view=rev Log: [maven-release-plugin] prepare release maven-dependency-plugin-2.0 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614344r1=614343r2=614344view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 14:04:39 2008 @@ -28,7 +28,7 @@ artifactIdmaven-dependency-plugin/artifactId packagingmaven-plugin/packaging nameMaven Dependency Plugin/name - version2.0-SNAPSHOT/version + version2.0/version prerequisites maven2.0.3/maven /prerequisites @@ -330,4 +330,10 @@ /dependencies + + scm + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/plugins/tags/maven-dependency-plugin-2.0/url + /scm /project
svn commit: r614347 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Tue Jan 22 14:05:14 2008 New Revision: 614347 URL: http://svn.apache.org/viewvc?rev=614347view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=614347r1=614346r2=614347view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Jan 22 14:05:14 2008 @@ -28,7 +28,7 @@ artifactIdmaven-dependency-plugin/artifactId packagingmaven-plugin/packaging nameMaven Dependency Plugin/name - version2.0/version + version2.1-SNAPSHOT/version prerequisites maven2.0.3/maven /prerequisites @@ -328,12 +328,4 @@ -- /dependencies - - - - scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.0/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/plugins/tags/maven-dependency-plugin-2.0/url - /scm /project
svn commit: r614369 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
Author: dennisl Date: Tue Jan 22 15:07:46 2008 New Revision: 614369 URL: http://svn.apache.org/viewvc?rev=614369view=rev Log: o Set suitable default values for statusIds and resolutionIds. o Improve documentation. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=614369r1=614368r2=614369view=diff == --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Tue Jan 22 15:07:46 2008 @@ -85,7 +85,7 @@ private Settings settings; /** - * Maximum number of entries to be displayed by the JIRA Report. + * Maximum number of entries to be fetched from JIRA. * * @parameter default-value=100 * @@ -94,7 +94,7 @@ /** * Defines the filter parameters to restrict which issues are retrieved - * from JIRA. The filter parameter must use the same format of url + * from JIRA. The filter parameter uses the same format of url * parameters that is used in a JIRA search. * * @parameter default-value= @@ -113,27 +113,40 @@ private String fixVersionIds; /** - * Sets the status(es) that you want to limit your report to include. - * Valid statuses are: Open, In Progress, Reopened, Resolved and Closed. + * Sets the status(es) that you want to fetch from JIRA. + * Valid statuses are: codeOpen/code, codeIn Progress/code, + * codeReopened/code, codeResolved/code and codeClosed/code. * Multiple values can be separated by commas. + * p + * bNote:/b In versions 2.0-beta-3 and earlier this parameter had no + * default value. + * /p * - * @parameter default-value= + * @parameter default-value=Closed */ private String statusIds; /** - * Sets the resolution(s) that you want to limit your report to include. - * Valid statuses are: Unresolved, Fixed, Won't Fix, Duplicate, Incomplete, - * Cannot Reproduce. Multiple values can be separated by commas. + * Sets the resolution(s) that you want to fetch from JIRA. + * Valid resolutions are: codeUnresolved/code, codeFixed/code, + * codeWon't Fix/code, codeDuplicate/code, codeIncomplete/code + * and codeCannot Reproduce/code. + * Multiple values can be separated by commas. + * p + * bNote:/b In versions 2.0-beta-3 and earlier this parameter had no + * default value. + * /p * - * @parameter default-value= + * @parameter default-value=Fixed */ private String resolutionIds; /** * Sets the priority(s) that you want to limit your report to include. - * Valid statuses are: Blocker, Critical, Major, Minor, Trivial. Multiple - * values can be separated by commas. + * Valid statuses are codeBlocker/code, codeCritical/code, + * codeMajor/code, codeMinor/code and codeTrivial/code. + * Multiple values can be separated by commas. + * If this is set to empty - that means all priorities will be included. * * @parameter default-value= */ @@ -141,8 +154,8 @@ /** * Sets the component(s) that you want to limit your report to include. - * Multiple components can be separated by commas (such as 10011,10012). - * If this is set to empty - that means all components. + * Multiple values can be separated by commas (such as 10011,10012). + * If this is set to empty - that means all components will be included. * * @parameter default-value= */ @@ -152,8 +165,9 @@ * Sets the types(s) that you want to limit your report to include. * Valid types are: codeBug/code, codeNew Feature/code, * codeTask/code, codeImprovement/code, codeWish/code, - * codeTest/code and codeSub-task/code. Multiple - * values can be separated by commas. + * codeTest/code and codeSub-task/code. + * Multiple values can be separated by commas. + * If this is set to empty - that means all types will be included. * * @parameter default-value= * @since 2.0-beta-4
svn commit: r614371 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Author: dennisl
Date: Tue Jan 22 15:16:28 2008
New Revision: 614371
URL: http://svn.apache.org/viewvc?rev=614371view=rev
Log:
o Rename parameters so that they are in sync with JiraMojo.
o Refactor to avoid code duplication.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=614371r1=614370r2=614371view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Tue Jan 22 15:16:28 2008
@@ -184,7 +184,7 @@
* @required
* @readonly
*/
-private Settings setting;
+private Settings settings;
/**
* Flag to determine if the plugin will generate a JIRA announcement.
@@ -196,17 +196,25 @@
/**
* Only closed issues are needed.
+ * p
+ * bNote:/b In versions 2.0-beta-3 and earlier this parameter was
+ * called statusId.
+ * /p
*
* @parameter default-value=Closed
*/
-private String statusId;
+private String statusIds;
/**
* Only fixed issues are needed.
+ * p
+ * bNote:/b In versions 2.0-beta-3 and earlier this parameter was
+ * called resolutionId.
+ * /p
*
* @parameter default-value=Fixed
*/
-private String resolutionId;
+private String resolutionIds;
/**
* The path of the XML file of JIRA-announcements to be parsed.
@@ -219,11 +227,15 @@
/**
* The maximum number of issues to include.
+ * p
+ * bNote:/b In versions 2.0-beta-3 and earlier this parameter was
+ * called nbEntries.
+ * /p
*
* @parameter default-value=25
* @required
*/
-private int nbEntries;
+private int maxEntries;
//===//
//announcement-generate execution//
@@ -241,7 +253,9 @@
{
setXml( new ChangesXML( getXmlPath(), getLog() ) );
-doGenerate( getXml() );
+getLog().info( Creating announcement file from changes.xml... );
+
+doGenerate( getXml().getReleaseList() );
}
else
{
@@ -252,59 +266,9 @@
/**
* Add the parameters to velocity context
*
- * @param xml parsed changes.xml
+ * @param releases A codeList/code of codeRelease/codes
* @throws MojoExecutionException
*/
-public void doGenerate( ChangesXML xml )
-throws MojoExecutionException
-{
-try
-{
-Context context = new VelocityContext();
-
-List releaseList = xml.getReleaseList();
-
-getLog().info( Creating announcement file from changes.xml... );
-
-if ( getIntroduction() == null || getIntroduction().equals( ) )
-{
-setIntroduction( getUrl() );
-}
-
-context.put( releases, releaseList );
-
-context.put( groupId, getGroupId() );
-
-context.put( artifactId, getArtifactId() );
-
-context.put( version, getVersion() );
-
-context.put( packaging, getPackaging() );
-
-context.put( url, getUrl() );
-
-context.put( release, getLatestRelease( releaseList ) );
-
-context.put( introduction, getIntroduction() );
-
-context.put( developmentTeam, getDevelopmentTeam() );
-
-context.put( finalName, getFinalName() );
-
-context.put( urlDownload, getUrlDownload() );
-
-processTemplate( context, getOutputDirectory(), template );
-}
-catch ( ResourceNotFoundException rnfe )
-{
-throw new MojoExecutionException( resource not found. );
-}
-catch ( VelocityException ve )
-{
-throw new MojoExecutionException( ve.toString() );
-}
-}
-
public void doGenerate( List releases )
throws MojoExecutionException
{
@@ -312,8 +276,6 @@
{
Context context = new VelocityContext();
-getLog().info( Creating announcement file from JIRA releases...
);
-
if ( getIntroduction() == null || getIntroduction().equals( ) )
{
setIntroduction( getUrl() );
@@ -345,11 +307,11 @@
}
catch ( ResourceNotFoundException rnfe )
{
-throw new MojoExecutionException( resource not found. );
+throw new MojoExecutionException( Resource not found., rnfe );
svn commit: r614372 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: jdcasey
Date: Tue Jan 22 15:24:53 2008
New Revision: 614372
URL: http://svn.apache.org/viewvc?rev=614372view=rev
Log:
Add a little more information for unparseable POMs during project
dependency-tree discovery.
Modified:
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/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=614372r1=614371r2=614372view=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
Tue Jan 22 15:24:53 2008
@@ -151,6 +151,10 @@
}
getLogger().debug( \n );
}
+else
+{
+getLogger().debug( , e );
+}
}
project = null;
svn commit: r614395 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Author: vsiveton Date: Tue Jan 22 16:24:42 2008 New Revision: 614395 URL: http://svn.apache.org/viewvc?rev=614395view=rev Log: o typo in the javadoc Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=614395r1=614394r2=614395view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Tue Jan 22 16:24:42 2008 @@ -74,7 +74,7 @@ private String locales; /** - * Internationalization. + * SiteTool. * * @component */
svn commit: r614391 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java src/main/java/org/apache/maven/plugins/site/AbstractSiteRende
Author: vsiveton
Date: Tue Jan 22 16:18:42 2008
New Revision: 614391
URL: http://svn.apache.org/viewvc?rev=614391view=rev
Log:
MSITE-290: Move logic from AbstractSiteMojo and AbstractSiteRenderingMojo for
Doxia related stuff
o used new shared maven-doxia-tools
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=614391r1=614390r2=614391view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Jan 22 16:18:42 2008
@@ -173,6 +173,11 @@
artifactIdmaven-settings/artifactId
version2.0/version
/dependency
+dependency
+ groupIdorg.apache.maven.reporting/groupId
+ artifactIdmaven-reporting-api/artifactId
+ version2.0.4/version
+/dependency
!-- Doxia --
dependency
@@ -219,9 +224,9 @@
/dependency
dependency
- groupIdorg.apache.maven.reporting/groupId
- artifactIdmaven-reporting-api/artifactId
- version2.0.4/version
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-doxia-tools/artifactId
+ version1.0-SNAPSHOT/version
/dependency
!-- Wagon --
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=614391r1=614390r2=614391view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Tue Jan 22 16:18:42 2008
@@ -23,6 +23,7 @@
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.Menu;
import org.apache.maven.doxia.site.decoration.MenuItem;
+import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -77,6 +78,13 @@
*
* @component
*/
+protected SiteTool siteTool;
+
+/**
+ * Internationalization.
+ *
+ * @component
+ */
protected I18N i18n;
/**
@@ -256,7 +264,7 @@
*/
protected File getSiteDescriptorFile( File basedir, Locale locale )
{
-String relativePath = getRelativePath(
siteDirectory.getAbsolutePath(), basedir.getAbsolutePath() );
+String relativePath = siteTool.getRelativePath(
siteDirectory.getAbsolutePath(), basedir.getAbsolutePath() );
File siteDescriptor = new File( relativePath, site_ +
locale.getLanguage() + .xml );
@@ -388,7 +396,7 @@
String baseUrl = project.getUrl();
if ( baseUrl != null )
{
-selectedHref = getRelativePath( selectedHref, baseUrl );
+selectedHref = siteTool.getRelativePath( selectedHref, baseUrl );
}
if ( selectedHref.endsWith( / ) )
@@ -512,204 +520,6 @@
return list == null || list.isEmpty();
}
-protected String getRelativePath( String to, String from )
-{
-URL toUrl = null;
-URL fromUrl = null;
-
-String toPath = to;
-String fromPath = from;
-
-try
-{
-toUrl = new URL( to );
-}
-catch ( MalformedURLException e )
-{
-try
-{
-toUrl = new File( to ).toURL();
-}
-catch ( MalformedURLException e1 )
-{
-getLog().warn( Unable to load a URL for ' + to + ': +
e.getMessage() );
-}
-}
-
-try
-{
-fromUrl = new URL( from );
-}
-catch ( MalformedURLException e )
-{
-try
-{
-fromUrl = new File( from ).toURL();
-}
-catch ( MalformedURLException e1 )
-{
-getLog().warn( Unable to load a URL for ' + from + ': +
e.getMessage() );
-}
-}
-
-if ( toUrl != null fromUrl != null )
-{
-// URLs, determine if they share protocol and domain info
-
-if ( ( toUrl.getProtocol().equalsIgnoreCase( fromUrl.getProtocol()
) )
- ( toUrl.getHost().equalsIgnoreCase( fromUrl.getHost() ) )
- ( toUrl.getPort() == fromUrl.getPort() ) )
-
svn commit: r614387 - /maven/shared/trunk/maven-doxia-tools/
Author: vsiveton Date: Tue Jan 22 16:09:28 2008 New Revision: 614387 URL: http://svn.apache.org/viewvc?rev=614387view=rev Log: o ignored target and IDE files Modified: maven/shared/trunk/maven-doxia-tools/ (props changed) Propchange: maven/shared/trunk/maven-doxia-tools/ -- --- svn:ignore (added) +++ svn:ignore Tue Jan 22 16:09:28 2008 @@ -0,0 +1,6 @@ +target +.classpath +.project +maven-doxia-tools.iml +maven-doxia-tools.ipr +maven-doxia-tools.iws
svn commit: r614386 - in /maven/shared/trunk/maven-doxia-tools: ./ 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/apache/m
Author: vsiveton Date: Tue Jan 22 16:08:09 2008 New Revision: 614386 URL: http://svn.apache.org/viewvc?rev=614386view=rev Log: MSITE-290: Move logic from AbstractSiteMojo and AbstractSiteRenderingMojo for Doxia related stuff o first import from o.a.m.p.site: - AbstractSiteMojo#getRelativePath( String to, String from ) - AbstractSiteRenderingMojo#getSkinArtifactFile( DecorationModel decoration ) Added: maven/shared/trunk/maven-doxia-tools/pom.xml (with props) maven/shared/trunk/maven-doxia-tools/src/ maven/shared/trunk/maven-doxia-tools/src/main/ maven/shared/trunk/maven-doxia-tools/src/main/java/ maven/shared/trunk/maven-doxia-tools/src/main/java/org/ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (with props) maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java (with props) maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteToolException.java (with props) maven/shared/trunk/maven-doxia-tools/src/test/ maven/shared/trunk/maven-doxia-tools/src/test/java/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java (with props) maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java (with props) maven/shared/trunk/maven-doxia-tools/src/test/resources/ maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/ maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/site-tool-test/ maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/site-tool-test/pom.xml (with props) maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/site-tool-test/src/ maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/site-tool-test/src/site/ maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/site-tool-test/src/site/site.xml (with props) Added: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=614386view=auto == --- maven/shared/trunk/maven-doxia-tools/pom.xml (added) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Tue Jan 22 16:08:09 2008 @@ -0,0 +1,113 @@ +?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; + modelVersion4.0.0/modelVersion + + parent +groupIdorg.apache.maven.shared/groupId +artifactIdmaven-shared-components/artifactId +version8/version +relativePath../pom.xml/relativePath + /parent + + groupIdorg.apache.maven.shared/groupId + artifactIdmaven-doxia-tools/artifactId + version1.0-SNAPSHOT/version + nameMaven Doxia Tools/name + + prerequisites +maven2.0.2/maven + /prerequisites + + build +plugins + plugin +groupIdorg.codehaus.plexus/groupId +artifactIdplexus-maven-plugin/artifactId +executions + execution +idcreate-component-descriptor/id +goals + goaldescriptor/goal +/goals + /execution +/executions + /plugin +/plugins + /build + +
svn commit: r614384 - /maven/shared/trunk/maven-doxia-tools/
Author: vsiveton Date: Tue Jan 22 16:03:22 2008 New Revision: 614384 URL: http://svn.apache.org/viewvc?rev=614384view=rev Log: MSITE-290: Move logic from AbstractSiteMojo and AbstractSiteRenderingMojo for Doxia related stuff o created project Added: maven/shared/trunk/maven-doxia-tools/
svn commit: r614398 - in /maven/plugins/trunk/maven-project-info-reports-plugin: pom.xml src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Author: vsiveton
Date: Tue Jan 22 16:33:40 2008
New Revision: 614398
URL: http://svn.apache.org/viewvc?rev=614398view=rev
Log:
MSITE-290: Move logic from AbstractSiteMojo and AbstractSiteRenderingMojo for
Doxia related stuff
MNG-3346: Move logic inside AbstractProjectInfoReport to maven-reporting-impl
o used new shared maven-doxia-tools
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=614398r1=614397r2=614398view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Tue Jan 22
16:33:40 2008
@@ -261,6 +261,12 @@
/exclusions
/dependency
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-doxia-tools/artifactId
+ version1.0-SNAPSHOT/version
+/dependency
+
!-- Plexus --
dependency
groupIdorg.codehaus.plexus/groupId
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=614398r1=614397r2=614398view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Tue Jan 22 16:33:40 2008
@@ -35,6 +35,8 @@
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.tools.SiteTool;
+import org.apache.maven.doxia.tools.SiteToolException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
@@ -61,6 +63,13 @@
extends AbstractMavenReport
{
/**
+ * SiteTool.
+ *
+ * @component
+ */
+protected SiteTool siteTool;
+
+/**
* Report output directory.
*
* @parameter expression=${project.reporting.outputDirectory}
@@ -132,7 +141,8 @@
attributes.put( outputEncoding, UTF-8 );
attributes.put( project, project );
Locale locale = Locale.getDefault();
-SiteRenderingContext siteContext =
siteRenderer.createContextForSkin( getSkinArtifactFile(), attributes,
+Artifact defaultSkin = siteTool.getDefaultSkinArtifact(
localRepository, project.getRemoteArtifactRepositories() );
+SiteRenderingContext siteContext =
siteRenderer.createContextForSkin( defaultSkin.getFile(), attributes,
model, getName( locale ), locale );
RenderingContext context = new RenderingContext( outputDirectory,
getOutputName() + .html );
@@ -159,6 +169,11 @@
throw new MojoExecutionException(
An error has occurred in + getName( Locale.ENGLISH ) +
report generation., e );
}
+catch ( SiteToolException e )
+{
+throw new MojoExecutionException(
+An error has occurred in + getName( Locale.ENGLISH ) +
report generation., e );
+}
catch ( MavenReportException e )
{
throw new MojoExecutionException(
@@ -192,44 +207,5 @@
protected Renderer getSiteRenderer()
{
return siteRenderer;
-}
-
-// --
-// Private methods
-// --
-
-private File getSkinArtifactFile()
-throws MojoExecutionException
-{
-Skin skin = Skin.getDefaultSkin();
-
-String version = skin.getVersion();
-Artifact artifact;
-try
-{
-if ( version == null )
-{
-version = Artifact.RELEASE_VERSION;
-}
-VersionRange versionSpec = VersionRange.createFromVersionSpec(
version );
-artifact = factory.createDependencyArtifact( skin.getGroupId(),
skin.getArtifactId(), versionSpec, jar,
- null, null );
-
-
svn commit: r614400 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: AbstractSiteMojo.java AbstractSiteRenderingMojo.java
Author: vsiveton Date: Tue Jan 22 17:04:20 2008 New Revision: 614400 URL: http://svn.apache.org/viewvc?rev=614400view=rev Log: o fixed import Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=614400r1=614399r2=614400view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Tue Jan 22 17:04:20 2008 @@ -40,8 +40,6 @@ import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=614400r1=614399r2=614400view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Tue Jan 22 17:04:20 2008 @@ -24,12 +24,9 @@ import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; import org.apache.maven.doxia.site.decoration.Banner; import org.apache.maven.doxia.site.decoration.DecorationModel; -import org.apache.maven.doxia.site.decoration.Skin; import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler; import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader; import org.apache.maven.doxia.siterenderer.DocumentRenderer;
svn commit: r614401 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Author: vsiveton Date: Tue Jan 22 17:05:18 2008 New Revision: 614401 URL: http://svn.apache.org/viewvc?rev=614401view=rev Log: o fixed import Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=614401r1=614400r2=614401view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Tue Jan 22 17:05:18 2008 @@ -22,15 +22,10 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; -import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; -import org.apache.maven.doxia.site.decoration.Skin; import org.apache.maven.doxia.siterenderer.Renderer; import org.apache.maven.doxia.siterenderer.RendererException; import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
