You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/07/26 22:28:42 UTC
svn commit: r680042 - in /maven/plugins/trunk/maven-changes-plugin: pom.xml
src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
Author: olamy
Date: Sat Jul 26 13:28:41 2008
New Revision: 680042
URL: http://svn.apache.org/viewvc?rev=680042&view=rev
Log:
[MCHANGES-118] don't use system property user.dir
add exclusion on velocity with groupId velocity to use velocity 1.5 with groupId org.apache.velocity
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=680042&r1=680041&r2=680042&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sat Jul 26 13:28:41 2008
@@ -186,6 +186,10 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
</exclusions>
</dependency>
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=680042&r1=680041&r2=680042&view=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 Sat Jul 26 13:28:41 2008
@@ -28,6 +28,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
@@ -155,7 +156,7 @@
* Directory that contains the template.
* <p>
* <b>Note:</b> This directory must be a subdirectory of
- * <code>/src/main/resources/ or System proerty : user.dir</code>.
+ * <code>/src/main/resources/ or System property : basedir</code>.
* </p>
*
* @parameter default-value="org/apache/maven/plugin/announcement" expression="${changes.templateDirectory}"
@@ -163,6 +164,15 @@
*/
private String templateDirectory;
+ /**
+ * The current project base directory.
+ *
+ * @parameter expression="${basedir}"
+ * @required
+ * @since 2.1
+ */
+ private String basedir;
+
private ChangesXML xml;
//=======================================//
@@ -250,6 +260,7 @@
public void execute()
throws MojoExecutionException
{
+
if ( !generateJiraAnnouncement )
{
setXml( new ChangesXML( getXmlPath(), getLog() ) );
@@ -405,7 +416,11 @@
Writer writer = new FileWriter( f );
- getVelocity().getEngine().mergeTemplate( templateDirectory + "/" + template, context, writer );
+ VelocityEngine engine = velocity.getEngine();
+
+ engine.setApplicationAttribute( "baseDirectory", basedir );
+
+ engine.mergeTemplate( templateDirectory + "/" + template, context, writer );
writer.flush();
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java?rev=680042&r1=680041&r2=680042&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java Sat Jul 26 13:28:41 2008
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import java.util.Vector;
import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.exception.ResourceNotFoundException;
@@ -57,30 +56,26 @@
public void init( ExtendedProperties configuration )
{
- rsvc.info( "ProjectResourceLoader : initialization starting." );
+ rsvc.getLog().info( "ProjectResourceLoader : initialization starting." );
String separator = System.getProperty( "file.separator" );
String path = System.getProperty( "user.dir" ) + separator + "src" + separator + "main" + separator
+ "resources" + separator;
- rsvc.info( "path :" + path );
-
+ rsvc.getLog().info( "path :" + path );
+
paths = new ArrayList();
paths.add( path );
- // MCHANGES-118 adding the user.dir path
-
- paths.add( System.getProperty( "user.dir" ) );
-
int sz = paths.size();
for ( int i = 0; i < sz; i++ )
{
- rsvc.info( "ProjectResourceLoader : adding path '" + (String) paths.get( i ) + "'" );
+ rsvc.getLog().info( "ProjectResourceLoader : adding path '" + (String) paths.get( i ) + "'" );
}
- rsvc.info( "ProjectResourceLoader : initialization complete." );
+ rsvc.getLog().info( "ProjectResourceLoader : initialization complete." );
}
/**
@@ -114,7 +109,7 @@
String msg = "Project Resource loader error : argument " + template
+ " contains .. and may be trying to access " + "content outside of template root. Rejected.";
- rsvc.error( "ProjectResourceLoader : " + msg );
+ rsvc.getLog().error( "ProjectResourceLoader : " + msg );
throw new ResourceNotFoundException( msg );
}
@@ -126,6 +121,9 @@
{
template = template.substring( 1 );
}
+
+ // MCHANGES-118 adding the basedir path
+ paths.add( rsvc.getApplicationAttribute( "baseDirectory" ) );
int size = paths.size();
for ( int i = 0; i < size; i++ )