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 2012/08/02 21:57:14 UTC
svn commit: r1368674 - in /maven/plugins/trunk/maven-rar-plugin/src:
it/default/ it/filtered/ it/filtered/src/ it/filtered/src/main/
it/filtered/src/main/custom/ it/filtered/src/main/rar/
main/java/org/apache/maven/plugin/rar/
Author: olamy
Date: Thu Aug 2 19:57:13 2012
New Revision: 1368674
URL: http://svn.apache.org/viewvc?rev=1368674&view=rev
Log:
add it with filtering enabled
Added:
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/pom.xml
- copied, changed from r1368673, maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml (with props)
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt (with props)
maven/plugins/trunk/maven-rar-plugin/src/it/filtered/verify.bsh
- copied, changed from r1368673, maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh
Modified:
maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified: maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml?rev=1368674&r1=1368673&r2=1368674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml Thu Aug 2 19:57:13 2012
@@ -38,7 +38,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<includeJar>false</includeJar>
- <raXmlFile>src/main/custom/ra.xml</raXmlFile>
+ <raXmlFile>src/main/custom/ra.xml</raXmlFile>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh?rev=1368674&r1=1368673&r2=1368674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh Thu Aug 2 19:57:13 2012
@@ -34,7 +34,7 @@ try
String content = new String(IOUtil.toByteArray( stream ));
- int idx = content.indexOf("1.0-SNAPSHOT");
+ int idx = content.indexOf("${project.version}");
if (idx<1) {
System.out.println("SomeResource.txt not filtered");
Copied: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/pom.xml (from r1368673, maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/it/filtered/pom.xml?p2=maven/plugins/trunk/maven-rar-plugin/src/it/filtered/pom.xml&p1=maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml&r1=1368673&r2=1368674&rev=1368674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/it/default/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/it/filtered/pom.xml Thu Aug 2 19:57:13 2012
@@ -23,7 +23,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.it0070</groupId>
- <artifactId>maven-it-it0070</artifactId>
+ <artifactId>maven-it-non-filtered</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>rar</packaging>
@@ -38,7 +38,8 @@ under the License.
<version>@project.version@</version>
<configuration>
<includeJar>false</includeJar>
- <raXmlFile>src/main/custom/ra.xml</raXmlFile>
+ <raXmlFile>src/main/custom/ra.xml</raXmlFile>
+ <filterRarSourceDirectory>true</filterRarSourceDirectory>
</configuration>
</plugin>
</plugins>
Added: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml?rev=1368674&view=auto
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml (added)
+++ maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml Thu Aug 2 19:57:13 2012
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<connector>
+ <fake-content></fake-content>
+</connector>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/custom/ra.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt?rev=1368674&view=auto
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt (added)
+++ maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt Thu Aug 2 19:57:13 2012
@@ -0,0 +1 @@
+foo=${project.version}
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/src/main/rar/SomeResource.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugins/trunk/maven-rar-plugin/src/it/filtered/verify.bsh (from r1368673, maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/it/filtered/verify.bsh?p2=maven/plugins/trunk/maven-rar-plugin/src/it/filtered/verify.bsh&p1=maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh&r1=1368673&r2=1368674&rev=1368674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/it/default/verify.bsh (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/it/filtered/verify.bsh Thu Aug 2 19:57:13 2012
@@ -6,7 +6,7 @@ import org.codehaus.plexus.util.*;
try
{
- File jarFile = new File( basedir, "target/maven-it-it0070-1.0-SNAPSHOT.rar" );
+ File jarFile = new File( basedir, "target/maven-it-non-filtered-1.0-SNAPSHOT.rar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1368674&r1=1368673&r2=1368674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Thu Aug 2 19:57:13 2012
@@ -126,6 +126,14 @@ public class RarMojo
private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
/**
+ * allow filtering of link{rarSourceDirectory}
+ * @since 2.3
+ */
+ @Parameter(property = "rar.filterRarSourceDirectory", defaultValue = "false")
+ private boolean filterRarSourceDirectory;
+
+
+ /**
* @since 2.3
*/
@Component( role = MavenResourcesFiltering.class, hint = "default" )
@@ -294,7 +302,7 @@ public class RarMojo
Resource resource = new Resource();
resource.setDirectory( rarSourceDirectory.getAbsolutePath() );
resource.setTargetPath( getBuildDir().getAbsolutePath() );
- resource.setFiltering( true );
+ resource.setFiltering( filterRarSourceDirectory );
MavenResourcesExecution mavenResourcesExecution =
new MavenResourcesExecution( Collections.singletonList( resource ), getBuildDir(), project, encoding,
@@ -349,46 +357,6 @@ public class RarMojo
throw new MojoExecutionException( "Error copying RAR resources", e );
}
- // Copy source files
- /*try
- {
- File rarSourceDir = rarSourceDirectory;
- if ( rarSourceDir.exists() )
- {
- getLog().info( "Copy rar resources to " + getBuildDir().getAbsolutePath() );
-
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( rarSourceDir.getAbsolutePath() );
- scanner.setIncludes( DEFAULT_INCLUDES );
- scanner.addDefaultExcludes();
- scanner.scan();
-
- String[] dirs = scanner.getIncludedDirectories();
-
- for ( int j = 0; j < dirs.length; j++ )
- {
- new File( getBuildDir(), dirs[j] ).mkdirs();
- }
-
- String[] files = scanner.getIncludedFiles();
-
- for ( int j = 0; j < files.length; j++ )
- {
- File targetFile = new File( getBuildDir(), files[j] );
-
- targetFile.getParentFile().mkdirs();
-
- File file = new File( rarSourceDir, files[j] );
- FileUtils.copyFileToDirectory( file, targetFile.getParentFile() );
- }
- }
- }
- catch ( Exception e )
- {
- throw new MojoExecutionException( "Error copying RAR resources", e );
- }
- */
-
// Include custom manifest if necessary
try
{