Commit 691a9803 authored by mindthegab's avatar mindthegab
Browse files

-- fixing issue #19 

-- 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
parent d6e8c57e

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

+4 −4
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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 );

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

+1 −1
Original line number Diff line number Diff line
@@ -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

                {