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

Removed context files for Share and Platform webapps, no longer needed, handled by jrebel

Browse Source
This commit is contained in:
Martin Bergljung
2016-06-27 15:47:16 +01:00
parent e9fa82da5c
commit a05d69eac2
1 changed files with 19 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
View File

@@ -193,61 +193,7 @@ public class RunMojo extends AbstractMojo {
private ExecutionEnvironment execEnv; private ExecutionEnvironment execEnv;
/**
* Have to have this setter as it does not seem to work to assign a default value to a property
* where the value comes from a property that is not used (i.e. alfrescoRepoWarArtifactId)
*
* @param artifactId
public void setRunnerAlfrescoRepoArtifactId(String artifactId) {
getLog().info("setRunnerAlfrescoRepoArtifactId [artifactId=" + artifactId +
"][alfrescoRepoArtifactId=" + this.alfrescoRepoArtifactId + "]");
if (StringUtils.isBlank(artifactId)) {
if (StringUtils.isNotBlank(this.alfrescoRepoArtifactId)) {
this.runnerAlfrescoRepoArtifactId = this.alfrescoRepoArtifactId;
} else {
getLog().error("Alfresco Repository WAR Maven Artifact ID is not set via either " +
"runner.alfresco.platform.war.artifactId or alfresco.platform.war.artifactId");
}
} else {
this.runnerAlfrescoRepoArtifactId = artifactId;
}
}
*/
/**
* Have to have this setter as it does not seem to work to assign a default value to a property
* where the value comes from a property that is not used (i.e. alfrescoShareWarArtifactId)
*
* @param artifactId
public void setRunnerAlfrescoShareArtifactId(String artifactId) {
getLog().info("setRunnerAlfrescoShareArtifactId [artifactId=" + artifactId +
"][alfrescoShareWarArtifactId=" + this.alfrescoShareWarArtifactId + "]");
if (StringUtils.isBlank(artifactId)) {
if (StringUtils.isNotBlank(this.alfrescoShareWarArtifactId)) {
this.runnerAlfrescoShareWarArtifactId = this.alfrescoShareWarArtifactId;
} else {
getLog().error("Alfresco Share WAR Maven Artifact ID is not set via either " +
"runner.alfresco.share.artifactId or alfresco.share.artifactId");
}
} else {
this.runnerAlfrescoShareWarArtifactId = artifactId;
}
}
*/
public void execute() throws MojoExecutionException { public void execute() throws MojoExecutionException {
// The runner repo artifact ID might not be set, initialize in that case
/* if (StringUtils.isBlank(this.runnerAlfrescoRepoWarArtifactId)) {
setRunneralfrescoRepoWarArtifactId(null);
}
// The runner share artifact ID might not be set, initialize in that case
if (StringUtils.isBlank(this.runnerAlfrescoShareWarArtifactId)) {
setRunnerAlfrescoShareArtifactId(null);
}
*/
execEnv = executionEnvironment( execEnv = executionEnvironment(
project, project,
session, session,
@@ -404,13 +350,13 @@ public class RunMojo extends AbstractMojo {
if (enableRepository) { if (enableRepository) {
webapps2Deploy.add(createWebAppElement( webapps2Deploy.add(createWebAppElement(
runnerAlfrescoGroupId, runnerAlfrescoRepoWarArtifactId, runnerAlfrescoRepoVersion, runnerAlfrescoGroupId, runnerAlfrescoRepoWarArtifactId, runnerAlfrescoRepoVersion,
"/alfresco", "${project.build.testOutputDirectory}/tomcat/context-repo.xml")); "/alfresco", null));
} }
if (enableShare) { if (enableShare) {
webapps2Deploy.add(createWebAppElement( webapps2Deploy.add(createWebAppElement(
runnerAlfrescoGroupId, runnerAlfrescoShareWarArtifactId, runnerAlfrescoShareVersion, runnerAlfrescoGroupId, runnerAlfrescoShareWarArtifactId, runnerAlfrescoShareVersion,
"/share", "${project.build.testOutputDirectory}/tomcat/context-share.xml")); "/share", null));
} }
if (enableSolr) { if (enableSolr) {
@@ -531,18 +477,25 @@ public class RunMojo extends AbstractMojo {
getLog().error("Maven Version number " + errorStr); getLog().error("Maven Version number " + errorStr);
} }
Element e = element(name("webapp"), Element groupIdEl = element(name("groupId"), groupId);
element(name("groupId"), groupId), Element artifactIdEl = element(name("artifactId"), artifactId);
element(name("artifactId"), artifactId), Element versionEl = element(name("version"), version);
element(name("version"), version), Element typeEl = element(name("type"), "war");
element(name("type"), "war"), // Make sure webapp is loaded with context and everything,
// if set to 'false' then you will get 404 when trying to access the webapp from browser
Element asWebappEl = element(name("asWebapp"), "true");
Element contextPathEl = element(name("contextPath"), contextPath);
// Make sure webapp is loaded with context and everything, Element e;
// if set to 'false' then you will get 404 when trying to access the webapp from browser if (StringUtils.isNotBlank(contextFile)) {
element(name("asWebapp"), "true"), e = element(name("webapp"),
groupIdEl, artifactIdEl, versionEl,typeEl,asWebappEl, contextPathEl,
element(name("contextFile"), contextFile));
element(name("contextPath"), contextPath), } else {
StringUtils.isNotBlank(contextFile) ? element(name("contextFile"), contextFile) : null); e = element(name("webapp"),
groupIdEl, artifactIdEl, versionEl, typeEl, asWebappEl, contextPathEl);
}
getLog().info(e.toDom().toUnescapedString()); getLog().info(e.toDom().toUnescapedString());