From 56f8336af3fa708ddbbd70571c17af51f7cc2292 Mon Sep 17 00:00:00 2001
From: Ole Hejlskov <ole@phpfreak.dk>
Date: Fri, 8 May 2015 16:27:20 +0200
Subject: [PATCH] Fix a few issues in refresh-share goal (defaults) and read
 port from maven.tomcat.port. Fix XML issue in AIO PO testing suite to keep
 Eclipse happy

---
 .../share-amp/src/test/resources/testng.xml   |  2 +-
 .../plugin/AbstractRefreshWebappMojo.java     |  4 +-
 poms/alfresco-sdk-parent/pom.xml              | 58 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml
index 44efc851..0fddc839 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml
@@ -3,7 +3,7 @@
 #set($symbol_escape='\' )
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Custom Share AMP Page Object Tests" parallel="none">
+<suite name="Custom Share AMP Page Object Tests" parallel="false">
     <test name="DemoPageTest">
         <classes>
             <class name="${package}.demoamp.DemoPageTestIT"/>
diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
index d999191c..6632d167 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
@@ -61,13 +61,13 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
     /**
      * The hostname for where the Alfresco Tomcat server is running.
      */
-    @Parameter(property = "refreshHost", defaultValue = DEFAULT_USERNAME, alias = "refreshHost")
+    @Parameter(property = "refreshHost", defaultValue = DEFAULT_HOST, alias = "refreshHost")
     private String _host = DEFAULT_HOST;
 
     /**
      * The port number for where the Alfresco Tomcat server is running.
      */
-    @Parameter(property = "refreshPort", defaultValue = DEFAULT_USERNAME, alias = "refreshPort")
+    @Parameter(property = "refreshPort", defaultValue = DEFAULT_PORT, alias = "refreshPort")
     private String _port = DEFAULT_PORT;
 
     /**
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 0552851a..7e0a8038 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -228,7 +228,7 @@
                     <configuration>
                         <snapshotToTimestamp>true</snapshotToTimestamp>
                         <refreshHost>localhost</refreshHost>
-                        <refreshPort>8080</refreshPort>
+                        <refreshPort>${maven.tomcat.port}</refreshPort>
                         <refreshRepoUrl>/alfresco/service/index</refreshRepoUrl>
                         <refreshShareUrl>/share/page/index</refreshShareUrl>
                         <clearCacheShareUrl>/share/page/caches/dependency/clear</clearCacheShareUrl>
@@ -380,6 +380,8 @@
                                         <versionRange>[0.0,)</versionRange>
                                         <goals>
                                             <goal>set-version</goal>
+                                            <goal>refresh-share</goal>
+                                            <goal>refresh-repo</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
@@ -878,6 +880,60 @@
         </profile>
 
 
+        <profile>
+            <id>refresh-repo</id>
+            <activation>
+                <file>
+                    <exists>src/main/amp/module.properties</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>refresh-repo</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>refresh-repo</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
+        <profile>
+            <id>refresh-share</id>
+            <activation>
+                <file>
+                    <exists>src/main/amp/module.properties</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>refresh-share</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>refresh-share</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
         <!-- ====================================================================================================
               ONE OFF/SETUP operations
              ==================================================================================================== -->