Commit 278ba7f6 authored by Ole Hejlskov's avatar Ole Hejlskov
Browse files

Comment out AMP assembly by default

parent fef948b9

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

+11 −2
Original line number Diff line number Diff line
@@ -164,7 +164,14 @@ 
    <build>

        <pluginManagement>

            <plugins>

                <!-- Build an AMP if 3rd party libs are needed by the extensions -->

                <!--

                    Build an AMP if 3rd party libs are needed by the extensions

                    JARs are the default artifact produced in your modules, if you want to build an amp for each module

                    you have to enable this plugin and inspect the src/main/assembly.xml file if you want to customize

                    the layout of your AMP. The end result is that Maven will produce both a JAR file and an AMP with your

                    module.

                -->

                <!--

                <plugin>

                    <groupId>org.apache.maven.plugins</groupId>

                    <artifactId>maven-assembly-plugin</artifactId>
@@ -190,6 +197,7 @@ 
                        </dependency>

                    </dependencies>

                </plugin>

                -->



                <!-- Filter resources in any sub-project with this config -->

                <plugin>
@@ -295,6 +303,7 @@ 
                        (i.e. alfresco.war)

                    -->

                    <platformModules>

                        <!-- Share Services will be ignored if you are on Platform earlier than 5.1 -->

                        <moduleDependency>

                            <groupId>${alfresco.groupId}</groupId>

                            <artifactId>alfresco-share-services</artifactId>

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml

+11 −1
Original line number Diff line number Diff line
@@ -109,12 +109,14 @@ 
                       -->

                    <platformModules>

                        <!-- This AMP is needed if we are going to access the platform webapp from a Share webapp -->

                        <!-- Share Services will be ignored if you are on Platform earlier than 5.1 -->

                        <moduleDependency>

                            <groupId>${alfresco.groupId}</groupId>

                            <artifactId>alfresco-share-services</artifactId>

                            <version>${alfresco.share.version}</version>

                            <type>amp</type>

                        </moduleDependency>

                        

                        <!-- Bring in this JAR project, need to be included here, otherwise resources from META-INF

                             will not be loaded, such as the test.html page

                        -->
@@ -127,7 +129,14 @@ 
                </configuration>

            </plugin>



            <!-- Build an AMP if 3rd party libs are needed by the extension -->

            <!--

                Build an AMP if 3rd party libs are needed by the extensions

                JARs are the default artifact produced in your modules, if you want to build an amp for each module

                you have to enable this plugin and inspect the src/main/assembly.xml file if you want to customize

                the layout of your AMP. The end result is that Maven will produce both a JAR file and an AMP with your

                module.

            -->

            <!--

            <plugin>

                <artifactId>maven-assembly-plugin</artifactId>

                <version>2.6</version>
@@ -152,6 +161,7 @@ 
                    </dependency>

                </dependencies>

            </plugin>

            -->



            <!-- Hot reloading with JRebel -->

            <plugin>