inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-08-07 17:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few issues in refresh-share goal (defaults) and read port from maven.tomcat.port.

Browse Source 
Fix XML issue in AIO PO testing suite to keep Eclipse happy
This commit is contained in:
Ole Hejlskov
2015-05-08 16:27:20 +02:00
parent c541f66845
commit 56f8336af3
3 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml
View File

@@ -3,7 +3,7 @@
#set($symbol_escape='\' ) #set($symbol_escape='\' )
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <!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"> <test name="DemoPageTest">
<classes> <classes>
<class name="${package}.demoamp.DemoPageTestIT"/> <class name="${package}.demoamp.DemoPageTestIT"/>

4
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
View File

@@ -61,13 +61,13 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
/** /**
* The hostname for where the Alfresco Tomcat server is running. * 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; private String _host = DEFAULT_HOST;
/** /**
* The port number for where the Alfresco Tomcat server is running. * 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; private String _port = DEFAULT_PORT;
/** /**

58
poms/alfresco-sdk-parent/pom.xml
View File

@@ -228,7 +228,7 @@
<configuration> <configuration>
<snapshotToTimestamp>true</snapshotToTimestamp> <snapshotToTimestamp>true</snapshotToTimestamp>
<refreshHost>localhost</refreshHost> <refreshHost>localhost</refreshHost>
<refreshPort>8080</refreshPort> <refreshPort>${maven.tomcat.port}</refreshPort>
<refreshRepoUrl>/alfresco/service/index</refreshRepoUrl> <refreshRepoUrl>/alfresco/service/index</refreshRepoUrl>
<refreshShareUrl>/share/page/index</refreshShareUrl> <refreshShareUrl>/share/page/index</refreshShareUrl>
<clearCacheShareUrl>/share/page/caches/dependency/clear</clearCacheShareUrl> <clearCacheShareUrl>/share/page/caches/dependency/clear</clearCacheShareUrl>
@@ -380,6 +380,8 @@
<versionRange>[0.0,)</versionRange> <versionRange>[0.0,)</versionRange>
<goals> <goals>
<goal>set-version</goal> <goal>set-version</goal>
<goal>refresh-share</goal>
<goal>refresh-repo</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
@@ -878,6 +880,60 @@
</profile> </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 ONE OFF/SETUP operations
==================================================================================================== --> ==================================================================================================== -->