You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/19 02:00:36 UTC
svn commit: r628941 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/archive/task/
main/java/org/apache/maven/plugin/assembly/format/
main/java/org/apache/maven/plugin/assembly/utils/ test/java/org/apache/...
Author: jdcasey
Date: Mon Feb 18 17:00:33 2008
New Revision: 628941
URL: http://svn.apache.org/viewvc?rev=628941&view=rev
Log:
[MASSEMBLY-250] Correcting inappropriate file cleanup, and adding ${pom.properties.*} expressions for outputDirectory, outputFileNameMapping, and so forth.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=628941&r1=628940&r2=628941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Mon Feb 18 17:00:33 2008
@@ -30,7 +30,6 @@
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -141,36 +140,18 @@
logger.debug( "Adding file-set from directory: '" + fileSetDir.getAbsolutePath() + "'\nassembly output directory is: \'" + destDirectory + "\'" );
- try
- {
- AddDirectoryTask task = new AddDirectoryTask( fileSetDir );
+ AddDirectoryTask task = new AddDirectoryTask( fileSetDir );
- task.setDirectoryMode( TypeConversionUtils.modeToInt( fileSet.getDirectoryMode(), logger ) );
- task.setFileMode( TypeConversionUtils.modeToInt( fileSet.getFileMode(), logger ) );
- task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() );
- List excludes = fileSet.getExcludes();
- excludes.add( "**/*.filtered" );
- task.setExcludes( excludes );
- task.setIncludes( fileSet.getIncludes() );
- task.setOutputDirectory( destDirectory );
+ task.setDirectoryMode( TypeConversionUtils.modeToInt( fileSet.getDirectoryMode(), logger ) );
+ task.setFileMode( TypeConversionUtils.modeToInt( fileSet.getFileMode(), logger ) );
+ task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() );
+ List excludes = fileSet.getExcludes();
+ excludes.add( "**/*.filtered" );
+ task.setExcludes( excludes );
+ task.setIncludes( fileSet.getIncludes() );
+ task.setOutputDirectory( destDirectory );
- task.execute( archiver, configSource );
- }
- finally
- {
- try
- {
- if ( !fileSetDir.equals( origFileSetDir ) )
- {
- FileUtils.deleteDirectory( fileSetDir );
- }
- }
- catch ( IOException e )
- {
- // ignore - we've just left something in the temporary directory
- logger.warn( "Unable to delete temporary directory: " + fileSetDir + ": " + e.getMessage() );
- }
- }
+ task.execute( archiver, configSource );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java?rev=628941&r1=628940&r2=628941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java Mon Feb 18 17:00:33 2008
@@ -115,8 +115,8 @@
private static void deleteDirectory( File formattedDir )
{
try
- {
- FileUtils.deleteDirectory( formattedDir );
+ {
+ FileUtils.deleteDirectory( formattedDir );
}
catch ( IOException e1 )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=628941&r1=628940&r2=628941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java Mon Feb 18 17:00:33 2008
@@ -151,6 +151,7 @@
// 6
interpolator.addValueSource( new PropertiesInterpolationValueSource( mainProject.getProperties() ) );
+ interpolator.addValueSource( new PrefixedPropertiesInterpolationValueSource( "pom.properties.", mainProject.getProperties() ) );
}
// 7
@@ -289,6 +290,7 @@
{
// 6
interpolator.addValueSource( new PropertiesInterpolationValueSource( mainProject.getProperties() ) );
+ interpolator.addValueSource( new PrefixedPropertiesInterpolationValueSource( "pom.properties.", mainProject.getProperties() ) );
}
// 7
Added: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java?rev=628941&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java Mon Feb 18 17:00:33 2008
@@ -0,0 +1,55 @@
+package org.apache.maven.plugin.assembly.utils;
+
+/*
+ * 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.
+ */
+
+import java.util.Properties;
+
+/**
+ * @version $Id$
+ */
+public class PrefixedPropertiesInterpolationValueSource
+ extends PropertiesInterpolationValueSource
+{
+
+ private final String prefix;
+
+ public PrefixedPropertiesInterpolationValueSource( String prefix, Properties properties )
+ {
+ super( properties );
+ this.prefix = prefix;
+ }
+
+ public Object getValue( String expression )
+ {
+ if ( ( expression == null ) || !expression.startsWith( prefix ) )
+ {
+ return null;
+ }
+
+ String realExpr = expression.substring( prefix.length() );
+ if ( realExpr.startsWith( "." ) )
+ {
+ realExpr = realExpr.substring( 1 );
+ }
+
+ return super.getValue( realExpr );
+ }
+
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PrefixedPropertiesInterpolationValueSource.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=628941&r1=628940&r2=628941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Mon Feb 18 17:00:33 2008
@@ -74,6 +74,7 @@
MockAndControlForAssemblyArchiver macMgr = new MockAndControlForAssemblyArchiver( mm );
macMgr.expectGetArchiver( "zip", Archiver.class );
+ macMgr.expectGetDestFile( new File( "test" ) );
MockControl phaseControl = MockControl.createControl( AssemblyArchiverPhase.class );
mm.add( phaseControl );
@@ -490,6 +491,12 @@
mm.add( collectionManagerControl );
collectionManager = (ActiveCollectionManager) collectionManagerControl.getMock();
+ }
+
+ void expectGetDestFile( File file )
+ {
+ archiver.getDestFile();
+ archiverControl.setReturnValue( file, MockControl.ZERO_OR_MORE );
}
void createArchiver( Class archiverClass )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=628941&r1=628940&r2=628941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java Mon Feb 18 17:00:33 2008
@@ -190,6 +190,14 @@
verifyOutputDir( "file.${myProperty}", null, null, null, null, null, "file.value/", null, true, props );
}
+ public void testGetOutputDir_ShouldResolveProjectPropertyAltExpr() throws AssemblyFormattingException
+ {
+ Properties props = new Properties();
+ props.setProperty( "myProperty", "value" );
+
+ verifyOutputDir( "file.${pom.properties.myProperty}", null, null, null, null, null, "file.value/", null, true, props );
+ }
+
public void testEvalFileNameMapping_ShouldResolveArtifactIdAndBaseVersionInOutDir_UseArtifactInfo_WithValidMainProject()
throws AssemblyFormattingException
{
@@ -329,6 +337,14 @@
props.setProperty( "myProperty", "value" );
verifyEvalFileNameMapping( "file.${myProperty}", null, null, null, null, null, "file.value", null, true, props );
+ }
+
+ public void testEvalFileNameMapping_ShouldResolveProjectPropertyAltExpr() throws AssemblyFormattingException
+ {
+ Properties props = new Properties();
+ props.setProperty( "myProperty", "value" );
+
+ verifyEvalFileNameMapping( "file.${pom.properties.myProperty}", null, null, null, null, null, "file.value", null, true, props );
}
public void testEvalFileNameMapping_ShouldResolveSystemPropertyWithoutMainProjectPresent() throws AssemblyFormattingException