Author: epunzalan
Date: Sun Mar 19 16:54:43 2006
New Revision: 387092
URL: http://svn.apache.org/viewcvs?rev=387092&view=rev
Log:
Code format and optimized imports
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractDirectoryMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/ComponentsXmlArchiverFileFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryInlineMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
Sun Mar 19 16:54:43 2006
@@ -24,26 +24,19 @@
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.model.Model;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.assembly.filter.AssemblyScopeArtifactFilter;
import
org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolationException;
import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
import org.apache.maven.plugins.assembly.model.Assembly;
+import org.apache.maven.plugins.assembly.model.Component;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.plugins.assembly.model.FileItem;
import org.apache.maven.plugins.assembly.model.FileSet;
-import org.apache.maven.plugins.assembly.model.Component;
import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader;
import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Reader;
import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.project.injection.DefaultModelDefaultsInjector;
-import org.apache.maven.project.injection.ModelDefaultsInjector;
-import org.apache.maven.project.interpolation.ModelInterpolationException;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.apache.maven.project.interpolation.RegexBasedModelInterpolator;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -70,7 +63,6 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -102,13 +94,13 @@
* @parameter
*/
private String[] descriptorRefs;
-
+
/**
* This is the base directory from which archive files are created.
* This base directory pre-pended to any <code><directory></code>
* specifications in the assembly descriptor. This is an optional
* parameter
- *
+ *
* @parameter
*/
private File archiveBaseDirectory;
@@ -207,11 +199,11 @@
{
assemblies = readAssemblies();
}
- catch( AssemblyInterpolationException e )
+ catch ( AssemblyInterpolationException e )
{
throw new MojoExecutionException( "Failed to interpolate assembly
descriptor", e );
}
-
+
// TODO: include dependencies marked for distribution under certain
formats
// TODO: how, might we plug this into an installer, such as NSIS?
@@ -267,7 +259,7 @@
}
else
{
- projectHelper.attachArtifact( project, format, null, destFile );
+ projectHelper.attachArtifact( project, format, null, destFile
);
}
}
}
@@ -420,17 +412,17 @@
throws MojoFailureException, MojoExecutionException,
AssemblyInterpolationException
{
Assembly assembly;
-
+
try
{
Map context = new HashMap( System.getProperties() );
-
+
context.put( "basedir", basedir.getAbsolutePath() );
AssemblyXpp3Reader r = new AssemblyXpp3Reader();
assembly = r.read( reader );
-
- assembly = new AssemblyInterpolator().interpolate( assembly,
project.getModel(), context );
+
+ assembly = new AssemblyInterpolator().interpolate( assembly,
project.getModel(), context );
}
catch ( IOException e )
{
@@ -451,12 +443,13 @@
}
appendComponentsToMainAssembly( assembly );
-
+
return assembly;
}
/**
* Add the contents of all included components to main assembly
+ *
* @param assembly
* @throws MojoFailureException
* @throws MojoExecutionException
@@ -465,17 +458,18 @@
throws MojoFailureException, MojoExecutionException
{
List componentDescriptorFiles = assembly.getComponentDescriptors();
-
- for( int i = 0 ; i < componentDescriptorFiles.size(); ++i )
+
+ for ( int i = 0; i < componentDescriptorFiles.size(); ++i )
{
Component component = getComponent( componentDescriptorFiles.get(
i ).toString() );
-
+
appendComponent( assembly, component );
}
}
/**
* Add the content of a single Component to main assembly
+ *
* @param assembly
* @param component
* @throws MojoFailureException
@@ -485,39 +479,40 @@
throws MojoFailureException, MojoExecutionException
{
List dependencySetList = component.getDependencySets();
-
- for ( int i = 0 ; i < dependencySetList.size(); ++i )
+
+ for ( int i = 0; i < dependencySetList.size(); ++i )
{
- assembly.addDependencySet( (DependencySet)
dependencySetList.get(i) );
+ assembly.addDependencySet( (DependencySet) dependencySetList.get(
i ) );
}
List fileSetList = component.getFileSets();
-
- for ( int i = 0 ; i < fileSetList.size(); ++i )
+
+ for ( int i = 0; i < fileSetList.size(); ++i )
{
- assembly.addFileSet( (FileSet) fileSetList.get(i) );
+ assembly.addFileSet( (FileSet) fileSetList.get( i ) );
}
List fileList = component.getFiles();
-
- for ( int i = 0 ; i < fileList.size(); ++i )
+
+ for ( int i = 0; i < fileList.size(); ++i )
{
- assembly.addFile( (FileItem) fileList.get(i) );
+ assembly.addFile( (FileItem) fileList.get( i ) );
}
}
-
+
/**
* Load the Component via a given file path relative to ${basedir}
+ *
* @param filePath
* @return
* @throws MojoFailureException
* @throws MojoExecutionException
*/
-
+
private Component getComponent( String filePath )
throws MojoFailureException, MojoExecutionException
{
- File componentDescriptor = new File ( this.project.getBasedir() + "/"
+ filePath );
+ File componentDescriptor = new File( this.project.getBasedir() + "/" +
filePath );
Reader r;
try
@@ -530,11 +525,12 @@
}
return getComponent( r );
-
+
}
-
+
/**
* Load the Component via a Reader
+ *
* @param reader
* @return
* @throws MojoExecutionException
@@ -565,12 +561,12 @@
}
/**
- * Processes Dependency Sets
- *
- * @param archiver
- * @param dependencySets
- * @param includeBaseDirectory
- */
+ * Processes Dependency Sets
+ *
+ * @param archiver
+ * @param dependencySets
+ * @param includeBaseDirectory
+ */
protected void processDependencySets( Archiver archiver, List
dependencySets, boolean includeBaseDirectory )
throws ArchiverException, IOException, MojoExecutionException,
MojoFailureException, XmlPullParserException
{
@@ -590,7 +586,7 @@
AndArtifactFilter filter = new AndArtifactFilter();
filter.add( new AssemblyScopeArtifactFilter(
dependencySet.getScope() ) );
-
+
if ( !dependencySet.getIncludes().isEmpty() )
{
filter.add( new IncludesArtifactFilter(
dependencySet.getIncludes() ) );
@@ -599,10 +595,10 @@
{
filter.add( new ExcludesArtifactFilter(
dependencySet.getExcludes() ) );
}
-
+
Set set;
-
- if( projectModulesOnly )
+
+ if ( projectModulesOnly )
{
set = getModules();
}
@@ -610,7 +606,7 @@
{
set = getDependencies();
}
-
+
// TODO: includes and excludes
for ( Iterator j = set.iterator(); j.hasNext(); )
{
@@ -619,7 +615,7 @@
if ( filter.include( artifact ) )
{
String name = artifact.getFile().getName();
-
+
if ( dependencySet.isUnpack() )
{
// TODO: something like zipfileset in plexus-archiver
@@ -654,21 +650,23 @@
addDirectory( archiver, tempLocation, output, null,
FileUtils.getDefaultExcludesAsList() );
}
else
- {
+ {
String outputFileNameMapping =
dependencySet.getOutputFileNameMapping();
-
+
//insert the classifier if exist
- if( artifact.getClassifier() != null &&
!artifact.getClassifier().equals( "" ) )
- {
+ if ( artifact.getClassifier() != null &&
!artifact.getClassifier().equals( "" ) )
+ {
int dotIdx = outputFileNameMapping.lastIndexOf(
"." );
-
- String extension =
outputFileNameMapping.substring( dotIdx + 1, outputFileNameMapping.length() );
+
+ String extension =
+ outputFileNameMapping.substring( dotIdx + 1,
outputFileNameMapping.length() );
String artifactWithoutExt =
outputFileNameMapping.substring( 0, dotIdx );
-
- outputFileNameMapping = artifactWithoutExt + "-" +
artifact.getClassifier() + "." + extension;
+
+ outputFileNameMapping =
+ artifactWithoutExt + "-" +
artifact.getClassifier() + "." + extension;
}
- archiver.addFile( artifact.getFile(), output +
- evaluateFileNameMapping( outputFileNameMapping,
artifact ) );
+ archiver.addFile( artifact.getFile(),
+ output + evaluateFileNameMapping(
outputFileNameMapping, artifact ) );
}
}
else
@@ -770,23 +768,25 @@
String[] excludes = (String[]) excludesList.toArray(
EMPTY_STRING_ARRAY );
File archiveBaseDir;
- if ( archiveBaseDirectory == null)
+ if ( archiveBaseDirectory == null )
{
- archiveBaseDir = new File( directory );
+ archiveBaseDir = new File( directory );
}
else
{
- if (! archiveBaseDirectory.exists())
+ if ( ! archiveBaseDirectory.exists() )
{
- throw new IOException("The archive base directory
'"+archiveBaseDirectory.getAbsolutePath()+"' does not exist");
+ throw new IOException(
+ "The archive base directory '" +
archiveBaseDirectory.getAbsolutePath() + "' does not exist" );
}
- if (! archiveBaseDirectory.isDirectory())
+ if ( ! archiveBaseDirectory.isDirectory() )
{
- throw new IOException("The archive base directory
'"+archiveBaseDirectory.getAbsolutePath()+"' exists, but it is not a
directory");
+ throw new IOException( "The archive base directory '" +
archiveBaseDirectory.getAbsolutePath() +
+ "' exists, but it is not a directory" );
}
- archiveBaseDir = new File( archiveBaseDirectory, directory);
+ archiveBaseDir = new File( archiveBaseDirectory, directory );
}
- getLog().debug("The archive base directory is
'"+archiveBaseDir.getAbsolutePath()+"'");
+ getLog().debug( "The archive base directory is '" +
archiveBaseDir.getAbsolutePath() + "'" );
if ( ! archiveBaseDir.isAbsolute() )
{
@@ -799,7 +799,7 @@
archiveBaseDir = tmpDir;
}
- getLog().debug("Archive base directory:
'"+archiveBaseDir.getAbsolutePath()+"'");
+ getLog().debug( "Archive base directory: '" +
archiveBaseDir.getAbsolutePath() + "'" );
addDirectory( archiver, archiveBaseDir, output, includes,
excludesList );
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractDirectoryMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractDirectoryMojo.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractDirectoryMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractDirectoryMojo.java
Sun Mar 19 16:54:43 2006
@@ -1,9 +1,5 @@
package org.apache.maven.plugin.assembly;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import
org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolationException;
@@ -13,19 +9,24 @@
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-public abstract class AbstractDirectoryMojo
- extends AbstractAssemblyMojo {
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+public abstract class AbstractDirectoryMojo
+ extends AbstractAssemblyMojo
+{
public void execute()
throws MojoExecutionException, MojoFailureException
{
- List assemblies;
+ List assemblies;
try
{
assemblies = readAssemblies();
}
- catch( AssemblyInterpolationException e )
+ catch ( AssemblyInterpolationException e )
{
throw new MojoExecutionException( "Failed to interpolate assembly
descriptor", e );
}
@@ -56,7 +57,7 @@
createArchive( archiver, assembly, fullName );
}
-
+
catch ( NoSuchArchiverException e )
{
throw new MojoExecutionException( "Error creating assembly", e );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
Sun Mar 19 16:54:43 2006
@@ -70,7 +70,7 @@
* @parameter expression="${projectModulesOnly}" default-value="false"
*/
protected boolean projectModulesOnly = false;
-
+
/**
* Directory to unpack JARs into if needed
*
@@ -87,12 +87,12 @@
*/
protected ArchiverManager archiverManager;
-
+
/**
* @component
*/
protected ArtifactResolver artifactResolver;
-
+
/**
* @parameter expression="${localRepository}"
*/
@@ -133,7 +133,7 @@
Map dependencies = new HashMap();
MavenProject project = getExecutedProject();
-
+
// TODO: this is not mediating dependencies versions - first wins. Is
there a way we can do that properly from here?
if ( project != null )
{
@@ -152,7 +152,7 @@
MavenProject reactorProject = (MavenProject) i.next();
Artifact artifact = reactorProject.getArtifact();
-
+
if ( artifact.getFile() != null )
{
String key = artifact.getDependencyConflictId();
@@ -165,8 +165,8 @@
for ( Iterator j = reactorProject.getArtifacts().iterator();
j.hasNext(); )
{
- artifact = (Artifact) j.next();
-
+ artifact = (Artifact) j.next();
+
String key = artifact.getDependencyConflictId();
if ( !dependencies.containsKey( key ) )
@@ -182,55 +182,58 @@
throws MojoExecutionException, MojoFailureException
{
Map dependencies = new HashMap();
-
+
for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject reactorProject = (MavenProject) i.next();
Artifact artifact = reactorProject.getArtifact();
-
+
try
{
artifactResolver.resolve( artifact,
project.getRemoteArtifactRepositories(), localRepository );
}
- catch( ArtifactNotFoundException e )
+ catch ( ArtifactNotFoundException e )
{
//TODO: Is there a better way to get the artifact if it is not
yet installed in the repo?
//reactorProject.getArtifact().getFile() is returning null
//tried also the project.getArtifact().getFile() but returning
same result
- File fileArtifact = new File(
reactorProject.getBuild().getDirectory() + File.separator +
-
reactorProject.getBuild().getFinalName() + "." +
- reactorProject.getPackaging() );
-
+ File fileArtifact = new File(
reactorProject.getBuild().getDirectory() + File.separator +
+ reactorProject.getBuild().getFinalName() + "." +
reactorProject.getPackaging() );
+
getLog().info( "Artifact ( " + artifact.getFile().getName() +
" ) not found " +
- "in any repository, resolving thru modules..."
);
-
+ "in any repository, resolving thru modules..." );
+
artifact.setFile( fileArtifact );
-
- if( fileArtifact.exists() )
+
+ if ( fileArtifact.exists() )
{
- if( artifact.getType().equals( "pom" ) )
+ if ( artifact.getType().equals( "pom" ) )
+ {
continue;
-
+ }
+
addModuleArtifact( dependencies, artifact );
}
}
- catch( ArtifactResolutionException e )
+ catch ( ArtifactResolutionException e )
{
throw new MojoExecutionException( "Failed to resolve
artifact", e );
}
-
+
if ( artifact.getFile() != null )
{
- if( artifact.getType().equals( "pom" ) )
+ if ( artifact.getType().equals( "pom" ) )
+ {
continue;
-
+ }
+
addModuleArtifact( dependencies, artifact );
}
}
return new HashSet( dependencies.values() );
}
-
+
private void addModuleArtifact( Map dependencies, Artifact artifact )
{
String key = artifact.getDependencyConflictId();
@@ -240,7 +243,7 @@
dependencies.put( key, artifact );
}
}
-
+
protected abstract MavenProject getExecutedProject();
/**
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/ComponentsXmlArchiverFileFilter.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/ComponentsXmlArchiverFileFilter.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/ComponentsXmlArchiverFileFilter.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/ComponentsXmlArchiverFileFilter.java
Sun Mar 19 16:54:43 2006
@@ -16,21 +16,21 @@
* limitations under the License.
*/
+import org.codehaus.plexus.archiver.Archiver;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.Xpp3DomWriter;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
import java.io.File;
import java.io.FileReader;
-import java.io.IOException;
import java.io.FileWriter;
-import java.util.Map;
+import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.Map;
/**
* Components XML file filter.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryInlineMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryInlineMojo.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryInlineMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryInlineMojo.java
Sun Mar 19 16:54:43 2006
@@ -19,17 +19,14 @@
*/
-
/**
* Assemble an application bundle or distribution from an assembly descriptor
without
* launching a parallel lifecycle build.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Gilles Scokart</a>
- *
* @goal directory-inline
* @requiresDependencyResolution test
* @aggregator
- *
*/
public class DirectoryInlineMojo
extends AbstractDirectoryMojo
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
Sun Mar 19 16:54:43 2006
@@ -26,8 +26,8 @@
* @execute phase="package"
* @aggregator
*/
-public class DirectoryMojo
- extends AbstractDirectoryMojo
+public class DirectoryMojo
+ extends AbstractDirectoryMojo
{
/**
* Get the executed project from the forked lifecycle.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilter.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilter.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilter.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilter.java
Sun Mar 19 16:54:43 2006
@@ -42,14 +42,14 @@
compileScope = true;
runtimeScope = true;
testScope = true;
- }
- else if( DefaultArtifact.SCOPE_PROVIDED.equals( scope ) )
+ }
+ else if ( DefaultArtifact.SCOPE_PROVIDED.equals( scope ) )
{
systemScope = false;
providedScope = true;
compileScope = false;
runtimeScope = false;
- testScope = false;
+ testScope = false;
}
else
{
@@ -59,8 +59,8 @@
runtimeScope = false;
testScope = false;
}
- }
-
+ }
+
public boolean include( Artifact artifact )
{
if ( Artifact.SCOPE_COMPILE.equals( artifact.getScope() ) )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
Sun Mar 19 16:54:43 2006
@@ -1,14 +1,12 @@
package org.apache.maven.plugin.assembly.interpolation;
-import org.apache.maven.project.interpolation.ModelInterpolationException;
-
public class AssemblyInterpolationException
extends Exception
{
private String expression;
private String originalMessage;
-
+
public AssemblyInterpolationException( String message )
{
super( message );
@@ -18,7 +16,7 @@
{
super( message, cause );
}
-
+
public AssemblyInterpolationException( String expression, String message,
Throwable cause )
{
super( "The Assembly expression: " + expression + " could not be
evaluated. Reason: " + message, cause );
@@ -34,7 +32,7 @@
this.expression = expression;
this.originalMessage = message;
}
-
+
public String getExpression()
{
return expression;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java?rev=387092&r1=387091&r2=387092&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
Sun Mar 19 16:54:43 2006
@@ -4,8 +4,8 @@
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader;
import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Writer;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
@@ -23,9 +23,9 @@
extends AbstractLogEnabled
{
private static final Pattern EXPRESSION_PATTERN = Pattern.compile(
"\\$\\{(pom\\.|project\\.|env\\.)?([^}]+)\\}" );
-
+
private Properties envars;
-
+
public AssemblyInterpolator( Properties envars )
{
this.envars = envars;
@@ -36,31 +36,31 @@
{
envars = CommandLineUtils.getSystemEnvVars();
}
-
+
public Assembly interpolate( Assembly assembly, Model model, Map context )
throws AssemblyInterpolationException
{
return interpolate( assembly, model, context, true );
- }
-
+ }
+
public Assembly interpolate( Assembly assembly, Model model, Map context,
boolean strict )
throws AssemblyInterpolationException
{
StringWriter sWriter = new StringWriter();
-
+
AssemblyXpp3Writer writer = new AssemblyXpp3Writer();
-
+
try
{
writer.write( sWriter, assembly );
}
catch ( IOException e )
{
- throw new AssemblyInterpolationException ( "Cannot serialize
assembly descriptor for interpolation.", e );
+ throw new AssemblyInterpolationException( "Cannot serialize
assembly descriptor for interpolation.", e );
}
-
+
String serializedAssembly = sWriter.toString();
-
+
serializedAssembly = interpolateInternal( serializedAssembly,
assembly, model, context );
StringReader sReader = new StringReader( serializedAssembly );
@@ -80,9 +80,9 @@
throw new AssemblyInterpolationException(
"Cannot read assembly descriptor from interpolating filter of
serialized version.", e );
}
- return assembly;
+ return assembly;
}
-
+
private String interpolateInternal( String result, Assembly assembly,
Model model, Map context )
throws AssemblyInterpolationException
{
@@ -91,14 +91,14 @@
{
String wholeExpr = matcher.group( 0 );
String realExpr = parseExpression( wholeExpr );
-
+
Object value = context.get( realExpr );
if ( value == null )
{
value = model.getProperties().getProperty( realExpr );
}
-
+
if ( value == null )
{
try
@@ -110,22 +110,23 @@
Logger logger = getLogger();
if ( logger != null )
{
- logger.debug( "Assembly descriptor interpolation
cannot proceed with expression: " + wholeExpr + ". Skipping...", e );
+ logger.debug( "Assembly descriptor interpolation
cannot proceed with expression: " + wholeExpr +
+ ". Skipping...", e );
}
}
}
-
+
if ( value == null )
{
value = envars.getProperty( realExpr );
}
-
+
// if the expression refers to itself, skip it.
if ( wholeExpr.equals( value ) )
{
throw new AssemblyInterpolationException( wholeExpr,
assembly.getId() + " references itself." );
}
-
+
if ( value != null )
{
result = StringUtils.replace( result, wholeExpr,
String.valueOf( value ) );
@@ -137,14 +138,14 @@
}
return result;
}
-
+
private String parseExpression( String expression )
{
int startIndex = expression.indexOf( "{" );
int endIndex = expression.indexOf( "}" );
-
+
expression = expression.substring( startIndex + 1, endIndex );
-
+
return expression;
}
}
