diff --git a/archetypes/activiti-jar-archetype/.gitignore b/archetypes/activiti-jar-archetype/.gitignore deleted file mode 100644 index 5509140f..00000000 --- a/archetypes/activiti-jar-archetype/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.DS_Store diff --git a/archetypes/activiti-jar-archetype/pom.xml b/archetypes/activiti-jar-archetype/pom.xml deleted file mode 100644 index 9dd38c70..00000000 --- a/archetypes/activiti-jar-archetype/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - org.alfresco.maven.archetype - activiti-jar-archetype - - maven-archetype - DEPRECATED - UNSUPPORTED - EXPERIMENTAL: Alfresco SDK - Activiti JAR Archetype - DEPRECATED - UNSUPPORTED - EXPERIMENTAL - - - org.alfresco.maven - alfresco-sdk-aggregator - 3.0.2-SNAPSHOT - ../../pom.xml - - - - - - src/main/resources - - archetype-resources/pom.xml - archetype-resources/run.sh - archetype-resources/run.bat - archetype-resources/debug.sh - archetype-resources/debug.bat - META-INF/maven/archetype-metadata.xml - - true - - - src/main/resources - - archetype-resources/pom.xml - archetype-resources/run.sh - archetype-resources/run.bat - archetype-resources/debug.sh - archetype-resources/debug.bat - META-INF/maven/archetype-metadata.xml - - false - - - - - - org.apache.maven.plugins - maven-resources-plugin - - false - - @@ - - - - - - - diff --git a/archetypes/activiti-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/activiti-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index c7cdb8c3..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 1.0-SNAPSHOT - - - - - - src/main/java - - **/*.java - - - - src/test/java - - **/*.java - - - - src/main/resources - - **/bpmn-models/** - - - - src/main/resources - - **/bpmn-models/** - - - - src/test/resources - - log4j-dev.properties - - - - src/test/resources - - log4j-dev.properties - - - - src/test/license - - ** - - - - - - debug.sh - debug.bat - run.sh - run.bat - README.md - - - - -R \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/README.md b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/README.md deleted file mode 100644 index b283c7cf..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Alfresco Activiti JAR Module - SDK 3 - -To run use `mvn clean install alfresco:run` or `./run.sh` and verify that it - - * Runs the embedded Tomcat + H2 DB - * Runs Activiti Explorer - * Optionally runs Activiti REST - * Packages both a JAR with customization - -# Few things to notice - - * No parent pom - * WAR assembly is handled by the Alfresco Maven Plugin configuration - * Standard JAR packaging and layout - * Works seamlessly with Eclipse and IntelliJ IDEA - * JRebel for hot reloading, JRebel maven plugin for generating rebel.xml, agent usage: `MAVEN_OPTS=-Xms256m -Xmx1G -agentpath:/home/martin/apps/jrebel/lib/libjrebel64.so` - * [Configurable Run mojo](https://github.com/Alfresco/alfresco-sdk/blob/sdk-3.0/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java) in the `alfresco-maven-plugin` - * No unit testing/functional tests just yet - - - diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.bat b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.bat deleted file mode 100644 index dfd3a528..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.bat +++ /dev/null @@ -1,9 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: Dev environment startup script for Alfresco Community :: -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@echo off - -set MAVEN_OPTS=-Xms1G -Xmx2G - -mvnDebug clean install alfresco:run - diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.sh b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.sh deleted file mode 100755 index 86defd48..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -MAVEN_OPTS="-Xms1G -Xmx2G" mvnDebug clean install alfresco:run 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 deleted file mode 100644 index dfd3bb44..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,300 +0,0 @@ - - - 4.0.0 - ${groupId} - ${artifactId} - ${version} - 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@@ - - UTF-8 - - - ${project.basedir}/activiti_data_dev - - - com.activiti - activiti-app - activiti-admin - - - 1.5.3 - - - 1.1.6 - - - 1.7 - 1.7 - - - - - - ${activiti.groupId} - activiti-app-logic - ${activiti.version} - - - - org.slf4j - slf4j-log4j12 - - - - - - - junit - junit - 4.12 - test - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - create-app-zip - package - - run - - - - - - - - - - - - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - ${alfresco.sdk.version} - - - true - - - true - - - false - - - community - false - false - false - - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - - - - - - - - org.zeroturnaround - jrebel-maven-plugin - ${jrebel.version} - - - generate-rebel-xml - process-resources - - generate - - - - - - - all - - - - - - - - - true - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.0.1 - - UTF-8 - - ftl - acp - svg - pdf - doc - docx - xls - xlsx - ppt - pptx - bin - lic - swf - zip - msg - jar - ttf - eot - woff - woff2 - css - ico - psd - js - - - - - - - - - src/main/resources - true - - - apps/** - - - - - - - src/test/resources - true - - - - src/test/license - false - - - - - - - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - alfresco-public-snapshots - https://artifacts.alfresco.com/nexus/content/groups/public-snapshots - - true - daily - - - - - alfresco-private-repository - https://artifacts.alfresco.com/nexus/content/groups/private - - - - - activiti-public - https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases/ - - - activiti-public-snapshots - https://artifacts.alfresco.com/nexus/content/groups/public-snapshots - - true - daily - - - - - activiti-private-repository - https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases - - - - - alfresco-plugin-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - alfresco-plugin-public-snapshots - https://artifacts.alfresco.com/nexus/content/groups/public-snapshots - - true - daily - - - - - diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.bat deleted file mode 100644 index 9271b1f3..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.bat +++ /dev/null @@ -1,8 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: Dev environment startup script for Alfresco Community :: -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@echo off - -set MAVEN_OPTS=-Xms1G -Xmx2G - -mvn clean install alfresco:run diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.sh deleted file mode 100755 index 35150700..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -MAVEN_OPTS="-Xms1G -Xmx2G" mvn clean install alfresco:run diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/java/tasks/service/HelloWorldServiceTask.java b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/java/tasks/service/HelloWorldServiceTask.java deleted file mode 100644 index 28e1586f..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/java/tasks/service/HelloWorldServiceTask.java +++ /dev/null @@ -1,38 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -package ${package}.tasks.service; - -import org.activiti.engine.delegate.DelegateExecution; -import org.activiti.engine.delegate.JavaDelegate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A sample service task Java implementation - * - * @author martin.bergljung@alfresco.com - */ -public class HelloWorldServiceTask implements JavaDelegate { - private static Logger logger = LoggerFactory.getLogger(HelloWorldServiceTask.class); - - public void execute(DelegateExecution execution) throws Exception { - logger.debug("Hello World from the Java Service Task!"); - } -} \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/Hello World.json b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/Hello World.json deleted file mode 100644 index d7e91a24..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/Hello World.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "models": [ - { - "id": 2005, - "name": "Hello World", - "version": 1, - "modelType": 0, - "description": "The Hello World business process that is part of the Alfresco SDK 3.0 Activiti JAR Module Maven archetype", - "stencilSetId": 0, - "createdByFullName": " Administrator", - "createdBy": 1, - "lastUpdatedByFullName": " Administrator", - "lastUpdatedBy": 1, - "lastUpdated": "2016-09-29T12:38:13.716+0000" - } - ], - "theme": "theme-1", - "icon": "glyphicon-cog", - "publishIdentityInfo": [] -} \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.bpmn20.xml b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.bpmn20.xml deleted file mode 100644 index c26166d8..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.bpmn20.xml +++ /dev/null @@ -1,141 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - The Hello World business process that is part of the Alfresco SDK 3.0 Activiti JAR Module Maven - archetype - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.json b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.json deleted file mode 100644 index eb99f2eb..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.json +++ /dev/null @@ -1,403 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -{ - "resourceId": 2005, - "properties": { - "process_id": "HelloWorld", - "name": "Hello World", - "documentation": "The Hello World business process that is part of the Alfresco SDK 3.0 Activiti JAR Module Maven archetype", - "process_author": "", - "process_version": "", - "process_namespace": "http://www.activiti.org/processdef", - "executionlisteners": "", - "eventlisteners": "", - "signaldefinitions": "", - "messagedefinitions": "", - "executionvariables": "", - "metadata": "" - }, - "stencil": { - "id": "BPMNDiagram" - }, - "childShapes": [ - { - "resourceId": "startEvent1", - "properties": { - "overrideid": "startHelloWorld", - "name": "", - "documentation": "", - "executionlisteners": "", - "initiator": "", - "formkeydefinition": "", - "formreference": { - "id": 2006, - "name": "Hello World Start", - "referenceId": 2005, - "variablesmapping": [] - }, - "fieldstovariables": "", - "formproperties": "" - }, - "stencil": { - "id": "StartNoneEvent" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA" - } - ], - "bounds": { - "lowerRight": { - "x": 120, - "y": 220 - }, - "upperLeft": { - "x": 90, - "y": 190 - } - }, - "dockers": [] - }, - { - "resourceId": "sid-B4E2D526-60B7-47B9-856C-FC824DA15708", - "properties": { - "overrideid": "decideGreeting", - "name": "Decide greeting", - "documentation": "", - "asynchronousdefinition": "false", - "exclusivedefinition": "false", - "executionlisteners": "", - "multiinstance_type": "None", - "multiinstance_cardinality": "", - "multiinstance_collection": "", - "multiinstance_variable": "", - "multiinstance_condition": "", - "isforcompensation": "false", - "decisiontaskdecisiontablereference": { - "id": 2007, - "name": "Decide What Greeting", - "referenceId": 2005, - "variablesmapping": [] - } - }, - "stencil": { - "id": "DecisionTask" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD" - } - ], - "bounds": { - "lowerRight": { - "x": 310, - "y": 245 - }, - "upperLeft": { - "x": 210, - "y": 165 - } - }, - "dockers": [] - }, - { - "resourceId": "sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA", - "properties": { - "overrideid": "", - "name": "", - "documentation": "", - "conditionsequenceflow": "", - "executionlisteners": "", - "defaultflow": "false" - }, - "stencil": { - "id": "SequenceFlow" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-B4E2D526-60B7-47B9-856C-FC824DA15708" - } - ], - "bounds": { - "lowerRight": { - "x": 209.3515625, - "y": 205 - }, - "upperLeft": { - "x": 120.53125, - "y": 205 - } - }, - "dockers": [ - { - "x": 15, - "y": 15 - }, - { - "x": 50, - "y": 40 - } - ], - "target": { - "resourceId": "sid-B4E2D526-60B7-47B9-856C-FC824DA15708" - } - }, - { - "resourceId": "sid-68AE120D-AB55-4ED2-AFD5-845139236AD3", - "properties": { - "scriptformat": "JavaScript", - "scripttext": "print(\"Hello World from JavaScript task:\");\nvar userId = initiator;\nprint(dayGreeting + \" \" + userInfoBean.getUser(userId).getFullName());\nprint(\"You entered '\" + greeting + \"' as a greeting text.\");\n", - "executionvariables": "", - "overrideid": "", - "name": "Print Greeting from JS", - "documentation": "", - "asynchronousdefinition": "false", - "exclusivedefinition": "false", - "executionlisteners": "", - "multiinstance_type": "None", - "multiinstance_cardinality": "", - "multiinstance_collection": "", - "multiinstance_variable": "", - "multiinstance_condition": "", - "isforcompensation": "false" - }, - "stencil": { - "id": "ScriptTask" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F" - } - ], - "bounds": { - "lowerRight": { - "x": 775, - "y": 245 - }, - "upperLeft": { - "x": 675, - "y": 165 - } - }, - "dockers": [] - }, - { - "resourceId": "sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6", - "properties": { - "overrideid": "endHelloWorld", - "name": "", - "documentation": "", - "executionlisteners": "" - }, - "stencil": { - "id": "EndTerminateEvent" - }, - "childShapes": [], - "outgoing": [], - "bounds": { - "lowerRight": { - "x": 943, - "y": 219 - }, - "upperLeft": { - "x": 915, - "y": 191 - } - }, - "dockers": [] - }, - { - "resourceId": "sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F", - "properties": { - "overrideid": "", - "name": "", - "documentation": "", - "conditionsequenceflow": "", - "executionlisteners": "", - "defaultflow": "false" - }, - "stencil": { - "id": "SequenceFlow" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6" - } - ], - "bounds": { - "lowerRight": { - "x": 914.453125, - "y": 205 - }, - "upperLeft": { - "x": 775.40625, - "y": 205 - } - }, - "dockers": [ - { - "x": 50, - "y": 40 - }, - { - "x": 14, - "y": 14 - } - ], - "target": { - "resourceId": "sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6" - } - }, - { - "resourceId": "sid-61E86F19-FC5F-4814-B9AB-2394B03171D6", - "properties": { - "overrideid": "printGreetingFromJava", - "name": "Print Greeting From Java", - "documentation": "", - "asynchronousdefinition": "false", - "exclusivedefinition": "false", - "executionlisteners": "", - "multiinstance_type": "None", - "multiinstance_cardinality": "", - "multiinstance_collection": "", - "multiinstance_variable": "", - "multiinstance_condition": "", - "isforcompensation": "false", - "servicetaskclass": "${package}.tasks.service.HelloWorldServiceTask", - "servicetaskexpression": "", - "servicetaskdelegateexpression": "", - "servicetaskfields": "", - "servicetaskresultvariable": "", - "executionvariables": "" - }, - "stencil": { - "id": "ServiceTask" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810" - } - ], - "bounds": { - "lowerRight": { - "x": 543, - "y": 245 - }, - "upperLeft": { - "x": 443, - "y": 165 - } - }, - "dockers": [] - }, - { - "resourceId": "sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810", - "properties": { - "overrideid": "", - "name": "", - "documentation": "", - "conditionsequenceflow": "", - "executionlisteners": "", - "defaultflow": "false" - }, - "stencil": { - "id": "SequenceFlow" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-68AE120D-AB55-4ED2-AFD5-845139236AD3" - } - ], - "bounds": { - "lowerRight": { - "x": 674.15625, - "y": 205 - }, - "upperLeft": { - "x": 543.84375, - "y": 205 - } - }, - "dockers": [ - { - "x": 50, - "y": 40 - }, - { - "x": 50, - "y": 40 - } - ], - "target": { - "resourceId": "sid-68AE120D-AB55-4ED2-AFD5-845139236AD3" - } - }, - { - "resourceId": "sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD", - "properties": { - "overrideid": "", - "name": "", - "documentation": "", - "conditionsequenceflow": "", - "executionlisteners": "", - "defaultflow": "false", - "showdiamondmarker": false - }, - "stencil": { - "id": "SequenceFlow" - }, - "childShapes": [], - "outgoing": [ - { - "resourceId": "sid-61E86F19-FC5F-4814-B9AB-2394B03171D6" - } - ], - "bounds": { - "lowerRight": { - "x": 443, - "y": 205 - }, - "upperLeft": { - "x": 310.59375, - "y": 205 - } - }, - "dockers": [ - { - "x": 50, - "y": 40 - }, - { - "x": 1, - "y": 40 - } - ], - "target": { - "resourceId": "sid-61E86F19-FC5F-4814-B9AB-2394B03171D6" - } - } - ], - "bounds": { - "lowerRight": { - "x": 1200, - "y": 1050 - }, - "upperLeft": { - "x": 0, - "y": 0 - } - }, - "stencilset": { - "url": "stencilsets/bpmn2.0/bpmn2.0.json", - "namespace": "http://b3mn.org/stencilset/bpmn2.0#" - }, - "ssextensions": [] -} \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.png b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.png deleted file mode 100644 index c62691b6..00000000 Binary files a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.png and /dev/null differ diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.json b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.json deleted file mode 100644 index 0dc46aaf..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "referenceId": 2005, - "name": "Decide What Greeting", - "description": "Decide, depending on time of day, what greeting to display.", - "editorJson": { - "id": 2007, - "name": "Decide What Greeting", - "key": "DecideWhatGreeting", - "description": "Decide, depending on time of day, what greeting to display.", - "hitIndicator": "FIRST", - "inputExpressions": [ - { - "id": "3", - "variableId": "timeofday", - "variableType": "formfield", - "type": "string", - "label": "Time of day", - "entries": null, - "newVariable": false - } - ], - "outputExpressions": [ - { - "id": "4", - "variableId": "dayGreeting", - "variableType": "variable", - "type": "string", - "label": "DayGreeting", - "entries": null, - "newVariable": true - } - ], - "rules": [ - { - "3": "== \"time_of_day_morning\"", - "4": "\"Good Morning!\"" - }, - { - "3": "== \"time_of_day_lunch\"", - "4": "\"Good Day!\"" - }, - { - "3": "== \"time_of_day_dinner\"", - "4": "\"Good Evening!\"" - }, - { - "3": "== \"time_of_day_night\"", - "4": "\"Good Night!\"" - } - ], - "executionVariables": [] - } -} \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.png b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.png deleted file mode 100644 index dc9d1b52..00000000 Binary files a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.png and /dev/null differ diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.json b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.json deleted file mode 100644 index f860ae36..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "referenceId": 2005, - "name": "Hello World Start", - "description": "The form for the Start task in the Hello World business process.", - "editorJson": { - "tabs": [], - "fields": [ - { - "fieldType": "ContainerRepresentation", - "id": "1475149613209", - "name": "Label", - "type": "container", - "value": null, - "required": false, - "readOnly": false, - "overrideId": false, - "colspan": 1, - "placeholder": null, - "minLength": 0, - "maxLength": 0, - "minValue": null, - "maxValue": null, - "regexPattern": null, - "optionType": null, - "hasEmptyValue": null, - "options": null, - "restUrl": null, - "restResponsePath": null, - "restIdProperty": null, - "restLabelProperty": null, - "tab": null, - "className": null, - "dateDisplayFormat": null, - "layout": null, - "sizeX": 2, - "sizeY": 1, - "row": -1, - "col": -1, - "visibilityCondition": null, - "numberOfColumns": 2, - "fields": { - "1": [ - { - "fieldType": "FormFieldRepresentation", - "id": "greeting", - "name": "Greeting", - "type": "text", - "value": null, - "required": true, - "readOnly": false, - "overrideId": false, - "colspan": 1, - "placeholder": null, - "minLength": 0, - "maxLength": 0, - "minValue": null, - "maxValue": null, - "regexPattern": null, - "optionType": null, - "hasEmptyValue": null, - "options": null, - "restUrl": null, - "restResponsePath": null, - "restIdProperty": null, - "restLabelProperty": null, - "tab": null, - "className": null, - "params": { - "existingColspan": 1, - "maxColspan": 2 - }, - "dateDisplayFormat": null, - "layout": { - "row": -1, - "column": -1, - "colspan": 1 - }, - "sizeX": 1, - "sizeY": 1, - "row": -1, - "col": -1, - "visibilityCondition": null - } - ], - "2": [] - } - }, - { - "fieldType": "ContainerRepresentation", - "id": "1475149862241", - "name": "Label", - "type": "container", - "value": null, - "required": false, - "readOnly": false, - "overrideId": false, - "colspan": 1, - "placeholder": null, - "minLength": 0, - "maxLength": 0, - "minValue": null, - "maxValue": null, - "regexPattern": null, - "optionType": null, - "hasEmptyValue": null, - "options": null, - "restUrl": null, - "restResponsePath": null, - "restIdProperty": null, - "restLabelProperty": null, - "tab": null, - "className": null, - "dateDisplayFormat": null, - "layout": null, - "sizeX": 2, - "sizeY": 1, - "row": -1, - "col": -1, - "visibilityCondition": null, - "numberOfColumns": 2, - "fields": { - "1": [ - { - "fieldType": "RestFieldRepresentation", - "id": "timeofday", - "name": "Time of Day", - "type": "dropdown", - "value": "Choose one...", - "required": false, - "readOnly": false, - "overrideId": false, - "colspan": 1, - "placeholder": null, - "minLength": 0, - "maxLength": 0, - "minValue": null, - "maxValue": null, - "regexPattern": null, - "optionType": null, - "hasEmptyValue": true, - "options": [ - { - "id": "empty", - "name": "Choose one..." - }, - { - "id": "time_of_day_morning", - "name": "Morning" - }, - { - "id": "time_of_day_lunch", - "name": "Lunch" - }, - { - "id": "time_of_day_dinner", - "name": "Dinner" - }, - { - "id": "time_of_day_night", - "name": "Night" - } - ], - "restUrl": null, - "restResponsePath": null, - "restIdProperty": null, - "restLabelProperty": null, - "tab": null, - "className": null, - "params": { - "existingColspan": 1, - "maxColspan": 2 - }, - "dateDisplayFormat": null, - "layout": { - "row": -1, - "column": -1, - "colspan": 1 - }, - "sizeX": 1, - "sizeY": 1, - "row": -1, - "col": -1, - "visibilityCondition": null, - "endpoint": null, - "requestHeaders": null - } - ], - "2": [] - } - } - ], - "outcomes": [], - "javascriptEvents": [], - "className": "", - "style": "", - "customFieldTemplates": {}, - "metadata": {}, - "variables": [], - "gridsterForm": false - } -} \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.png b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.png deleted file mode 100644 index 50f8560f..00000000 Binary files a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.png and /dev/null differ diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md deleted file mode 100644 index e986999c..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Enterprise License location - -Put the Activiti Enterprise license file (activiti.lic) in this directory. -It will then be copied into the WAR.............. - -And then not be part of any other classpaths. - - - diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-app.properties b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-app.properties deleted file mode 100644 index c0c5b8f1..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-app.properties +++ /dev/null @@ -1,35 +0,0 @@ -server.onpremise=true -server.stencil.custom.allowed=true -server.contextroot=/activiti-app - -# Database connection -datasource.driver=org.h2.Driver -datasource.url=jdbc:h2:${activiti.datadir}/h2/activiti;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0 -datasource.username=alfresco -datasource.password=alfresco -hibernate.dialect=org.hibernate.dialect.H2Dialect - -# Elastic Search server config for historical process data -elastic-search.server.type=none -elastic-search.cluster.name=activiti-elastic-search-cluster-dev -elastic-search.enable.http=true -elastic-search.data.path=${activiti.datadir}/es - -event.generation.enabled=true -event.processing.enabled=true - -# Administrator login username = email -admin.email=admin@app.activiti.com -# koala -admin.passwordHash=4efe081594ce25ee4efd9f7067f7f678a347bccf2de201f3adf2a3eb544850b465b4e51cdc3fcdde -admin.lastname=Administrator -admin.group=Superusers - -# Where to store any uploaded files -contentstorage.fs.rootFolder=${activiti.datadir}/contentstore -contentstorage.fs.createRoot=true -contentstorage.fs.depth=4 -contentstorage.fs.blockSize=1024 - -# Disable Cross-Site-Request-Forgery (CSRF) protection, so we can access from other client app via REST -security.csrf.disabled=true \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-ldap.properties b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-ldap.properties deleted file mode 100644 index 363205b3..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-ldap.properties +++ /dev/null @@ -1,3 +0,0 @@ -ldap.authentication.enabled=false -ldap.synchronization.full.enabled=false -ldap.synchronization.differential.enabled=false \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-dev.properties b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-dev.properties deleted file mode 100644 index 690a617f..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-dev.properties +++ /dev/null @@ -1,40 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -# This file is copied (with RunMojo) into target/activitiApp-war/WEB-INF/classes dir before webapp deployment -# - -log4j.rootLogger=INFO, CA, File - -# ConsoleAppender -log4j.appender.CA=org.apache.log4j.ConsoleAppender -log4j.appender.CA.layout=org.apache.log4j.PatternLayout -log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n - -# File Appender -log4j.appender.File=org.apache.log4j.RollingFileAppender -log4j.appender.File.File=${project.build.directory}/activiti.log -log4j.appender.File.threshold=INFO -log4j.appender.File.layout=org.apache.log4j.PatternLayout -log4j.appender.File.layout.ConversionPattern=%d{ISO8601} %-5p [%c] %m%n -log4j.appender.File.MaxFileSize=100MB -log4j.appender.File.MaxBackupIndex=1 - -# Custom tweaks -log4j.logger.org.apache.ibatis.level=INFO -log4j.logger.javax.activation.level=INFO -log4j.logger.com.codahale.metrics=WARN -log4j.logger.com.ryantenney=WARN -log4j.logger.com.zaxxer=WARN -log4j.logger.org.apache=WARN -log4j.logger.org.hibernate=WARN -log4j.logger.org.hibernate.engine.internal=WARN -log4j.logger.org.hibernate.validator=WARN -log4j.logger.org.springframework=WARN -log4j.logger.org.springframework.web=WARN -log4j.logger.org.springframework.security=WARN - - -# Custom classes logging -log4j.logger.${package}.tasks.service=DEBUG diff --git a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-test.properties b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-test.properties deleted file mode 100644 index ffebc8a9..00000000 --- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-test.properties +++ /dev/null @@ -1,6 +0,0 @@ -log4j.rootLogger=WARN, CA - -# ConsoleAppender -log4j.appender.CA=org.apache.log4j.ConsoleAppender -log4j.appender.CA.layout=org.apache.log4j.PatternLayout -log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/archetype.properties b/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/archetype.properties deleted file mode 100644 index ef2a2f9c..00000000 --- a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/archetype.properties +++ /dev/null @@ -1,5 +0,0 @@ -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=activitiJARTest -package=it.pkg - diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/goal.txt b/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/goal.txt deleted file mode 100644 index b0b258dc..00000000 --- a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/goal.txt +++ /dev/null @@ -1 +0,0 @@ -verify -Dmaven.test.skip=true diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/archetype.properties b/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/archetype.properties deleted file mode 100644 index 11281816..00000000 --- a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=activitiJARTestRun -package=it.pkg \ No newline at end of file diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/goal.txt b/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/goal.txt deleted file mode 100644 index f7ffc47a..00000000 --- a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install \ No newline at end of file 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 92171f62..67074e64 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 @@ -62,7 +62,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { public static final String PLATFORM_WAR_PREFIX_NAME = "platform"; public static final String SHARE_WAR_PREFIX_NAME = "share"; - public static final String ACTIVITI_APP_WAR_PREFIX_NAME = "activitiApp"; + public static final String ALFRESCO_ENTERPRISE_EDITION = "enterprise"; public static final String ALFRESCO_COMMUNITY_EDITION = "community"; @@ -185,27 +185,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { @Parameter(property = "maven.alfresco.enableApiExplorer", defaultValue = "false") 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 - * running in the Activiti engine. - * You also use this webapp to create and manage process definitions, and to display and define analytics - * reports on users' tasks and processes. - */ - @Parameter(property = "maven.alfresco.enableActivitiApp", defaultValue = "false") - 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. - * - */ - @Parameter(property = "maven.alfresco.enableActivitiAdmin", defaultValue = "false") - protected boolean enableActivitiAdmin; /** * Switch to enable/disable test properties when running embedded Tomcat. @@ -243,12 +222,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { @Parameter(property = "maven.alfresco.share.modules", defaultValue = "") 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 = "") - protected List activitiModules; /** * Community Edition or Enterprise Edition? (i.e community or enterprise) @@ -299,12 +272,6 @@ 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; - @Parameter(property = "alfresco.platform.war.artifactId", defaultValue = "alfresco-platform") protected String alfrescoPlatformWarArtifactId; @@ -317,18 +284,6 @@ 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; @Parameter(property = "alfresco.platform.version", defaultValue = "5.2.f") protected String alfrescoPlatformVersion; @@ -339,11 +294,6 @@ 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; /** * Directory that contains the Alfresco Solr 4 configuration @@ -352,7 +302,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { protected String solrHome; /** - * Maven GAV properties for customized alfresco.war, share.war, activiti-app.war + * Maven GAV properties for customized alfresco.war and share.war * Used by the Maven Tomcat 7 Plugin */ private String runnerAlfrescoGroupId; @@ -360,9 +310,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { private String runnerAlfrescoShareWarArtifactId; private String runnerAlfrescoPlatformVersion; private String runnerAlfrescoShareVersion; - private String runnerActivitiAppGroupId; - private String runnerActivitiAppWarArtifactId; - private String runnerActivitiAppVersion; /** * The Maven environment that this mojo is executed in @@ -882,39 +829,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { ); } - /** - * Copy the Activiti Log4J Dev config into the activitiApp-war/WEB-INF/classes dir. - * - * @throws MojoExecutionException - */ - protected void copyActivitiLog4JDevConfig() throws MojoExecutionException { - final String warOutputDir = getWarOutputDir(ACTIVITI_APP_WAR_PREFIX_NAME); - final String logConfDestDir = warOutputDir + "/WEB-INF/classes"; - - getLog().info("Copying Activiti log4j-dev.properties to: " + logConfDestDir); - - executeMojo( - plugin( - groupId("org.apache.maven.plugins"), - artifactId("maven-resources-plugin"), - version(MAVEN_RESOURCE_PLUGIN_VERSION) - ), - goal("copy-resources"), - configuration( - element(name("outputDirectory"), logConfDestDir), - element(name("resources"), - element(name("resource"), - element(name("directory"), "src/test/resources"), - element(name("includes"), - element(name("include"), "log4j-dev.properties") - ), - element(name("filtering"), "true") - ) - ) - ), - execEnv - ); - } /** @@ -1074,24 +988,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { runnerAlfrescoShareVersion = "${project.version}"; } - /** - * Build the customized Activiti App webapp (i.e. the activiti-app.war) - * that should be deployed by Tomcat by applying all JARs from - * the {@code } configuration. - */ - protected void buildActivitiAppWar() throws MojoExecutionException { - buildCustomWarInDir(ACTIVITI_APP_WAR_PREFIX_NAME, activitiModules, - activitiGroupId, activitiAppWarArtifactId, activitiVersion); - - copyActivitiLog4JDevConfig(); - - String activitiAppWarArtifactId = packageAndInstallCustomWar(ACTIVITI_APP_WAR_PREFIX_NAME); - - // Set up the custom share war to be run by Tomcat plugin - runnerActivitiAppGroupId = "${project.groupId}"; - runnerActivitiAppWarArtifactId = activitiAppWarArtifactId; - runnerActivitiAppVersion = "${project.version}"; - } /** * Build a customized webapp in a directory, @@ -1266,8 +1162,8 @@ public abstract class AbstractRunMojo extends AbstractMojo { * Check that a database configuration has been supplied correctly */ protected void checkDatabaseConfig() throws MojoExecutionException { - // Only do this check if we are running alfresco.war or activiti-app.war that needs a database. - if (enablePlatform || enableActivitiApp) { + // Only do this check if we are running alfresco.war that needs a database. + if (enablePlatform) { if (enableH2 && !enableMySQL && !enablePostgreSQL) { // Run with the H2 database return; @@ -1363,17 +1259,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { "/api-explorer", null)); } - if (enableActivitiApp) { - - webapps2Deploy.add(createWebAppElement( - runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion, - "/activiti-app", null)); - } - - if (enableActivitiAdmin) { - webapps2Deploy.add(createWebAppElement( - activitiGroupId, activitiAdminWarArtifactId, activitiVersion, "/activiti-admin", null)); - } if (tomcatCustomWebapps != null && !tomcatCustomWebapps.isEmpty()) { // We got extra custom webapps to deploy @@ -1394,10 +1279,6 @@ public abstract class AbstractRunMojo extends AbstractMojo { if (enableSolr) { systemProps.add(element(name("solr.solr.home"), solrHome + "/")); } - if (enableActivitiApp) { - // Should be in activiti-jar/src/test/resources - systemProps.add(element(name("log4j.configuration"), "log4j-dev.properties")); - } // Add custom system properties defined in plugin config if (tomcatSystemProperties != null && !tomcatSystemProperties.isEmpty()) { for (Map.Entry sysProp : tomcatSystemProperties.entrySet()) { diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/IntegrationTestMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/IntegrationTestMojo.java index 6c36f76e..229daa8c 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/IntegrationTestMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/IntegrationTestMojo.java @@ -111,9 +111,6 @@ public class IntegrationTestMojo extends AbstractRunMojo { buildShareWar(); } - if (enableActivitiApp) { - buildActivitiAppWar(); - } if (startTomcat) { boolean fork = true; 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 83b2c6fc..1f859e8b 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,29 +46,7 @@ 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(); @@ -91,10 +69,6 @@ public class RunMojo extends AbstractRunMojo { buildShareWar(); } - if (enableActivitiApp) { - buildActivitiAppWar(); - } - if (startTomcat) { checkDatabaseConfig(); boolean fork = false; diff --git a/pom.xml b/pom.xml index c3a8f397..1b212b7c 100644 --- a/pom.xml +++ b/pom.xml @@ -113,10 +113,8 @@ plugins/alfresco-maven-plugin archetypes/alfresco-platform-jar-archetype - archetypes/alfresco-share-jar-archetype archetypes/alfresco-allinone-archetype - archetypes/activiti-jar-archetype