mirror of
https://github.com/Alfresco/alfresco-sdk.git
synced 2025-10-08 14:51:55 +00:00
Merge pull request #524 from Alfresco/bug/425
BUGFIX - 425 - Maven Plugin - Support for platform context file
This commit is contained in:
@@ -394,6 +394,12 @@ public abstract class AbstractRunMojo extends AbstractMojo {
|
|||||||
@Parameter(property = "maven.alfresco.tomcat.version")
|
@Parameter(property = "maven.alfresco.tomcat.version")
|
||||||
protected String tomcatVersion;
|
protected String tomcatVersion;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Location of a custom context file to use in the deployment of the platform war in Tomcat.
|
||||||
|
*/
|
||||||
|
@Parameter(property = "maven.alfresco.platform.custom.context.file")
|
||||||
|
protected String platformCustomContextFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maven GAV properties for customized alfresco.war, share.war, activiti-app.war
|
* Maven GAV properties for customized alfresco.war, share.war, activiti-app.war
|
||||||
* Used by the Maven Tomcat 7 Plugin
|
* Used by the Maven Tomcat 7 Plugin
|
||||||
@@ -1389,9 +1395,10 @@ public abstract class AbstractRunMojo extends AbstractMojo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (enablePlatform) {
|
if (enablePlatform) {
|
||||||
|
String platformContextFile = StringUtils.isNotBlank(platformCustomContextFile) ? platformCustomContextFile : null;
|
||||||
webapps2Deploy.add(createWebAppElement(
|
webapps2Deploy.add(createWebAppElement(
|
||||||
runnerAlfrescoGroupId, runnerAlfrescoPlatformWarArtifactId, runnerAlfrescoPlatformVersion,
|
runnerAlfrescoGroupId, runnerAlfrescoPlatformWarArtifactId, runnerAlfrescoPlatformVersion,
|
||||||
"/alfresco", null));
|
"/alfresco", platformContextFile));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enableShare) {
|
if (enableShare) {
|
||||||
@@ -1411,7 +1418,6 @@ public abstract class AbstractRunMojo extends AbstractMojo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (enableActivitiApp) {
|
if (enableActivitiApp) {
|
||||||
|
|
||||||
webapps2Deploy.add(createWebAppElement(
|
webapps2Deploy.add(createWebAppElement(
|
||||||
runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion,
|
runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion,
|
||||||
"/activiti-app", null));
|
"/activiti-app", null));
|
||||||
|
Reference in New Issue
Block a user