Author: brett
Date: Fri May 5 01:11:03 2006
New Revision: 400009
URL: http://svn.apache.org/viewcvs?rev=400009&view=rev
Log:
reformat and apply license
Modified:
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/AssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.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/UnpackMojo.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
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/ReflectionProperties.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/DefaultRepositoryAssembler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssembler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssemblyException.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java
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=400009&r1=400008&r2=400009&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
Fri May 5 01:11:03 2006
@@ -1,11 +1,27 @@
package org.apache.maven.plugin.assembly;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import
org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolationException;
import org.apache.maven.plugin.assembly.repository.RepositoryAssemblyException;
import org.apache.maven.plugins.assembly.model.Assembly;
-import org.apache.maven.artifact.InvalidRepositoryException;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
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=400009&r1=400008&r2=400009&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
Fri May 5 01:11:03 2006
@@ -1,7 +1,7 @@
package org.apache.maven.plugin.assembly;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
Fri May 5 01:11:03 2006
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.assembly;
-import org.apache.maven.project.MavenProject;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.project.MavenProject;
/**
* Assemble an application bundle or distribution from an assembly descriptor.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
Fri May 5 01:11:03 2006
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.assembly;
-import org.apache.maven.project.MavenProject;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.project.MavenProject;
/**
* Assemble an application bundle or distribution from an assembly descriptor.
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=400009&r1=400008&r2=400009&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
Fri May 5 01:11:03 2006
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.assembly;
-import org.apache.maven.project.MavenProject;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -18,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.project.MavenProject;
/**
* Assemble an application bundle or distribution from an assembly descriptor
without
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=400009&r1=400008&r2=400009&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
Fri May 5 01:11:03 2006
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.assembly;
-import org.apache.maven.project.MavenProject;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.project.MavenProject;
/**
* Assemble an application bundle or distribution.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
Fri May 5 01:11:03 2006
@@ -1,7 +1,7 @@
package org.apache.maven.plugin.assembly;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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=400009&r1=400008&r2=400009&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
Fri May 5 01:11:03 2006
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.assembly.interpolation;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
public class AssemblyInterpolationException
extends Exception
{
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=400009&r1=400008&r2=400009&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
Fri May 5 01:11:03 2006
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.assembly.interpolation;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.maven.model.Model;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader;
@@ -27,22 +43,23 @@
extends AbstractLogEnabled
{
private static final Pattern ELEMENT_PATTERN = Pattern.compile( "\\<([^>
]+)[^>]*>([^<]+)" );
+
private static final Pattern EXPRESSION_PATTERN = Pattern.compile(
"\\$\\{(pom\\.|project\\.|env\\.)?([^}]+)\\}" );
-
+
private static final Map INTERPOLATION_BLACKLIST;
-
+
static
{
Map blacklist = new HashMap();
-
+
List ofnmBlacklistings = new ArrayList();
-
+
ofnmBlacklistings.add( "groupId" );
ofnmBlacklistings.add( "artifactId" );
ofnmBlacklistings.add( "version" );
-
+
blacklist.put( "outputFileNameMapping", ofnmBlacklistings );
-
+
INTERPOLATION_BLACKLIST = blacklist;
}
@@ -102,7 +119,7 @@
throw new AssemblyInterpolationException(
"Cannot read assembly descriptor from interpolating filter of
serialized version.", e );
}
-
+
return assembly;
}
@@ -110,16 +127,16 @@
throws AssemblyInterpolationException
{
String result = src;
-
+
Matcher elementMatcher = ELEMENT_PATTERN.matcher( result );
-
- while( elementMatcher.find() )
+
+ while ( elementMatcher.find() )
{
String element = elementMatcher.group( 0 );
-
+
String elementName = elementMatcher.group( 1 );
String value = elementMatcher.group( 2 );
-
+
// only attempt to interpolate if the following is met:
// 1. the element is not in the interpolation blacklist.
// 2. the value is not empty (otherwise there's nothing to
interpolate)
@@ -131,28 +148,30 @@
{
blacklistedExpressions = Collections.EMPTY_LIST;
}
-
- String interpolatedValue = interpolateElementValue( value,
assembly, model, context, blacklistedExpressions );
-
+
+ String interpolatedValue =
+ interpolateElementValue( value, assembly, model, context,
blacklistedExpressions );
+
String modifiedElement = StringUtils.replace( element, value,
interpolatedValue );
result = StringUtils.replace( result, element, modifiedElement
);
}
}
-
+
return result;
}
-
- private String interpolateElementValue( String src, Assembly assembly,
Model model, Map context, List blacklistedExpressions )
+
+ private String interpolateElementValue( String src, Assembly assembly,
Model model, Map context,
+ List blacklistedExpressions )
throws AssemblyInterpolationException
{
String result = src;
-
+
Matcher matcher = EXPRESSION_PATTERN.matcher( result );
while ( matcher.find() )
{
String wholeExpr = matcher.group( 0 );
String realExpr = matcher.group( 2 );
-
+
if ( blacklistedExpressions.contains( realExpr ) )
{
continue;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/ReflectionProperties.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/ReflectionProperties.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/ReflectionProperties.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/ReflectionProperties.java
Fri May 5 01:11:03 2006
@@ -34,21 +34,21 @@
boolean escapedBackslashesInFilePath;
- public ReflectionProperties( MavenProject aProject, boolean
escapedBackslashesInFilePath )
+ public ReflectionProperties( MavenProject aProject, boolean
escapedBackslashesInFilePath )
{
- super();
+ super();
- project = aProject;
+ project = aProject;
- this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
+ this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
}
-
+
public Object get( Object key )
{
Object value = null;
- try
+ try
{
- value = ReflectionValueExtractor.evaluate( "" + key , project );
+ value = ReflectionValueExtractor.evaluate( "" + key, project );
if ( escapedBackslashesInFilePath && value != null &&
"java.lang.String".equals( value.getClass().getName() ) )
@@ -58,15 +58,15 @@
// Check if it's a windows path
if ( val.indexOf( ":\\" ) == 1 )
{
- value = StringUtils.replace( (String)value, "\\", "\\\\" );
- value = StringUtils.replace( (String)value, ":", "\\:" );
+ value = StringUtils.replace( (String) value, "\\", "\\\\"
);
+ value = StringUtils.replace( (String) value, ":", "\\:" );
}
}
}
- catch ( Exception e )
+ catch ( Exception e )
{
//TODO: remove the try-catch block when
ReflectionValueExtractor.evaluate() throws no more exceptions
- }
+ }
return value;
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/DefaultRepositoryAssembler.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/DefaultRepositoryAssembler.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/DefaultRepositoryAssembler.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/DefaultRepositoryAssembler.java
Fri May 5 01:11:03 2006
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.assembly.repository;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -16,11 +32,11 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.plugins.assembly.model.Repository;
import org.apache.maven.plugins.assembly.model.GroupVersionAlignment;
+import org.apache.maven.plugins.assembly.model.Repository;
+import org.apache.maven.project.DefaultMavenProjectBuilder;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.DefaultMavenProjectBuilder;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
@@ -28,17 +44,17 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
+import java.lang.reflect.Field;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.TimeZone;
import java.util.Set;
-import java.util.HashSet;
-import java.lang.reflect.Field;
+import java.util.TimeZone;
/**
* @author Jason van Zyl
@@ -69,9 +85,7 @@
private Set groupVersionAlignmentExcludes;
- public void assemble( File repositoryDirectory,
- Repository repository,
- MavenProject project )
+ public void assemble( File repositoryDirectory, Repository repository,
MavenProject project )
throws RepositoryAssemblyException
{
createGroupVersionAlignments( repository.getGroupVersionAlignments() );
@@ -224,11 +238,8 @@
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN
);
}
- public ArtifactRepository createRepository( String repositoryId,
- String repositoryUrl,
- boolean offline,
- boolean updateSnapshots,
- String globalChecksumPolicy )
+ public ArtifactRepository createRepository( String repositoryId, String
repositoryUrl, boolean offline,
+ boolean updateSnapshots,
String globalChecksumPolicy )
{
ArtifactRepository localRepository =
new DefaultArtifactRepository( repositoryId, repositoryUrl,
repositoryLayout );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssembler.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssembler.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssembler.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssembler.java
Fri May 5 01:11:03 2006
@@ -1,10 +1,25 @@
package org.apache.maven.plugin.assembly.repository;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.maven.plugins.assembly.model.Repository;
import org.apache.maven.project.MavenProject;
import java.io.File;
-import java.util.List;
/**
* @author Jason van Zyl
@@ -13,6 +28,6 @@
{
String ROLE = RepositoryAssembler.class.getName();
- public void assemble( File repositoryDirectory, Repository repository,
MavenProject project )
+ public void assemble( File repositoryDirectory, Repository repository,
MavenProject project )
throws RepositoryAssemblyException;
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssemblyException.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssemblyException.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssemblyException.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/RepositoryAssemblyException.java
Fri May 5 01:11:03 2006
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.assembly.repository;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
/**
* @author Jason van Zyl
*/
@@ -11,8 +27,7 @@
super( string );
}
- public RepositoryAssemblyException( String string,
- Throwable throwable )
+ public RepositoryAssemblyException( String string, Throwable throwable )
{
super( string, throwable );
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java?rev=400009&r1=400008&r2=400009&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java
Fri May 5 01:11:03 2006
@@ -40,8 +40,8 @@
/**
* Reads a property file, resolving all internal variables.
*
- * @param propfile The property file to load
- * @param fail wheter to throw an exception when the file cannot be loaded
or to return null
+ * @param propfile The property file to load
+ * @param fail wheter to throw an exception when the file cannot
be loaded or to return null
* @param useSystemProps wheter to incorporate System.getProperties
settings into the returned Properties object.
* @return the loaded and fully resolved Properties object
*/
@@ -85,7 +85,7 @@
/**
* Retrieves a property value, replacing values like ${token}
* using the Properties to look them up.
- *
+ * <p/>
* It will leave unresolved properties alone, trying for System
* properties, and implements reparsing (in the case that
* the value of a property contains a key), and will
