From c25417e7025081727f53fa003c0ba2519a512842 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 22 Sep 2017 16:40:51 +0200 Subject: [PATCH] Deprecate Activiti features. See #481 for more info --- archetypes/activiti-jar-archetype/pom.xml | 4 ++-- .../resources/archetype-resources/pom.xml | 9 +++++-- .../maven/plugin/AbstractRunMojo.java | 17 +++++++++++++ .../org/alfresco/maven/plugin/RunMojo.java | 24 +++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/archetypes/activiti-jar-archetype/pom.xml b/archetypes/activiti-jar-archetype/pom.xml index f011168a..9dd38c70 100644 --- a/archetypes/activiti-jar-archetype/pom.xml +++ b/archetypes/activiti-jar-archetype/pom.xml @@ -6,8 +6,8 @@ activiti-jar-archetype maven-archetype - Alfresco SDK - Activiti JAR Archetype - Sample project with full support for lifecycle and rapid development of Activiti JARs + DEPRECATED - UNSUPPORTED - EXPERIMENTAL: Alfresco SDK - Activiti JAR Archetype + DEPRECATED - UNSUPPORTED - EXPERIMENTAL org.alfresco.maven diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml index d9b687f7..dfd3bb44 100644 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,10 +5,15 @@ ${groupId} ${artifactId} ${version} - ${artifactId} Activiti Jar Module - SDK 3 - Activiti JAR Module that produces a JAR file with Java extensions such as service task delegates. It also produces an application ZIP with workflow definition, forms etc that can be deployed via /activiti-app - SDK 3 + DEPRECATED - UNSUPPORTED - EXPERIMENTAL ${artifactId} Activiti Jar Module - SDK 3 + DEPRECATED - UNSUPPORTED - EXPERIMENTAL Activiti JAR Module that produces a JAR file with Java extensions such as service task delegates. It also produces an application ZIP with workflow definition, forms etc that can be deployed via /activiti-app - SDK 3 jar + + + + + @@alfresco.sdk.parent.version@@ diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java index 86a99d1c..92171f62 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java @@ -186,6 +186,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { protected boolean enableApiExplorer; /** + * Deprecated as of SDK 3.1 * Switch to enable/disable Alfresco Activiti Workflow Engine (activiti-app.war) when running embedded Tomcat. * This contains the Alfresco Activiti webapp, including the workflow engine. * This webapp is also the user interface for people involved in the task and processes @@ -197,6 +198,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { protected boolean enableActivitiApp; /** + * Deprecated as of SDK 3.1 * Switch to enable/disable Alfresco Activiti Admin (activiti-admin.war) when running embedded Tomcat. * This contains the Alfresco Activiti Administrator webapp. You use this to administer and monitor your * Alfresco Activiti engines. @@ -242,6 +244,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { protected List shareModules; /** + * Deprecated as of SDK 3.1 * JARs that should be overlayed/applied to the Activiti App WAR (i.e. activiti-app.war) */ @Parameter(property = "maven.activiti.modules", defaultValue = "") @@ -296,6 +299,9 @@ public abstract class AbstractRunMojo extends AbstractMojo { @Parameter(property = "alfresco.groupId", defaultValue = "org.alfresco") protected String alfrescoGroupId; + /** + * Deprecated as of SDK 3.1 + */ @Parameter(property = "activiti.groupId", defaultValue = "com.activiti") protected String activitiGroupId; @@ -311,9 +317,16 @@ public abstract class AbstractRunMojo extends AbstractMojo { @Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer") protected String alfrescoApiExplorerArtifactId; + /** + * Deprecated as of SDK 3.1 + */ + @Parameter(property = "activiti.app.war.artifactId", defaultValue = "activiti-app") protected String activitiAppWarArtifactId; + /** + * Deprecated as of SDK 3.1 + */ @Parameter(property = "activiti.admin.war.artifactId", defaultValue = "activiti-admin") protected String activitiAdminWarArtifactId; @@ -326,6 +339,9 @@ public abstract class AbstractRunMojo extends AbstractMojo { @Parameter(property = "alfresco.api.explorer.version", defaultValue = "5.2.e") protected String alfrescoApiExplorerVersion; + /** + * Deprecated as of SDK 3.1 + */ @Parameter(property = "activiti.version", defaultValue = "1.5.3") protected String activitiVersion; @@ -1348,6 +1364,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { } if (enableActivitiApp) { + webapps2Deploy.add(createWebAppElement( runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion, "/activiti-app", null)); diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java index 0f6e1a08..83b2c6fc 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java @@ -46,6 +46,30 @@ public class RunMojo extends AbstractRunMojo { pluginManager ); + if (enableActivitiApp || enableActivitiAdmin) { + getLog().warn("*************************************************************************************************************"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*\tWARNING" ); + getLog().warn("*\tThe Activiti features in SDK 3.x are UNSUPPORTED."); + getLog().warn("*\tIt has been marked for deprecation (SDK 3.1) and will be removed in SDK 4.0."); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*"); + getLog().warn("*************************************************************************************************************"); + + } + if (enableSolr) { unpackSolrConfig(); fixSolrHomePath();