From 8798695b4e3480ed8f87052cdd8d9e03724c32cb Mon Sep 17 00:00:00 2001
From: Dofs Serge <dofs197@gmail.com>
Date: Thu, 24 Jan 2019 04:55:54 +0300
Subject: [PATCH 1/6] rm529note2: task assign log shows assigned actors

---
 .../java/ru/runa/wfe/audit/TaskAssignLog.java | 27 ++++++++++++++-----
 .../audit/presentation/ExecutorIdsValue.java  |  9 ++++---
 .../webapp/WEB-INF/classes/struts.properties  |  2 +-
 .../WEB-INF/classes/struts_ru.properties      |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java b/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java
index 32d3ff9c25..a1c17a225e 100644
--- a/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java
+++ b/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java
@@ -21,17 +21,22 @@
  */
 package ru.runa.wfe.audit;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Set;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
-
+import ru.runa.wfe.audit.presentation.ExecutorIdsValue;
 import ru.runa.wfe.audit.presentation.ExecutorNameValue;
 import ru.runa.wfe.task.Task;
+import ru.runa.wfe.user.Actor;
 import ru.runa.wfe.user.Executor;
 
 /**
  * Logging task assignment.
- * 
+ *
  * @author Dofs
  */
 @Entity
@@ -42,14 +47,19 @@ public class TaskAssignLog extends TaskLog {
     public TaskAssignLog() {
     }
 
-    public TaskAssignLog(Task task, Executor newExecutor) {
+    public TaskAssignLog(Task task, Executor oldExecutor, Executor newExecutor, Set<Actor> actors) {
         super(task);
-        if (task.getExecutor() != null) {
-            addAttribute(ATTR_OLD_VALUE, task.getExecutor().getName());
+        if (oldExecutor != null) {
+            addAttribute(ATTR_OLD_VALUE, oldExecutor.getName());
         }
         if (newExecutor != null) {
             addAttribute(ATTR_NEW_VALUE, newExecutor.getName());
         }
+        List<Long> ids = Lists.newArrayList();
+        for (Executor executor : actors) {
+            ids.add(executor.getId());
+        }
+        addAttribute(ATTR_MESSAGE, Joiner.on(ExecutorIdsValue.DELIM).join(ids));
         setSeverity(Severity.INFO);
     }
 
@@ -63,10 +73,15 @@ public String getNewExecutorName() {
         return getAttribute(ATTR_NEW_VALUE);
     }
 
+    @Transient
+    public String getExecutorIds() {
+        return getAttribute(ATTR_MESSAGE);
+    }
+
     @Override
     @Transient
     public Object[] getPatternArguments() {
-        return new Object[] { getTaskName(), new ExecutorNameValue(getAttribute(ATTR_NEW_VALUE)) };
+        return new Object[] { getTaskName(), new ExecutorNameValue(getAttribute(ATTR_NEW_VALUE)), new ExecutorIdsValue(getExecutorIds()) };
     }
 
     @Override
diff --git a/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java b/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java
index c606c01a66..4072331fb1 100644
--- a/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java
+++ b/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java
@@ -1,10 +1,9 @@
 package ru.runa.wfe.audit.presentation;
 
+import com.google.common.collect.Lists;
 import java.io.Serializable;
 import java.util.List;
 
-import com.google.common.collect.Lists;
-
 public class ExecutorIdsValue implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String DELIM = ";";
@@ -14,8 +13,10 @@ public ExecutorIdsValue() {
     }
 
     public ExecutorIdsValue(String idsString) {
-        for (String idString : idsString.split(DELIM, -1)) {
-            ids.add(Long.valueOf(idString));
+        if (idsString != null) {
+            for (String idString : idsString.split(DELIM, -1)) {
+                ids.add(Long.valueOf(idString));
+            }
         }
     }
 
diff --git a/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties b/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties
index 7765572215..16fd33378f 100644
--- a/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties
+++ b/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties
@@ -233,7 +233,7 @@ history.log.SendMessageLog = Sent message <b>{0}</b>
 history.log.SubprocessEndLog = Subprocess <b>{0}</b> completed 
 history.log.SubprocessStartLog = Subprocess <b>{0}</b> started 
 history.log.SwimlaneAssignLog = Swimlane <b>{0}</b> assigned to <b>{1}</b>
-history.log.TaskAssignLog = Task <b>{0}</b> assigned to executor <b>{1}</b>
+history.log.TaskAssignLog = Task <b>{0}</b> assigned to executor <b>{1}</b> (new are: <b>{2}</b>)
 history.log.TaskCancelledLog = Task <b>{0}</b> was cancelled by handler <b>{1}</b>
 history.log.TaskCreateLog = Created task <b>{0}</b>
 history.log.TaskDelegationLog = Task <b>{0}</b> delegated to <b>{1}</b> by <b>{2}</b>
diff --git a/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties b/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties
index 7bb3f2f291..38f7bb0fa0 100644
--- a/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties
+++ b/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties
@@ -228,7 +228,7 @@ history.log.SendMessageLog = \u041e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u0
 history.log.SubprocessEndLog = \u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d \u043f\u043e\u0434\u043f\u0440\u043e\u0446\u0435\u0441\u0441 <b>{0}</b>
 history.log.SubprocessStartLog = \u0417\u0430\u043f\u0443\u0449\u0435\u043d \u043f\u043e\u0434\u043f\u0440\u043e\u0446\u0435\u0441\u0441 <b>{0}</b>
 history.log.SwimlaneAssignLog = \u0420\u043e\u043b\u044c-\u0434\u043e\u0440\u043e\u0436\u043a\u0430 <b>{0}</b> \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0430 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044e <b>{1}</b>
-history.log.TaskAssignLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044e <b>{1}</b>
+history.log.TaskAssignLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044e <b>{1}</b> (\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b: <b>{2}</b>)
 history.log.TaskCancelledLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u043c <b>{1}</b>
 history.log.TaskCreateLog = \u0421\u043e\u0437\u0434\u0430\u043d\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b>
 history.log.TaskDelegationLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u0434\u0435\u043b\u0435\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u043e <b>{1}</b> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c <b>{2}</b>

From 429cfcc88630d21a216676cae742d9a05fb68f1d Mon Sep 17 00:00:00 2001
From: Dofs <dofs197@gmail.com>
Date: Sun, 3 Feb 2019 12:55:46 +0300
Subject: [PATCH 2/6] compilation fix

---
 wfe-core/src/main/java/ru/runa/wfe/task/Task.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/wfe-core/src/main/java/ru/runa/wfe/task/Task.java b/wfe-core/src/main/java/ru/runa/wfe/task/Task.java
index dda4312bd3..90969b4392 100644
--- a/wfe-core/src/main/java/ru/runa/wfe/task/Task.java
+++ b/wfe-core/src/main/java/ru/runa/wfe/task/Task.java
@@ -43,8 +43,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Index;
@@ -67,7 +65,9 @@
 import ru.runa.wfe.lang.InteractionNode;
 import ru.runa.wfe.lang.TaskDefinition;
 import ru.runa.wfe.task.logic.TaskNotifier;
+import ru.runa.wfe.user.Actor;
 import ru.runa.wfe.user.Executor;
+import ru.runa.wfe.user.Group;
 
 /**
  * is one task that can be assigned to an actor (read: put in someone's task list) and that can trigger the continuation of execution of the token
@@ -272,9 +272,13 @@ public void assignExecutor(ExecutionContext executionContext, Executor executor,
         if (!Objects.equal(getExecutor(), executor)) {
             log.debug("assigning " + this + " to " + executor);
             Executor previousExecutor = getExecutor();
-            // log this assignment
-            executionContext.addLog(new TaskAssignLog(this, executor));
-            // do the actual assignment
+            Set<Actor> assignedActors;
+            if (executor instanceof Group) {
+                assignedActors = Sets.newHashSet(ApplicationContextFactory.getExecutorDAO().getGroupActors((Group) executor));
+            } else {
+                assignedActors = Sets.newHashSet((Actor) executor);
+            }
+            executionContext.addLog(new TaskAssignLog(this, previousExecutor, executor, assignedActors));
             setExecutor(executor);
             setAssignDate(new Date());
             InteractionNode node = (InteractionNode) executionContext.getProcessDefinition().getNodeNotNull(nodeId);

From 8df06bd9beae46298ee5b5ed0b84d38092bc0eca Mon Sep 17 00:00:00 2001
From: Dofs <dofs197@gmail.com>
Date: Thu, 9 May 2019 11:25:16 +0300
Subject: [PATCH 3/6] removed legacy adminkit from source

---
 .../conf/bot/TextFileTemplate_demo.txt        |   8 -
 .../default/conf/bot/demo/soapBot-whois.xml   |  39 ----
 .../conf/bot/handler/assigner1.properties     |   2 -
 .../conf/bot/handler/msword-report.xml        |  12 -
 .../default/conf/bot/handler/soapBotTest.xml  |   9 -
 .../default/conf/bot/handler/text-report.xml  |   6 -
 .../default/conf/bot/handler/textFile.xml     |  12 -
 .../default/conf/bot/handler/update1.xml      |  13 --
 .../default/conf/bot/sample-template.doc      | Bin 26624 -> 0 bytes
 .../src/main/adminkit/conf/jndi.properties    |   6 -
 .../adminkit/conf/wfe.custom.ejb.properties   |  16 --
 wfe-core/src/main/adminkit/ldap-importer.bat  |  14 --
 wfe-core/src/main/adminkit/ldap-importer.sh   |  10 -
 wfe-core/src/main/adminkit/lib/content        |  10 -
 wfe-core/src/main/adminkit/log4j.xml          |  36 ---
 wfe-core/src/main/adminkit/script-runner.bat  |  18 --
 wfe-core/src/main/adminkit/script-runner.sh   |  19 --
 .../scripts/deploy-samples-script.xml         | 209 ------------------
 .../scripts/features-demonstration-script.xml | 142 ------------
 .../scripts/test-archive-remove-processes.xml |  29 ---
 20 files changed, 610 deletions(-)
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml
 delete mode 100644 wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc
 delete mode 100644 wfe-core/src/main/adminkit/conf/jndi.properties
 delete mode 100644 wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties
 delete mode 100644 wfe-core/src/main/adminkit/ldap-importer.bat
 delete mode 100644 wfe-core/src/main/adminkit/ldap-importer.sh
 delete mode 100644 wfe-core/src/main/adminkit/lib/content
 delete mode 100644 wfe-core/src/main/adminkit/log4j.xml
 delete mode 100644 wfe-core/src/main/adminkit/script-runner.bat
 delete mode 100644 wfe-core/src/main/adminkit/script-runner.sh
 delete mode 100644 wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml
 delete mode 100644 wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml
 delete mode 100644 wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml

diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt b/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt
deleted file mode 100644
index 8e01a7972e..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-        Report title: ${header}.
-
-                     number: ${number}       
-		     date:   ${date}
-
-
-        Text: 
-${mainText}
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml
deleted file mode 100644
index b59b2fae3e..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml webServiceTaskHandlerConfig.xsd">
-	<url>http://www.webservicex.net/whois.asmx</url>
-	<SOAPAction>http://www.webservicex.net/GetWhoIS</SOAPAction>
-	<request-method>POST</request-method>
-	<errorAction>IGNORE</errorAction>
-	<log>true</log>
-	<interaction>
-		<request>
-<![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:runawfe="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-  <soap:Body>
-    <GetWhoIS xmlns="http://www.webservicex.net">
-      <HostName><runawfe:variable name="DNS_name"/></HostName>
-    </GetWhoIS>
-  </soap:Body>
-</soap:Envelope>]]>
-		</request>
-		<response variable="DNS_information">
-<![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:wsx="http://www.webservicex.net" xmlns:wfe_ve="ru.runa.wf.logic.bot.WebServiceTaskHandler">
-    <xsl:script implements-prefix="wsx" language="java" src="java:ru.runa.wf.logic.bot.WebServiceTaskHandler"/>
-    <xsl:output method="text" indent="yes"/>
-    <xsl:template match="text()|@*|*|processing-instruction()|comment()"> 
-        <xsl:copy> 
-                <xsl:apply-templates select="text()|@*|*|processing-instruction()|comment()"/> 
-        </xsl:copy> 
-    </xsl:template> 
-    <xsl:template match="wsx:GetWhoISResult">
-      <xsl:variable name="variableName" value="DNS_information"/>
-      <xsl:variable name="variableValue" select="text()"/>
-      <xsl:value-of select="wfe_ve:setNewVariable('DNS_information', $variableValue)"/>
-    </xsl:template>
-</xsl:stylesheet>
-]]>
-		</response>
-	</interaction>
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties
deleted file mode 100644
index 1691a3ed89..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-swimlaneName = dddSwimlane
-assignerFunction = ru.runa.af.organizationfunction.FirstParameterAssignerFunction(${executorId})
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml
deleted file mode 100644
index ff7a6ee35b..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<msword-report-task xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml msword-report-task.xsd">
-	<!-- 
-		Bookmarks in sample-template.doc will be replaced by formated values of process variables.
-		Sample-templated will be saved as report.doc  and assigned to process variable resultWord.
-	-->
-	<report template-path="/bot/sample-template.doc" output-variable="resultWord" output-variable-file-name="report.doc">
-		<mapping bookmark="date" variable="date" />
-		<mapping bookmark="double" variable="double" />
-		<mapping bookmark="string" variable="string" />
-	</report>
-</msword-report-task>
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml
deleted file mode 100644
index edc7e686b6..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml soapHandlerConfig.xsd" url="http://localhost:8080/af.webservice/AuthenticationBean?wsdl" object="AuthenticationWebService" method="authenticateDB" service_wsdl="http://runa.ru/workflow/webservices">
-	<request>
-		<variable wfe_name="actorName" service_name="name" />
-		<variable wfe_name="actorPassword" service_name="password" />
-	</request>
-	<response>
-	</response>
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml
deleted file mode 100644
index a346a05190..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml textreport.xsd">
-	<template fileName="/bot/TextFileTemplate_demo.txt" fileEncoding="UTF8" />
-	<report fileName="textFile.txt" fileEncoding="UTF8" variableName="resultTextFile" contentType="plain/text" />
-	<replacements xmlFormat="true" applyToRegexp="false" />
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml
deleted file mode 100644
index f56528f166..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml textreport.xsd">
-	<template fileName="/bot/TextFileTemplate_demo.txt" fileEncoding="UTF8" />
-
-	<report fileName="textFile.txt" fileEncoding="UTF8" variableName="resultTextFile" contentType="plain/text" />
-
-	<replacements xmlFormat="true" applyToRegexp="false" />
-
-     <formatters>
-            <variable variableName="date" formatClass="ru.runa.wf.web.forms.format.DateFormat" pattern="dd-MM-yy" />
-      </formatters>
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml
deleted file mode 100644
index c804a24fd8..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml update-permissions.xsd">
-	<method>set</method>
-	<orgFunctions>
-		<orgFunction>ru.runa.af.organizationfunction.ExecutorByNameFunction(Dofs)</orgFunction>
-		<orgFunction>ru.runa.af.organizationfunction.ExecutorByNameFunction(?)</orgFunction>
-		<orgFunction>ru.runa.af.organizationfunction.ExecutorByNameFunction(${executorId})</orgFunction>
-	</orgFunctions>
-	<permissions>
-		<permission>permission.read</permission>
-	</permissions>
-	<condition varName="testDecisionVar" varValue="test" />
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc b/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc
deleted file mode 100644
index f722b14947d98159b766c576008e5fd858c21c39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26624
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

diff --git a/wfe-core/src/main/adminkit/conf/jndi.properties b/wfe-core/src/main/adminkit/conf/jndi.properties
deleted file mode 100644
index 908696bef3..0000000000
--- a/wfe-core/src/main/adminkit/conf/jndi.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-java.naming.factory.url.pkgs=org.jboss.ejb.client.naming
-java.naming.provider.url=remote://localhost:4447
-#java.naming.security.principal=user
-#java.naming.security.credentials=pass
-jboss.naming.client.ejb.context=true
\ No newline at end of file
diff --git a/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties b/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties
deleted file mode 100644
index f95328d7a3..0000000000
--- a/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-ejb.type=remote
-
-# How to build JNDI name for EJBs.  
-# Supported placeholders are: ${username} (user login), ${domain.name} (as specified in property 'authentication.domain.name')
-#  ${bean.name} name of the EJB
-#  ${ejb.type} as specified in property 'ejb.type'
-#  ${interface.class.name} interface class name
-#  ${jar.name} ejb jar name (i.e. wfe-service)
-# 
-#  Examples
-#  (jboss4, deploy without EAR) AD (default)           ${bean.name}/${ejb.type}
-#  (jboss4, deployed as EAR)                           runawfe/${bean.name}/${ejb.type}
-#  (jboss7, deployed as EAR, in client app)            runawfe/${jar.name}/${bean.name}!${interface.class.name}
-#  (jboss7, deployed as EAR, inside jboss)             java:global/runawfe/${jar.name}-${jar.version}/${bean.name}!${interface.class.name}
-ejb.jndiName.format=runawfe/${jar.name}-4.2.0RC/${bean.name}!${interface.class.name}
-
diff --git a/wfe-core/src/main/adminkit/ldap-importer.bat b/wfe-core/src/main/adminkit/ldap-importer.bat
deleted file mode 100644
index 89166d0b05..0000000000
--- a/wfe-core/src/main/adminkit/ldap-importer.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-
-REM ########Configuration###############
-
-set LOGIN="Administrator"
-set PASSWORD="wf"
-
-REM ########End of Configuration###############
-
-set CLASSPATH=".\conf;.\lib\*"
-
-set JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=n"
-
-java %JAVA_OPTS% -cp %CLASSPATH% ru.runa.wfe.service.client.LDAPImporterClient %LOGIN% %PASSWORD%
diff --git a/wfe-core/src/main/adminkit/ldap-importer.sh b/wfe-core/src/main/adminkit/ldap-importer.sh
deleted file mode 100644
index 81f3575865..0000000000
--- a/wfe-core/src/main/adminkit/ldap-importer.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-########Configuration###############
-LOGIN="Administrator"
-PASSWORD="wf"
-########End of Configuration###############
-
-CLASSPATH="./conf:./lib/*"
-
-java -cp ${CLASSPATH} ru.runa.wfe.service.client.LDAPImporterClient ${LOGIN} ${PASSWORD}
diff --git a/wfe-core/src/main/adminkit/lib/content b/wfe-core/src/main/adminkit/lib/content
deleted file mode 100644
index 27559d7fc8..0000000000
--- a/wfe-core/src/main/adminkit/lib/content
+++ /dev/null
@@ -1,10 +0,0 @@
-commons-codec-1.7.jar                   jboss-marshalling-1.3.11.GA.jar                 spring-core-3.1.2.RELEASE.jar
-commons-logging.jar                     jboss-marshalling-river-1.3.11.GA.jar           spring-expression-3.1.2.RELEASE.jar
-dom4j-1.6.1.jar                         jboss-remote-naming-1.0.2.Final.jar             spring-jdbc-3.1.2.RELEASE.jar
-guava-17.0.jar                          jboss-remoting-3.2.3.GA.jar                     spring-orm-3.1.2.RELEASE.jar
-jboss7ejbclient-0.0.1-SNAPSHOT.jar      jboss-sasl-1.0.0.Final.jar                      spring-tx-3.1.2.RELEASE.jar
-jboss-ejb-api_3.1_spec-1.0.1.Final.jar  jboss-transaction-api_1.1_spec-1.0.0.Final.jar  wfe-bots-4.2.0-SNAPSHOT.jar
-jboss-ejb-client-1.0.5.Final.jar        spring-aop-3.1.2.RELEASE.jar                    wfe-core-4.2.0-SNAPSHOT.jar
-jboss-logging-3.1.0.GA.jar              spring-asm-3.1.2.RELEASE.jar                    wfe-service-4.2.0-SNAPSHOT.jar
-jboss-logmanager-1.2.2.GA.jar           spring-beans-3.1.2.RELEASE.jar                  xnio-api-3.0.3.GA.jar
-jboss-logmanager-log4j-1.0.0.GA.jar     spring-context-3.1.2.RELEASE.jar                xnio-nio-3.0.3.GA.jar
diff --git a/wfe-core/src/main/adminkit/log4j.xml b/wfe-core/src/main/adminkit/log4j.xml
deleted file mode 100644
index c2c6e11512..0000000000
--- a/wfe-core/src/main/adminkit/log4j.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="File" value="client.log"/>
-      <param name="Append" value="true"/>
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-      </layout>
-   </appender>
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <category name="ru.runa">
-     <priority value="DEBUG"/>
-   </category>
-
-   <root>
-      <priority value="INFO" />
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>
diff --git a/wfe-core/src/main/adminkit/script-runner.bat b/wfe-core/src/main/adminkit/script-runner.bat
deleted file mode 100644
index d7160e9abe..0000000000
--- a/wfe-core/src/main/adminkit/script-runner.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-
-REM ########Configuration###############
-
-set SCRIPT_PATH="scripts/deploy-samples-script.xml"
-set LOGIN="Administrator"
-set PASSWORD="wf"
-
-REM ########End of Configuration###############
-
-set CLASSPATH=".\conf;.\lib\*"
-
-set JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=n"
-
-java %JAVA_OPTS% -cp %CLASSPATH% ru.runa.wfe.service.client.AdminScriptClient %SCRIPT_PATH% %LOGIN% %PASSWORD%
-
-
-
diff --git a/wfe-core/src/main/adminkit/script-runner.sh b/wfe-core/src/main/adminkit/script-runner.sh
deleted file mode 100644
index 375082b0e8..0000000000
--- a/wfe-core/src/main/adminkit/script-runner.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-########Configuration###############
-SCRIPT_PATH="scripts/deploy-samples-script.xml"
-LOGIN="Administrator"
-PASSWORD="wf"
-########End of Configuration###############
-
-CLASSPATH="./conf:./lib/*"
-
-if [ "$JAVA_HOME" != "" ]
-then
-	JAVA=$JAVA_HOME/bin/java
-else
-	JAVA=java
-fi
-
-JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=n"
-
-$JAVA $JAVA_OPTS -cp ${CLASSPATH} ru.runa.wfe.service.client.AdminScriptClient ${SCRIPT_PATH} ${LOGIN} ${PASSWORD}
diff --git a/wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml b/wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml
deleted file mode 100644
index 5490c613c5..0000000000
--- a/wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflowScript xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<createGroup name="manager" description="group for managers"/>
-	<createGroup name="human resource" description="group for human resource department"/>
-	<createGroup name="bookkeeper" description="group for bookkeepers"/>
-	<createGroup name="staff" description="group for main work personal"/>
-	<createGroup name="all" description="group for all employees"/>
-
-	<createActor name="julius" fullName="Gaius Julius Caesar" password="123" />
-	<createActor name="nero" fullName="Nero Claudius Caesar" password="123" />
-	<createActor name="cleopatra" fullName="Cleopatra VII The Daughter of the Pharaoh" password="123" />
-	<createActor name="octavia" fullName="Octavia Minor" password="123" />
-	<createActor name="tiberius" fullName="Tiberius Claudius Drusus" password="123" />
-	<createActor name="marcus" fullName="Marcus Aurelius Antoninus" password="123" />
-	<createActor name="gaiua" fullName="Gaiua Flavius Valerius Constantinus" password="123" />
-	<createActor name="attila" fullName="Attila the King of Huns" password="123" />
-	<createActor name="caligula" fullName="Gaius Iulius Germanicus" password="123" />
-	<createActor name="UniversalBot" fullName="Bot for a Demo" password="321" />
-	<createActor name="StopBot" fullName="Bot for stopping old processes" password="321" />
-	<createActor name="WebServiceBot" fullName="Bot for executing web service requests" password="321" />
-
-	<namedIdentitySet name="allProcesses" type="ProcessDefinition">
-		<identity name="TextFileCreation"/>
-		<identity name="BotDemo"/>
-		<identity name="Businesstrip"/>
-		<identity name="Vacation"/>
-		<identity name="Overtime Work"/>
-		<identity name="Report"/>
-		<identity name="FileUpload"/>
-		<identity name="Hello World"/>
-		<identity name="SubProcess"/>
-		<identity name="MainProcess"/>
-		<identity name="MultiInstanceSubProcess"/>
-		<identity name="MultiInstanceProcess"/>
-		<identity name="ExecuteFormulaDemo"/>
-		<identity name="TimerDemo"/>
-		<identity name="BPMNdemo"/>
-		<identity name="AjaxFormDemo"/>
-		<identity name="WebService - who is"/>
-		<identity name="MSWordReport"/>
-	</namedIdentitySet>
-	<namedIdentitySet name="managerProcesses" type="ProcessDefinition">
-		<identity name="Businesstrip"/>
-		<identity name="Overtime Work"/>
-		<identity name="Report"/>
-	</namedIdentitySet>
-	<namedIdentitySet name="genericProcesses" type="ProcessDefinition">
-		<identity name="TextFileCreation"/>
-		<identity name="BotDemo"/>
-		<identity name="Vacation"/>
-		<identity name="FileUpload"/>
-		<identity name="Hello World"/>
-		<identity name="MainProcess"/>
-		<identity name="MultiInstanceProcess"/>
-		<identity name="ExecuteFormulaDemo"/>
-		<identity name="TimerDemo"/>
-		<identity name="AjaxFormDemo"/>
-		<identity name="BPMNdemo"/>
-		<identity name="WebService - who is"/>
-		<identity name="MSWordReport"/>
-	</namedIdentitySet>
-		
-	<namedIdentitySet name="allActors" type="Executor">
-		<identity name="julius"/>
-		<identity name="nero"/>
-		<identity name="cleopatra"/>
-		<identity name="octavia"/>
-		<identity name="tiberius"/>
-		<identity name="marcus"/>
-		<identity name="gaiua"/>
-		<identity name="attila"/>
-		<identity name="caligula"/>
-		<identity name="UniversalBot"/>
-	</namedIdentitySet>
-	<namedIdentitySet name="allGroupsExceptALL" type="Executor">
-		<identity name="manager"/>
-		<identity name="human resource"/>
-		<identity name="bookkeeper"/>
-		<identity name="staff"/>
-	</namedIdentitySet>
-
-	<deployProcessDefinition file="../samples/Hello World.par" />
-	<deployProcessDefinition file="../samples/BPMNdemo.par" />
-	<deployProcessDefinition file="../samples/ExecuteFormulaDemo.par"/>
-	<deployProcessDefinition file="../samples/AjaxFormDemo.par" />
-	<deployProcessDefinition file="../samples/FileUpload.par" />
-	<deployProcessDefinition file="../samples/TimerDemo.par" />
-	<deployProcessDefinition file="../samples/Report.par" />
-	<deployProcessDefinition file="../samples/Overtime Work.par" />
-	<deployProcessDefinition file="../samples/Vacation.par" /> 
-	<deployProcessDefinition file="../samples/Businesstrip.par" />
-	<deployProcessDefinition file="../samples/MainProcess.par" />
-	<deployProcessDefinition file="../samples/SubProcess.par" />
-	<deployProcessDefinition file="../samples/MultiInstanceProcess.par" />
-	<deployProcessDefinition file="../samples/MultiInstanceSubProcess.par" />
-	<deployProcessDefinition file="../samples/BotDemo.par" />
-	<deployProcessDefinition file="../samples/TextFileCreation.par" />
-	<deployProcessDefinition file="../samples/WebService - who is.par" />
-	<deployProcessDefinition file="../samples/MSWordReport.par" />
-
-	<addPermissionsOnDefinition executor="all">
-		<namedIdentitySet name="allProcesses" type="ProcessDefinition"/>
-		<permission name="permission.read"/>
-		<permission name="permission.read_process"/>
-	</addPermissionsOnDefinition>
-	<addPermissionsOnDefinition executor="manager">
-		<namedIdentitySet name="managerProcesses" type="ProcessDefinition"/>
-		<permission name="permission.start_process"/>
-	</addPermissionsOnDefinition>
-	<addPermissionsOnDefinition executor="all">
-		<namedIdentitySet name="genericProcesses" type="ProcessDefinition"/>
-		<permission name="permission.start_process"/>
-	</addPermissionsOnDefinition>
-
-	<addExecutorsToGroup name="Administrators">
-		<executor name="StopBot"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="manager">
-		<executor name="julius"/>
-		<executor name="nero"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="human resource">
-		<executor name="cleopatra"/>
-		<executor name="octavia"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="bookkeeper">
-		<executor name="caligula"/>
-		<executor name="tiberius"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="staff">
-		<executor name="marcus"/>
-		<executor name="gaiua"/>
-		<executor name="attila"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="all">
-		<namedIdentitySet name="allActors" type="Executor"/>
-	</addExecutorsToGroup>
-
-	<addPermissionsOnSystem executor="all">
-		<permission name="permission.read"/>
-		<permission name="permission.login_to_system"/>
-	</addPermissionsOnSystem> 
-	
-	<addPermissionsOnGroup executor="all">
-		<namedIdentitySet name="allGroupsExceptALL" type="Executor"/>
-		<permission name="permission.read"/>
-		<permission name="permission.list_group"/>
-	</addPermissionsOnGroup>
-
-	<addPermissionsOnActor executor="all">
-		<namedIdentitySet name="allActors" type="Executor"/>
-		<permission name="permission.read"/>
-	</addPermissionsOnActor>
-
-	<addPermissionsOnBotStations executor="UniversalBot">
-		<permission name="permission.read"/>
-	</addPermissionsOnBotStations>
-	<addPermissionsOnBotStations executor="StopBot">
-		<permission name="permission.read"/>
-	</addPermissionsOnBotStations>
-	<addPermissionsOnBotStations executor="WebServiceBot">
-		<permission name="permission.read"/>
-	</addPermissionsOnBotStations>
-	
-	<createBotStation name="localbotstation" address="localhost:10099" />
-	<createBot botStation="localbotstation" name="UniversalBot" password="321" startTimeout="200"/>
-	<createBot botStation="localbotstation" name="StopBot" password="321" startTimeout="200"/>
-	<createBot botStation="localbotstation" name="WebServiceBot" password="321" startTimeout="200"/>
-	<addConfigurationsToBot botStation="localbotstation" name="UniversalBot">
-		<botConfiguration name="DoNothing" handler="ru.runa.wf.logic.bot.DoNothingTaskHandler" configuration="" />
-		<botConfiguration name = "create text file" handler="ru.runa.wf.logic.bot.TextReportTaskHandler" configuration="bot/handler/textFile.xml" />
-		<botConfiguration name = "Generate MS Word Report" handler="ru.runa.wf.logic.bot.MSWordReportTaskHandler" configuration="bot/handler/msword-report.xml" />
-	</addConfigurationsToBot>
-	<addConfigurationsToBot botStation="localbotstation" name="StopBot">
-		<botConfiguration name="state1" handler="ru.runa.wf.logic.bot.CancelOldProcesses" configuration=""/>
-	</addConfigurationsToBot>
-	<addConfigurationsToBot botStation="localbotstation" name="WebServiceBot">
-		<botConfiguration name="Load whois information" handler="ru.runa.wf.logic.bot.WebServiceTaskHandler" configuration="bot/demo/soapBot-whois.xml"/>
-	</addConfigurationsToBot>
-	
-	<relation name="Boss">
-		<left>
-			<executor name="nero"/>
-		</left>
-		<right>
-			<executor name="caligula"/>
-			<executor name="attila"/>
-		</right>
-	</relation>
-	<relation name="Boss">
-		<left>
-			<executor name="julius"/>
-		</left>
-		<right>
-			<executor name="julius"/>
-			<executor name="nero"/>
-			<executor name="cleopatra"/>
-			<executor name="octavia"/>
-			<executor name="tiberius"/>
-			<executor name="marcus"/>
-		</right>
-	</relation>
-	
-</workflowScript>
diff --git a/wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml b/wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml
deleted file mode 100644
index c413b742af..0000000000
--- a/wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflowScript xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	 <!-- This script was designed to demonstrate features of RUNA WFE scripting language
-	 it shows how to create/remove executors, grant/set/removke permissions etc.
-	 -->
-	<createGroup name="employee"/>
-	<createGroup name="boss"/>
-	<createActor name="dorothy" fullName="Dorothy Gale" />
-	<createActor name="toto" description="Dorothy's dog" />
-	<createActor name="lion" fullName="The Cowardly Lion" />
-	<createActor name="scarecrow" fullName="The Scarecrow" />
-	<createActor name="tin" fullName="The Tin Man"  password="secretword" />
-	<createActor name="gulch" fullName="The Wicked Witch of the West"  description="Someone we will create and delete in this script" />
-
-	<addExecutorsToGroup name="employee">
-		<executor name="lion"/>
-		<executor name="dorothy"/>
-		<executor name="scarecrow"/>
-		<executor name="tin"/>
-		<executor name="gulch"/>
-	</addExecutorsToGroup>
-	
-	<removeExecutorsFromGroup name="employee">
-		<executor name="dorothy"/>
-	</removeExecutorsFromGroup>
-
-	<addExecutorsToGroup name="boss">
-		<executor name="dorothy"/>
-	</addExecutorsToGroup>
-
-	<setPermissionsOnActor name="toto" executor="dorothy">
-		<permission name="permission.update_permissions"/>
-	</setPermissionsOnActor>
-
-	<addPermissionsOnActor name="toto" executor="dorothy">
-		<permission name="permission.read"/>
-	</addPermissionsOnActor>
-
-	<removePermissionsOnActor name="toto" executor="dorothy">
-		<permission name="permission.update_permissions"/>
-	</removePermissionsOnActor>
-
-	<setPermissionsOnGroup name="employee" executor="dorothy">
-		<permission name="permission.read"/>
-		<permission name="permission.update_permissions"/>
-	</setPermissionsOnGroup>
-
-	<addPermissionsOnGroup name="employee" executor="dorothy">
-		<permission name="permission.list_group"/>
-		<permission name="permission.add_to_group"/>
-		<permission name="permission.remove_from_group"/>
-	</addPermissionsOnGroup>
-
-	<removePermissionsOnGroup name="employee" executor="dorothy">
-		<permission name="permission.update_permissions"/>
-	</removePermissionsOnGroup>
-
-	<addPermissionsOnGroup name="employee" executor="employee">
-		<permission name="permission.read"/>
-		<permission name="permission.list_group"/>
-		<permission name="permission.add_to_group"/>
-		<permission name="permission.remove_from_group"/>
-	</addPermissionsOnGroup>
-
-	<addPermissionsOnActor name="tin" executor="employee">
-		<permission name="permission.read"/>
-		<permission name="permission.update_permissions"/>
-	</addPermissionsOnActor>
-
-	<setPermissionsOnDefinition name="Vacation" executor="employee">
-		<permission name="permission.read"/>
-	</setPermissionsOnDefinition>
-	
-	<addPermissionsOnDefinition name="Vacation" executor="employee">
-		<permission name="permission.read"/>
-		<permission name="permission.update_permissions"/>
-		<permission name="permission.redeploy_definition"/>
-		<permission name="permission.undeploy_definition"/>
-		<permission name="permission.start_process"/>
-		<permission name="permission.read_process"/>
-	</addPermissionsOnDefinition>
-	
-	<removePermissionsOnDefinition name="Vacation" executor="employee">
-		<permission name="permission.update_permissions"/>
-	</removePermissionsOnDefinition>
-	
-	<setPermissionsOnProcesses name="Vacation" executor="employee">
-		<permission name="permission.read" />
-		<permission name="permission.update_permissions" />
-	</setPermissionsOnProcesses>
-	
-	
-	<addPermissionsOnProcesses name="Vacation" executor="employee">
-		<permission name="permission.cancel_process" />
-	</addPermissionsOnProcesses>
-
-    <removePermissionsOnProcesses name="Vacation" executor="employee">
-		<permission name="permission.update_permissions" />
-	</removePermissionsOnProcesses>
-
-	<setPermissionsOnSystem executor="employee">
-		<permission name="permission.read" />
-		<permission name="permission.update_permissions" />
-	</setPermissionsOnSystem>
-
-	<addPermissionsOnSystem executor="employee">
-		<permission name="permission.login_to_system" />
-	</addPermissionsOnSystem>
-
-    <removePermissionsOnSystem executor="employee">
-		<permission name="permission.update_permissions" />
-	</removePermissionsOnSystem>
-
-	<deleteExecutor name="gulch" />
-
-	<!-- not implemented yet
-	<removeAllPermissionsFromSystem />
-	<removeAllPermissionsFromExecutor name="toto" />
-	<removeAllPermissionsFromProcessDefinition name="over time work demo" />
-	<removeAllPermissionsFromProcesses name="over time work demo" />
-	-->
-
-<!-- List of all possible permissions
-permission.read
-permission.update_permissions
-permission.login_to_system
-permission.create_executor
-permission.deploy_definition
-permission.update_executor
-permission.list_group
-permission.add_to_group
-permission.remove_from_group
-permission.redeploy_definition
-permission.undeploy_definition
-permission.start_process
-permission.read_process
-permission.cancel_process
-permission.bot_station_configure
--->
-
-
-</workflowScript>
diff --git a/wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml b/wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml
deleted file mode 100644
index 22f34c3e5e..0000000000
--- a/wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflowScript xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<!--used format pattern for DateTime="2007-02-02T23:59:59" -->
-<!--  
- <removeOldProcesses id="9" /> 
- <removeOldProcesses id="1" idTill="100"/> 
- <removeOldProcesses startDate="2010-06-23T11:30:00" endDate="2010-06-23T11:32:00" dateInterval="true" />
- <removeOldProcesses endDate="2010-05-20T20:00:00" /> 
- <removeOldProcesses startDate="2010-05-20T20:00:00" />
- <removeOldProcesses startDate="2009-10-06T18:30:00" endDate="2009-10-07T12:01:00" /> 
- <removeOldProcesses startDate="2010-05-28T20:00:00" name="Vacation" version="2" /> 
- <removeOldProcesses startDate="2010-05-28T20:00:00" name="Vacation" /> 
- <removeOldProcesses startDate="2010-05-28T20:00:00" name="Vacation" onlyFinished="false"/> 
- <removeOldProcessDefinitionVersion name="Vacation" version="5" />
- 
-  <archiveOldProcesses id="69" />
-  <archiveOldProcesses id="400" idTill="420" />
-  <archiveOldProcesses startDate="2010-06-23T11:30:00" endDate="2010-06-23T11:32:00" dateInterval="true" />  
-
-  <archiveOldProcesses startDate="2010-05-28T16:36:00" />  
-  <archiveOldProcesses startDate="2010-06-04T15:00:00" name="Vacation" version="2" /> 
- <archiveOldProcesses startDate="2009-12-29T13:29:00" />
-
- -->
- 
- <archiveOldProcesses id="1" idTill="100"/> 
- 
- 
-</workflowScript>

From 723cb197073052d01ea933ff1dd057022ead6ebf Mon Sep 17 00:00:00 2001
From: Vladimir Ponomarev <kusjahq@yahoo.com>
Date: Fri, 17 May 2019 09:18:55 +0700
Subject: [PATCH 4/6] Remotebots removed

---
 wfe-appserver/pom.xml                         | 18 -----
 .../src/assembly/4/wfe-bots-diff.xml          | 24 ------
 .../src/assembly/7/wfe-bots-diff.xml          | 31 -------
 wfe-remotebots/pom.xml                        | 81 -------------------
 .../src/main/application/jndi.properties      | 14 ----
 .../wfe.custom.botstation.properties          |  7 --
 .../application/wfe.custom.ejb.properties     | 14 ----
 7 files changed, 189 deletions(-)
 delete mode 100644 wfe-appserver/src/assembly/4/wfe-bots-diff.xml
 delete mode 100644 wfe-appserver/src/assembly/7/wfe-bots-diff.xml
 delete mode 100644 wfe-remotebots/pom.xml
 delete mode 100644 wfe-remotebots/src/main/application/jndi.properties
 delete mode 100644 wfe-remotebots/src/main/application/wfe.custom.botstation.properties
 delete mode 100644 wfe-remotebots/src/main/application/wfe.custom.ejb.properties

diff --git a/wfe-appserver/pom.xml b/wfe-appserver/pom.xml
index 7dd5b61451..f5ace5db96 100644
--- a/wfe-appserver/pom.xml
+++ b/wfe-appserver/pom.xml
@@ -63,12 +63,6 @@
 			<version>${project.version}</version>
 			<type>ear</type>
 		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-remotebots</artifactId>
-			<version>${project.version}</version>
-			<type>ear</type>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -133,18 +127,6 @@
 							</descriptors>
 						</configuration>
 					</execution>
-					<execution>
-						<id>assemble-server-remotebots</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>src/assembly/7/wfe-bots-diff.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
diff --git a/wfe-appserver/src/assembly/4/wfe-bots-diff.xml b/wfe-appserver/src/assembly/4/wfe-bots-diff.xml
deleted file mode 100644
index 64a91dc30c..0000000000
--- a/wfe-appserver/src/assembly/4/wfe-bots-diff.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-	<id>remotebots-${version}</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>ru.runa.wfe:wfe-remotebots</include>
-			</includes>
-			<unpack>true</unpack>
-			<outputDirectory>jboss/server/default/deploy/runawfe.ear</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
diff --git a/wfe-appserver/src/assembly/7/wfe-bots-diff.xml b/wfe-appserver/src/assembly/7/wfe-bots-diff.xml
deleted file mode 100644
index 0b93642016..0000000000
--- a/wfe-appserver/src/assembly/7/wfe-bots-diff.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-	<id>remotebots-${version}</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/src/main/resources/deployment</directory>
-			<outputDirectory>jboss/standalone/deployments</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>ru.runa.wfe:wfe-remotebots</include>
-			</includes>
-			<unpack>true</unpack>
-			<outputDirectory>jboss/standalone/deployments/runawfe.ear</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
diff --git a/wfe-remotebots/pom.xml b/wfe-remotebots/pom.xml
deleted file mode 100644
index 6783d557d3..0000000000
--- a/wfe-remotebots/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ru.runa.wfe</groupId>
-		<artifactId>wfe-app</artifactId>
-		<version>4-SNAPSHOT</version>
-		<relativePath>../wfe-app/pom.xml</relativePath>
-	</parent>
-
-	<artifactId>wfe-remotebots</artifactId>
-	<packaging>ear</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-service</artifactId>
-			<version>${project.version}</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-bots</artifactId>
-			<version>${project.version}</version>
-			<type>ejb</type>
-		</dependency>
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>jboss7</id>
-			<activation>
-				<property>
-					<name>appserver</name>
-				</property>
-			</activation>
-			<properties>
-				<java.naming.factory.initial>org.jboss.naming.remote.client.InitialContextFactory</java.naming.factory.initial>
-				<java.naming.provider.url>remote://localhost:4447</java.naming.provider.url>
-				<java.naming.factory.url.pkgs></java.naming.factory.url.pkgs>
-				<jboss.naming.client.ejb.context>true</jboss.naming.client.ejb.context>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-ear-plugin</artifactId>
-						<configuration>
-							<finalName>runawfe</finalName>
-							<displayName>RunaWFE remote botstation</displayName>
-							<version>5</version>
-							<defaultLibBundleDir>lib</defaultLibBundleDir>
-							<filtering>true</filtering>
-							<modules>
-								<jarModule>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>wfe-core</artifactId>
-								</jarModule>
-								<jarModule>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>wfe-service</artifactId>
-								</jarModule>
-								<ejbModule>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>wfe-bots</artifactId>
-								</ejbModule>
-							</modules>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-</project>
diff --git a/wfe-remotebots/src/main/application/jndi.properties b/wfe-remotebots/src/main/application/jndi.properties
deleted file mode 100644
index 91238ae2f8..0000000000
--- a/wfe-remotebots/src/main/application/jndi.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# JbossAS4
-# java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-# java.naming.provider.url=jnp://rtwf.rtr.ru:10099
-# java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-
-# JbossAS7
-# java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-# java.naming.provider.url=remote://localhost:4447
-# jboss.naming.client.ejb.context=true
-
-java.naming.factory.initial=${java.naming.factory.initial}
-java.naming.provider.url=${java.naming.provider.url}
-java.naming.factory.url.pkgs=${java.naming.factory.url.pkgs}
-jboss.naming.client.ejb.context=${jboss.naming.client.ejb.context}
diff --git a/wfe-remotebots/src/main/application/wfe.custom.botstation.properties b/wfe-remotebots/src/main/application/wfe.custom.botstation.properties
deleted file mode 100644
index 4185e6be61..0000000000
--- a/wfe-remotebots/src/main/application/wfe.custom.botstation.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# customization goes here
-
-#botstation.invocation.period.seconds = 300
-#botstation.system.username = Administrator
-#botstation.system.password = wf
-
-#bot.logger.class=ru.runa.wfe.botlogger.RunaBotLogger
diff --git a/wfe-remotebots/src/main/application/wfe.custom.ejb.properties b/wfe-remotebots/src/main/application/wfe.custom.ejb.properties
deleted file mode 100644
index 99e2fddebf..0000000000
--- a/wfe-remotebots/src/main/application/wfe.custom.ejb.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-ejb.type=remote
-
-# How to build JNDI name for EJBs.  
-# Supported placeholders are: ${username} (user login), ${domain.name} (as specified in property 'authentication.domain.name')
-#  ${bean.name} name of the EJB
-#  ${ejb.type} as specified in property 'ejb.type'
-#  ${interface.class.name} interface class name
-# 
-#  Examples
-#  (jboss4, deploy without EAR) AD (default)           ${bean.name}/${ejb.type}
-#  (jboss4, deployed as EAR)                           runawfe/${bean.name}/${ejb.type}
-#  (jboss7, deployed as EAR, in client app)            runawfe/wfe.service/${bean.name}!${interface.class.name}
-#  (jboss7, deployed as EAR, inside jboss)             java:global/runawfe/wfe.service/${bean.name}!${interface.class.name}
-ejb.jndiName.format=runawfe/${bean.name}/${ejb.type}

From 05b9de173d94e7155f952cb6ab7b4d5d0609ee84 Mon Sep 17 00:00:00 2001
From: Dofs <dofs197@gmail.com>
Date: Thu, 25 Apr 2019 10:08:48 +0300
Subject: [PATCH 5/6] rm1070: MergeDocxHandler hyperlinks fixed

---
 .../runa/wfe/office/doc/MergeDocxHandler.java | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java b/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java
index c7e16e6aa7..1564f3bf69 100644
--- a/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java
+++ b/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java
@@ -9,8 +9,12 @@
 import org.apache.poi.xwpf.converter.pdf.PdfOptions;
 import org.apache.poi.xwpf.usermodel.IBodyElement;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRelation;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHyperlink;
 import ru.runa.wfe.definition.FileDataProvider;
 import ru.runa.wfe.office.doc.MergeDocxConfig.DocxInfo;
 import ru.runa.wfe.office.shared.FilesSupplierConfigParser;
@@ -43,14 +47,32 @@ protected Map<String, Object> executeAction(VariableProvider variableProvider, F
                 for (IBodyElement bodyElement : mergingDocument.getBodyElements()) {
                     if (bodyElement instanceof XWPFParagraph) {
                         XWPFParagraph paragraph = (XWPFParagraph) bodyElement;
-                        document.createParagraph();
+                        List<XWPFRun> runs = paragraph.getRuns();
+                        XWPFParagraph newParagraph = document.createParagraph();
+                        XWPFRun newRun = null;
+                        for (XWPFRun run : runs) {
+                            if (run instanceof XWPFHyperlinkRun) {
+                                XWPFHyperlinkRun hlRun = (XWPFHyperlinkRun) run;
+                                String rId = newParagraph
+                                        .getPart()
+                                        .getPackagePart()
+                                        .addExternalRelationship(hlRun.getCTHyperlink().getRArray(0).getTArray(0).getStringValue(),
+                                                XWPFRelation.HYPERLINK.getRelation()).getId();
+                                CTHyperlink newHyperlink = newParagraph.getCTP().addNewHyperlink();
+                                newHyperlink.set(hlRun.getCTHyperlink());
+                                newHyperlink.setId(rId);
+                                newRun = new XWPFHyperlinkRun(newHyperlink, newHyperlink.getRArray(0), newParagraph);
+                                newParagraph.addRun(newRun);
+                            } else {
+                                newRun = newParagraph.createRun();
+                                newRun.getCTR().set(run.getCTR());
+                            }
+                        }
                         if (docxInfo.addBreak) {
-                            paragraph.setPageBreak(true);
+                            newParagraph.setPageBreak(true);
                             docxInfo.addBreak = false;
                         }
-                        document.setParagraph(paragraph, document.getParagraphs().size() - 1);
-                    }
-                    if (bodyElement instanceof XWPFTable) {
+                    } else if (bodyElement instanceof XWPFTable) {
                         XWPFTable table = (XWPFTable) bodyElement;
                         document.createTable();
                         document.setTable(document.getTables().size() - 1, table);

From bb601f99990450db5291c95d35175c92bb8794b1 Mon Sep 17 00:00:00 2001
From: Vladimir Ponomarev <kusjahq@yahoo.com>
Date: Tue, 11 Jun 2019 05:43:54 +0700
Subject: [PATCH 6/6] RM Feature #1087

---
 .../main/webapp/WEB-INF/af/main_layout.jsp    |   2 +-
 .../main/webapp/WEB-INF/common/version.jsp    |   2 +-
 wfe-web/src/main/webapp/images/big_logo.gif   | Bin 4590 -> 3870 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp b/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp
index 0701347c49..2c059b5bb9 100644
--- a/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp
+++ b/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp
@@ -105,7 +105,7 @@
 				--%>
 				<%= WebResources.getAdditionalLinks() %>
 				<div style="padding: 3px; color: #aaa;">
-					<bean:message key="title.version"/> <b><%= Version.get() %></b>
+					<bean:message key="title.version"/> <b><%= Version.get() %> Free</b>
 				</div>
 				<div style="padding: 3px; color: #ccc;">
 					<bean:message key="title.build"/>
diff --git a/wfe-web/src/main/webapp/WEB-INF/common/version.jsp b/wfe-web/src/main/webapp/WEB-INF/common/version.jsp
index 361c4139cb..524e100d65 100644
--- a/wfe-web/src/main/webapp/WEB-INF/common/version.jsp
+++ b/wfe-web/src/main/webapp/WEB-INF/common/version.jsp
@@ -5,7 +5,7 @@
 <tiles:insert page="/WEB-INF/af/main_layout.jsp" flush="true">
 
 <tiles:put name="body" type="string" >
-	<p>Версия <b><%= ru.runa.common.Version.get() %></b></p>
+	<p>Версия <b><%= ru.runa.common.Version.get() %> Free</b></p>
 	<p>Запуск <b><%= ru.runa.common.Version.getStartupDateTimeString() %></b></p>
 </tiles:put>
 
diff --git a/wfe-web/src/main/webapp/images/big_logo.gif b/wfe-web/src/main/webapp/images/big_logo.gif
index 7633323390aefc1855235c639181156d694623f0..aee00f2efa1b1edc84f3abbd545d9aad2b59ea1e 100644
GIT binary patch
literal 3870
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
HfbstTX!(<g

literal 4590
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