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

-- fixing issue #19

Browse Source 
-- applied patch provided at http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=19#c3 
 -- now src/main/resources/META-INF is only added to the JAR and not to the /config 
 -- only (non problematic) side effect is that a META-INF (maven default manifest.mf is generated at the root of the amp, but not in /config so does not get applied)

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@390 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
mindthegab 2012-04-06 17:54:42 +00:00
parent d6e8c57e45
commit 691a98030d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
public abstract class AbstractAmpMojo extends AbstractMojo
public abstract class AbstractAmpMojo extends AbstractMojo
{
/**
@ -392,12 +392,12 @@ public abstract class AbstractAmpMojo extends AbstractMojo
*
* @parameter alias="includes"
*/
private String mAmpJarIncludes = "**";
private String mAmpJarIncludes = "**/*.class,META-INF/**";
/**
* The comma separated list of tokens to exclude from the AMP created JAR file. By default module configuration is left outside jars.
* The comma separated list of tokens to exclude from the AMP created JAR file
*
* @parameter alias="excludes" default-value="alfresco/module/**"
* @parameter alias="excludes" default-value=""
*/
private String mAmpJarExcludes;

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

@ -277,7 +277,7 @@ public class AmpMojo extends AbstractAmpMojo
vArchiver.setOutputFile(pAmpFile);
/* setup amp Archiver */
this.getAmpArchiver().addDirectory(this.getAmpDirectory(), this.getIncludes(), this.getExcludes());
this.getAmpArchiver().addDirectory(this.getAmpDirectory(), null, null);
// create archive
vArchiver.createArchive(this.getProject(), archive );

2
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AmpProjectPackagingTask.java
View File

@ -213,7 +213,7 @@ public class AmpProjectPackagingTask
{
final PathSet sources = getFilesToIncludes( context.getAmpConfigDirectory(),
new String[0],
new String[] {"**/*.class"} );
new String[] {"**/*.class","META-INF/**"} );
try
{