inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-26 17:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed check for descriptor and manifest on WAR files only, not exploded dirs.

Browse Source 
Fixes issue 107

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@662 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
rgauss 2013-01-24 02:04:03 +00:00
parent 2ef8794fa1
commit ed0bde637b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,11 +109,11 @@ public class InstallMojo extends AbstractMojo {
}
File descriptor = new File(warLocation.getPath() + File.separator + WEBAPP_DESCRIPTOR_PATH);
if(!descriptor.exists())
if(warLocation.isDirectory() && !descriptor.exists())
throw new MojoExecutionException("No webapp found in " + descriptor.getAbsolutePath() + ". AMP installation cannot proceed. Are you binding amp:install to the right phase?");
File manifest = new File(warLocation.getPath() + File.separator + WEBAPP_MANIFEST_PATH);
if(!manifest.exists())
if(warLocation.isDirectory() && !manifest.exists())
throw new MojoExecutionException("No MANIFEST.MF found in " + manifest.getAbsolutePath() + ". AMP installation cannot proceed. Are you binding amp:install to the right phase?");
}
}