Commit ccdd5965 authored by mindthegab's avatar mindthegab
Browse files

Closed issue #197 and initial support for issue #193. 

- Completed migration of the all in one to the new rad spring loaded +
tomcat7 based approach. Tested successfully hot reload of classpath and
webapp resources
- added share amp in the all in one
- added sample webscript (and webscript folder) across all amp project
so that on the fly adding of webscript works 
- -Prun profile now allows rapid development of the share amp and
alfresco amp running with MAVEN_OPTS="-Xms1024m -Xmx2048m
-XX:PermSize=1024m -javaagent:/path/to/springloaded-1.2.0.RELEASE.jar
-noverify" mvn clean install -Prun
- tested and added support for META-INF/resources loading (and hot
reloading using the tomcat7 jar scanner)
- discouraged war overlay by making repo and share pure aggregator
- renamed projects
- removed faces-config-custom.xml (no more explorer stuff)
- updated solr log4j configuration
- fully tested in Eclipse
parent 760d9702

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

+51 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    </requiredProperty>

  </requiredProperties>

  <modules>

    <module id="amp" dir="amp" name="amp">

    <module id="repo-amp" dir="repo-amp" name="repo-amp">

      <fileSets>

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

          <directory>src/main/java</directory>
@@ -31,6 +31,9 @@ 
            <include>**</include>

          </includes>

        </fileSet>

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

          <directory>src/main/amp/config/alfresco/extension/templates/webscripts</directory>

        </fileSet>

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

          <directory>src/test/resources</directory>

          <includes>
@@ -51,14 +54,49 @@ 
        </fileSet>

      </fileSets>

    </module>

    <module id="alfresco" dir="alfresco" name="alfresco">

    <module id="share-amp" dir="share-amp" name="share-amp">

      <fileSets>

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

          <directory>src/main/java</directory>

          <includes>

            <include>**/*.java</include>

          </includes>

        </fileSet>

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

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

          <directory>src/main/amp</directory>

          <includes>

            <include>**</include>

          </includes>

        </fileSet>

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

          <directory>src/test/resources</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/test/properties</directory>

          <includes>

            <include>**/*.properties</include>

          </includes>

        </fileSet>

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

          <directory>tomcat</directory>

          <includes>

            <include>**</include>

          </includes>

        </fileSet>

      </fileSets>

    </module>

    

    <module id="repo" dir="repo" name="repo">

      <fileSets>

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

          <directory>src/main/properties</directory>

          <includes>
@@ -73,6 +111,7 @@ 
        </fileSet>

      </fileSets>

    </module>

    

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

      <fileSets>

        <fileSet encoding="UTF-8">
@@ -96,14 +135,9 @@ 
        </fileSet>

      </fileSets>

    </module>

    

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

      <fileSets>

        <fileSet encoding="UTF-8">

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

          <includes>

            <include>**</include>

          </includes>

        </fileSet>

        <fileSet encoding="UTF-8">

          <directory>src/main/properties</directory>

          <includes>
@@ -119,6 +153,14 @@ 
      </fileSets>

    </module>

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

        <fileSets>

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

              <directory>tomcat</directory>

              <includes>

                <include>**</include>

              </includes>

            </fileSet>

        </fileSets>

    </module>

  </modules>

</archetype-descriptor>

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

+16 −0
Original line number Diff line number Diff line
@@ -72,4 +72,20 @@ 
            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>

        </repository>

    </repositories>



    <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE. 

         See 'run' profile in the sub modules pom.xml for further behavioral details.

     -->

    <profiles>

        <profile>

            <id>run</id>

            <properties>

                <!-- While running in rapid dev mode with -Prun, we don't want amp web resources 

                    to be added to the war, so we can load them directly from the AMP project (see 

                    runner/tomcat/context-*.xml for more details) -->

                <maven.alfresco.includeWebResources>false</maven.alfresco.includeWebResources>

            </properties>

        </profile>

    </profiles>

    

</project>

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

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

    <modelVersion>4.0.0</modelVersion>

    <artifactId>${artifactId}</artifactId>

    <name>Alfresco AMP Module</name>

    <name>Alfresco repository AMP Module</name>

    <packaging>amp</packaging>

    <description>This is a sample AMP project, depended upon by the alfresco WAR module</description>

    <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR module</description>



    <parent>

        <groupId>${groupId}</groupId>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.desc.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<webscript>

    <shortname>Javascript Sample Webscript</shortname>

    <description>Hands back a greeting</description>

    <url>/sample/helloworld</url>

    <authentication>user</authentication>

    <format default="html"></format>

</webscript>
 
 No newline at end of file

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.html.ftl

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Message: ${message}
 
 No newline at end of file