inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-10-01 14:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

POM cleanup, updated to latest available artifacts versions, removed obsolete stuff, life, universe and everything. Changed an exact multiple of 42 characters.

Browse Source 
git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@332 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
skuro
2011-08-05 07:42:29 +00:00
parent ea49f96271
commit 9e30f49e8d
16 changed files with 176 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
View File

@@ -282,7 +282,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo
/**
* The Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib.
*
* @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
* @component role="${component.org.codehaus.plexus.archiver.Archiver#jar}"
* @required
*/
private JarArchiver mJarArchiver;
@@ -374,7 +374,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo
/**
* To look up Archiver/UnArchiver implementations
*
* @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
* @component role="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
* @required
*/
protected ArchiverManager mArchiverManager;

11
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
View File

@@ -28,7 +28,6 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.codehaus.plexus.archiver.zip.ZipArchiver;
import java.io.File;
import java.io.IOException;
@@ -229,8 +228,8 @@ public class AmpMojo extends AbstractAmpMojo
* composes the full file name for the AMP and gets a file handle for that file
* TODO: what happens when nulls are passed in
* TODO: what does a null response mean?
* @param pBaseDir Base directory for AMP
* @param pFileName Final Name of AMP
* @param pBasedir Base directory for AMP
* @param pFinalName Final Name of AMP
* @param pClassifier TODO: fill this in
*/
protected static File getAmpFile( File pBasedir, String pFinalName, String pClassifier )
@@ -263,8 +262,8 @@ public class AmpMojo extends AbstractAmpMojo
protected void performPackaging(File pAmpFile)
throws IOException,
ArchiverException,
ManifestException,
DependencyResolutionRequiredException,
ManifestException,
DependencyResolutionRequiredException,
MojoExecutionException, MojoFailureException
{
getLog().info( "Packaging Alfresco AMP (" + this.getAmpName() + ")" );
@@ -334,7 +333,7 @@ public class AmpMojo extends AbstractAmpMojo
/**
* The AMP archiver.
* @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#amp}"
* @component role="${component.org.codehaus.plexus.archiver.Archiver}" roleHint="amp"
* @required
*/
private AmpArchiver mAmpArchiver;

5
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AbstractAmpPackagingTask.java
View File

@@ -263,11 +263,6 @@ public abstract class AbstractAmpPackagingTask
unArchiver.setOverwrite( true );
unArchiver.extract();
}
catch ( IOException e )
{
throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" +
unpackDirectory.getAbsolutePath() + "]", e );
}
catch ( ArchiverException e )
{
throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" +

24
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/util/MappingUtils.java
View File

@@ -20,10 +20,12 @@ package org.alfresco.maven.plugin.amp.util;
*/
import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.util.interpolation.ValueSource;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
import org.codehaus.plexus.interpolation.ValueSource;
import java.util.List;
import java.util.Properties;
/**
@@ -68,7 +70,11 @@ public class MappingUtils
interpolator.addValueSource( new PropertiesInterpolationValueSource( classifierMask ) );
value = interpolator.interpolate( value, "__artifact" );
try {
value = interpolator.interpolate( value, "__artifact" );
} catch (InterpolationException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
return value;
}
@@ -90,6 +96,16 @@ public class MappingUtils
return properties.getProperty( key );
}
@Override
public List getFeedback() {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@Override
public void clearFeedback() {
//To change body of implemented methods use File | Settings | File Templates.
}
}
}

2
plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java
View File

@@ -61,7 +61,7 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
@Override
protected void execute()
throws ArchiverException, IOException
throws ArchiverException
{
getLogger().info( "Expanding: " + getSourceFile() + " into " + getDestDirectory() );