Commit 427944a0 authored by mindthegab's avatar mindthegab
Browse files

fixes issue #130, removed wcmqs, ran integration test and started jetty for... 

fixes issue #130, removed wcmqs, ran integration test and started jetty for all in one. also bumped default version to 4.2.e

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@705 04253f4f-3451-0410-a141-5562f1e59037
parent 3f2b3e8d

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

+1 −23
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
      <defaultValue>org.alfresco</defaultValue>

    </requiredProperty>

    <requiredProperty key="alfresco_target_version">

      <defaultValue>4.2.c</defaultValue>

      <defaultValue>4.2.e</defaultValue>

    </requiredProperty>

    <requiredProperty key="package">

      <defaultValue>(not used)</defaultValue>
@@ -118,28 +118,6 @@ 
        </fileSet>

      </fileSets>

    </module>

    <module id="wcmqs" dir="wcmqs" name="share" filtered="false">

      <fileSets>

        <fileSet encoding="UTF-8">

          <directory>src/main/webapp</directory>

          <includes>

            <include>**</include>

          </includes>

        </fileSet>

        <fileSet encoding="UTF-8" filtered="false">

          <directory>src/main/resources</directory>

          <includes>

            <include>**</include>

          </includes>

        </fileSet>

        <fileSet encoding="UTF-8" filtered="false">

          <directory>src/main/webapp</directory>

          <includes>

            <include>**</include>

          </includes>

        </fileSet>

      </fileSets>

    </module>

    <module id="runner" dir="runner" name="runner" filtered="false">

      <fileSets>

        <fileSet encoding="UTF-8">

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

+4 −4
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ 
            <artifactId>alfresco</artifactId>

            <type>war</type>

        </dependency>

        <!-- Demonstrating the dependency on the AMP developed in the 'amp' project -->

        <!-- Demonstrating the dependency on the repo AMP developed in the 'amp' module -->

        <dependency>

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

            <artifactId>amp</artifactId>

            <version>${project.version}</version>

            <type>amp</type>

        </dependency>

        <!-- Demonstrating the usage of a well known GA AMP (Web Quick Start Repository component) -->

        <!-- Demonstrating the usage of a well known GA AMP (SharePoint Protocol Support) -->

        <dependency>

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

            <artifactId>alfresco-wcm-quickstart-repo</artifactId>

            <artifactId>alfresco-spp</artifactId>

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

            <type>amp</type>

        </dependency>
@@ -76,7 +76,7 @@ 
                        </overlay>

                        <overlay>

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

                            <artifactId>alfresco-wcm-quickstart-repo</artifactId>

                            <artifactId>alfresco-spp</artifactId>

                            <type>amp</type>

                        </overlay>

                    </overlays>

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

+2 −4
Original line number Diff line number Diff line
@@ -13,10 +13,8 @@ 
    </parent>



    <!--

    Following dependencies are needed for compiling

    Java code in src/main/java; <scope>provided</scope>

    is inherited for each of the following; for more

    info, please refer to alfresco-integration-parent

    Following dependencies are needed for compiling Java code in src/main/java; <scope>provided</scope>

    is inherited for each of the following; for more info, please refer to alfresco-integration-parent

    POM definition

    @TODO - document

    -->

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

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
                                    <war>${project.basedir}/../share/target/share.war</war>

                                    <contextPath>/share</contextPath>

                                </contextHandler>

                                <contextHandler implementation="org.mortbay.jetty.webapp.WebAppContext">

                                    <war>${project.basedir}/../wcmqs/target/wcmqs.war</war>

                                    <contextPath>/wcmqs</contextPath>

                                </contextHandler>

                            </contextHandlers>

                            <systemProperties>

                                <systemProperty>

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

+3 −14
Original line number Diff line number Diff line
@@ -19,14 +19,8 @@ 
            <artifactId>share</artifactId>

            <type>war</type>

        </dependency>

        <!-- Demonstrating the usage of a well known GA AMP (Web Quick Start 

            Share component) -->

        <dependency>

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

            <artifactId>alfresco-wcm-quickstart-share</artifactId>

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

            <type>amp</type>

        </dependency>

        <!-- Here you can add your Share AMP dependencies -->

       

    </dependencies>

    <build>

        <plugins>
@@ -50,12 +44,7 @@ 
                            <!-- To allow inclusion of META-INF -->

                            <excludes/>

                        </overlay>

                        <!-- Add / order your AMPs here -->

                        <overlay>

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

                            <artifactId>alfresco-wcm-quickstart-share</artifactId>

                            <type>amp</type>

                        </overlay>

                        <!-- Add / order here the Share AMPs declared above -->

                    </overlays>

                </configuration>

            </plugin>