Commit 5d59d6cd authored by Martin Bergljung's avatar Martin Bergljung
Browse files

Added back Spring Loaded when running Share AMP

parent 6d4b9011

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml

+7 −8
Original line number Diff line number Diff line
@@ -2,16 +2,15 @@ 
<!-- ===================================================================================================================

    This context file is used only in a development IDE for rapid development,

    it is never released with the Alfresco.war



    IMPORTANT: If an AMP or JAR extension is added to the Alfresco WAR,

              then you need to add the paths below for this new extension.

    =================================================================================================================-->



<!-- Pick up static resource files from ../repo/target/repo.

     The Alfresco.war 5.0 does not have a webapp (it used to have Alfresco Explorer but not anymore)

     that we will access, so this docBase might not be needed -->

<Context docBase="${project.parent.basedir}/alfresco-war/target/${project.build.finalName}">

    <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) -->

<!-- Setup a virtual context for the /alfresco webapp.

     The run profile uses the tomcat7-maven-plugin to kick off the webapp and it is configured with the

     webapp resources and path (i.e. /alfresco).



     Note. Alfresco.war 5.0 does not have a webapp, just an index page, the Alfresco Explorer webapp is no longer available.

-->

<Context>

    <Resources className="org.apache.naming.resources.VirtualDirContext"

               extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-repo-amp/target/amp/web" />

    <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Repo AMP,

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml

+4 −5
Original line number Diff line number Diff line
@@ -2,13 +2,12 @@ 
<!-- ===================================================================================================================

    This context file is used only in a development IDE for rapid development,

    it is never released with the Share.war



    IMPORTANT: If an AMP or JAR extension is added to the Share WAR,

               then you need to add the paths below for this new extension.

    =================================================================================================================-->



<!-- Setup a virtual context for the /share webapp.

     The run profile uses the tomcat7-maven-plugin to kick off the webapp and it is configured with the

     webapp resources and path (i.e. /share). -->

<Context>

    <!-- Pick up static resource files from any Share extensions, being it a JAR or an AMP

         (this should not include docBase) -->

    <Resources className="org.apache.naming.resources.VirtualDirContext"

               extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/amp/web" />

    <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Share AMP,

archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat

+2 −3
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ if not exist %springloadedfile% ( 
  mvn validate -Psetup

)



:: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart

:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify

set MAVEN_OPTS=-noverify

:: Spring loaded can be used with the Share AMP project

set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify



mvn integration-test -Pamp-to-war -nsu

archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh

+2 −3
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ if [ ! -f $springloadedfile ]; then 
mvn validate -Psetup

fi



# Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart

# MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war

MAVEN_OPTS="-noverify" mvn integration-test -Pamp-to-war
 
# Spring loaded can be used with the Share AMP project

MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war