Author: oching
Date: Mon Oct 24 11:16:50 2011
New Revision: 1188093
URL: http://svn.apache.org/viewvc?rev=1188093&view=rev
Log:
[NPANDAY-474] added .svn and .references to default exclusions. added param for
additional exclusions
Modified:
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
Modified:
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java?rev=1188093&r1=1188092&r2=1188093&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
Mon Oct 24 11:16:50 2011
@@ -51,7 +51,7 @@ public class AspxCompilerMojo
{
private static final String DEFAULT_INCLUDES = "**"; //any extension can
be made for request handler in ASPX
- private static final String DEFAULT_EXCLUDES = "obj/**, target/**,
**/*.pdb, **/*.csproj, **/*.vbproj, **/*.suo, **/*.user,pom.xml,
**/*.sln,build.log,PrecompiledApp.config,csproj.user,Properties/**,**.releaseBackup,^-?(?:\\d+|\\d{1,3}(?:,\\d{3})+)(?:\\.\\d+)?$/**";
+ private static final String DEFAULT_EXCLUDES =
".svn/**,.references/**,obj/**, target/**, **/*.pdb, **/*.csproj, **/*.vbproj,
**/*.suo, **/*.user,pom.xml,
**/*.sln,build.log,PrecompiledApp.config,csproj.user,Properties/**,**.releaseBackup,^-?(?:\\d+|\\d{1,3}(?:,\\d{3})+)(?:\\.\\d+)?$/**";
/**
* @parameter expression="${npanday.settings}"
default-value="${user.home}/.m2"
@@ -149,6 +149,11 @@ public class AspxCompilerMojo
private File webSourceDirectory;
+ /**
+ * @parameter expression = "${excludes}"
+ */
+ private String[] excludes;
+
/**
* @component
*/
@@ -248,9 +253,20 @@ public class AspxCompilerMojo
/* TODO should be removed since target is deleted */
//FileUtils.deleteDirectory( new File( tmpDir,
outputDirectory.getName() ) );
+ // NPANDAY-474
+ String combinedExcludes = "";
+ if( excludes != null )
+ {
+ for( int i = 0; i < excludes.length; i++ )
+ {
+ combinedExcludes = combinedExcludes + excludes[i] + ",";
+ }
+ }
+ combinedExcludes = combinedExcludes + DEFAULT_EXCLUDES;
+
/* keep only the files needed to run the app */
List<File> allFiles = FileUtils.getFiles( tmpDestDir, "**", null );
- List<File> filesToKeep = FileUtils.getFiles( tmpDestDir,
DEFAULT_INCLUDES, DEFAULT_EXCLUDES );
+ List<File> filesToKeep = FileUtils.getFiles( tmpDestDir,
DEFAULT_INCLUDES, combinedExcludes );
for ( File file : allFiles )
{
