svn commit: r620624 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
Author: dennisl
Date: Mon Feb 11 13:52:32 2008
New Revision: 620624
URL: http://svn.apache.org/viewvc?rev=620624&view=rev
Log:
[MCHANGES-100] Generating the jira-report causes error "The system cannot find
the path specified"
Submitted by: Niall Pemberton
Reviewed by: Dennis Lundberg
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=620624&r1=620623&r2=620624&view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
Mon Feb 11 13:52:32 2008
@@ -655,6 +655,11 @@
{
final String strGetResponseBody = gm.getResponseBodyAsString();
+if ( !output.getParentFile().exists() )
+{
+output.getParentFile().mkdirs();
+}
+
// write the reponse to file
PrintWriter pw = new PrintWriter( new FileWriter( output ) );
svn commit: r620614 - in /maven/plugins/trunk/maven-war-plugin: ./ src/it/MWAR-143/ src/it/MWAR-143/war-common/ src/it/MWAR-143/war-common/src/ src/it/MWAR-143/war-common/src/main/ src/it/MWAR-143/war
Author: olamy
Date: Mon Feb 11 13:30:37 2008
New Revision: 620614
URL: http://svn.apache.org/viewvc?rev=620614&view=rev
Log:
[MWAR-143] War Overlays and resources filtering
Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/ (with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt (with
props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml (with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh (with
props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/ (with
props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/resources/filter.properties
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/web.xml
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/pom.xml
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/web.xml
(with props)
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=620614&r1=620613&r2=620614&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Mon Feb 11 13:30:37 2008
@@ -200,8 +200,13 @@
src/it
-**/**/pom.xml
+**/pom.xml
+
+MWAR-143/war-common/pom.xml
+MWAR-143/war-filter-overlay/pom.xml
+**/META-INF/**/pom.xml
+
verify.bsh
${basedir}/target/local-repo
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/
--
--- svn:ignore (added)
+++ svn:ignore Mon Feb 11 13:30:37 2008
@@ -0,0 +1 @@
+build.log
Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt?rev=620614&view=auto
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt (added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt Mon Feb 11
13:30:37 2008
@@ -0,0 +1 @@
+clean install
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt
--
svn:executable = *
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/goals.txt
--
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml?rev=620614&view=auto
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml (added)
+++ maven/p
svn commit: r620678 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: AbstractSiteMojo.java AbstractSiteRenderingMojo.java SiteDescriptorAttachMojo.java
Author: vsiveton
Date: Mon Feb 11 16:25:10 2008
New Revision: 620678
URL: http://svn.apache.org/viewvc?rev=620678&view=rev
Log:
MSITE-279: Inheritance of elements from site descriptor quite broken
o updated code due to r620676
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
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.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=620678&r1=620677&r2=620678&view=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
Mon Feb 11 16:25:10 2008
@@ -285,4 +285,30 @@
populateItemRefs( item.getItems(), locale, reportsByOutputName );
}
}
+
+/**
+ * TODO should be removed see PLXUTILS-61
+ *
+ * @param basedir
+ * @param absolutePath
+ * @return
+ */
+protected static String toRelative( File basedir, String absolutePath )
+{
+String relative;
+
+absolutePath = absolutePath.replace( '\\', '/' );
+String basedirPath = basedir.getAbsolutePath().replace( '\\', '/' );
+
+if ( absolutePath.startsWith( basedirPath ) )
+{
+relative = absolutePath.substring( basedirPath.length() + 1 );
+}
+else
+{
+relative = absolutePath;
+}
+
+return relative;
+}
}
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=620678&r1=620677&r2=620678&view=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
Mon Feb 11 16:25:10 2008
@@ -223,7 +223,7 @@
DecorationModel decorationModel;
try
{
-decorationModel = siteTool.getDecorationModel( project,
reactorProjects, localRepository, repositories, siteDirectory, locale,
inputEncoding, outputEncoding );
+decorationModel = siteTool.getDecorationModel( project,
reactorProjects, localRepository, repositories, toRelative(
project.getBasedir(), siteDirectory.getAbsolutePath() ), locale, inputEncoding,
outputEncoding );
}
catch ( SiteToolException e )
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=620678&r1=620677&r2=620678&view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Mon Feb 11 16:25:10 2008
@@ -71,7 +71,7 @@
{
Locale locale = (Locale) iterator.next();
-File descriptorFile = siteTool.getSiteDescriptorFromBasedir(
siteDirectory, basedir, locale );
+File descriptorFile = siteTool.getSiteDescriptorFromBasedir(
toRelative( project.getBasedir(), siteDirectory.getAbsolutePath() ), basedir,
locale );
if ( descriptorFile.exists() )
{
svn commit: r620666 - /maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
Author: dfabulich
Date: Mon Feb 11 15:24:22 2008
New Revision: 620666
URL: http://svn.apache.org/viewvc?rev=620666&view=rev
Log:
Don't dump output files in USER_DIR; put them in the target directory instead.
Modified:
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
Modified:
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java?rev=620666&r1=620665&r2=620666&view=diff
==
---
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
Mon Feb 11 15:24:22 2008
@@ -38,18 +38,22 @@
{
private static final String USER_DIR = System.getProperty( "user.dir" );
+File targetDir;
protected void setUp()
throws Exception
{
super.setUp();
-setOutputConsumer( new FileOutputConsumerProxy( (OutputConsumer)
getOutputConsumerMock().proxy() ) );
+targetDir = new File ( USER_DIR, "target" );
+if ( !targetDir.exists() ) targetDir = new File( USER_DIR );
+setOutputConsumer( new FileOutputConsumerProxy( (OutputConsumer)
getOutputConsumerMock().proxy(), targetDir ) );
}
public void testConsumeOutputLine()
throws Exception
{
-File reportFile = new File( USER_DIR, getReportEntry().getName() +
"-output.txt" );
+
+File reportFile = new File( targetDir, getReportEntry().getName() +
"-output.txt" );
reportFile.delete();
getOutputConsumerMock().expects( new InvokeOnceMatcher() ).method(
"testSetStarting" )
svn commit: r620436 - /maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo
Author: brett Date: Mon Feb 11 00:07:37 2008 New Revision: 620436 URL: http://svn.apache.org/viewvc?rev=620436&view=rev Log: [MNG-3397] add missing attribute value Modified: maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo Modified: maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo?rev=620436&r1=620435&r2=620436&view=diff == --- maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo (original) +++ maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo Mon Feb 11 00:07:37 2008 @@ -4826,7 +4826,7 @@ false - + maven 4.1.0+ String
svn commit: r620676 - in /maven/shared/trunk/maven-doxia-tools/src: main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java main/java/org/apache/maven/doxia/tools/SiteTool.java test/java/org/apach
Author: vsiveton
Date: Mon Feb 11 16:17:06 2008
New Revision: 620676
URL: http://svn.apache.org/viewvc?rev=620676&view=rev
Log:
MSITE-279: Inheritance of elements from site descriptor quite broken
Submitted by: Benjamin Bentmann
Reviewed by: Vincent Siveton
o applied. This patch modify the API
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=620676&r1=620675&r2=620676&view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Mon Feb 11 16:17:06 2008
@@ -391,7 +391,7 @@
}
/** [EMAIL PROTECTED] */
-public File getSiteDescriptorFromBasedir( File siteDirectory, File
basedir, Locale locale )
+public File getSiteDescriptorFromBasedir( String siteDirectory, File
basedir, Locale locale )
{
if ( basedir == null )
{
@@ -401,20 +401,20 @@
if ( siteDirectory == null )
{
// TODO need to be more dynamic
-siteDirectory = new File( basedir, "src/site" );
+siteDirectory = "src/site";
}
if ( locale == null )
{
locale = new Locale( "" );
}
-String relativePath = getRelativePath(
siteDirectory.getAbsolutePath(), basedir.getAbsolutePath() );
+File siteDir = new File( basedir, siteDirectory );
-File siteDescriptor = new File( relativePath, "site_" +
locale.getLanguage() + ".xml" );
+File siteDescriptor = new File( siteDir, "site_" +
locale.getLanguage() + ".xml" );
-if ( !siteDescriptor.exists() )
+if ( !siteDescriptor.isFile() )
{
-siteDescriptor = new File( relativePath, "site.xml" );
+siteDescriptor = new File( siteDir, "site.xml" );
}
return siteDescriptor;
}
@@ -465,7 +465,7 @@
/** [EMAIL PROTECTED] */
public DecorationModel getDecorationModel( MavenProject project, List
reactorProjects,
ArtifactRepository
localRepository, List repositories,
- File siteDirectory, Locale
locale, String inputEncoding,
+ String siteDirectory, Locale
locale, String inputEncoding,
String outputEncoding )
throws SiteToolException
{
@@ -494,11 +494,6 @@
throw new IllegalArgumentException( "outputEncoding could not be
null" );
}
-if ( siteDirectory == null )
-{
-// TODO need to be more dynamic
-siteDirectory = new File( project.getBasedir(), "src/site" );
-}
if ( locale == null )
{
locale = Locale.getDefault();
@@ -987,7 +982,7 @@
private DecorationModel getDecorationModel( MavenProject project, List
reactorProjects,
ArtifactRepository
localRepository, List repositories,
-File siteDirectory, Locale
locale, Map origProps, String inputEncoding,
+String siteDirectory, Locale
locale, Map origProps, String inputEncoding,
String outputEncoding )
throws SiteToolException
{
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java?rev=620676&r1=620675&r2=620676&view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Mon Feb 11 16:17:06 2008
@@ -84,13 +84,13 @@
String getRelativePath( String to, String from );
/**
- * @param siteDirectory containing the site.xml file. If
null, using by default "${basedir}/src/site".
+ * @param siteDirectory The path to the directory containing the
site.xml file, relative to the project base directory. If null,
using by default "src/site
