Merge branch 'master' into github

# Conflicts: # .gitignore # plugins/ru.runa.gpd/src/ru/runa/gpd/aspects/ProcessEditorUserActivity.aj # plugins/ru.runa.gpd/src/ru/runa/gpd/editor/ProcessEditorBase.java # plugins/ru.runa.gpd/src/ru/runa/gpd/editor/SwimlaneEditorPage.java # plugins/ru.runa.gpd/src/ru/runa/gpd/editor/graphiti/create/CreateDragAndDropElementFeature.java # plugins/ru.runa.gpd/src/ru/runa/gpd/editor/graphiti/create/CreateElementFeature.java # plugins/ru.runa.gpd/src/ru/runa/gpd/editor/graphiti/update/MoveElementFeature.java # plugins/ru.runa.gpd/src/ru/runa/gpd/extension/handler/ParamBasedProvider.java # plugins/ru.runa.gpd/src/ru/runa/gpd/lang/model/GraphElement.java # plugins/ru.runa.gpd/src/ru/runa/gpd/settings/CommonPreferencePage.java # plugins/ru.runa.gpd/src/ru/runa/gpd/settings/PrefConstants.java # plugins/ru.runa.gpd/src/ru/runa/gpd/settings/PreferenceInitializer.java # plugins/ru.runa.gpd/src/ru/runa/gpd/util/EmbeddedFileUtils.java # plugins/ru.runa.gpd/src/ru/runa/gpd/util/IOUtils.java
processtech · May 16, 2022 · dd92a9d · dd92a9d
2 parents 69c3c1a + 3008065
commit dd92a9d
Show file tree

Hide file tree

Showing 203 changed files with 7,034 additions and 1,556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@ spz-devstudio-pom.xml
 .settings
 *.iml
 .idea
-plugins/workspace
-
+/.project
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ru.runa.gpd</groupId>
 	<artifactId>gpd</artifactId>
-	<version>4.4.0-SNAPSHOT</version>
+	<version>4.4.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>ru.runa.gpd</module>

diff --git a/plugins/ru.runa.gpd.alfresco/META-INF/MANIFEST.MF b/plugins/ru.runa.gpd.alfresco/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RunaWFE Developer Studio Alfresco integration
 Bundle-SymbolicName: ru.runa.gpd.alfresco;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.3.qualifier
 Bundle-Activator: ru.runa.gpd.alfresco.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/plugins/ru.runa.gpd.alfresco/pom.xml b/plugins/ru.runa.gpd.alfresco/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.runa.gpd</groupId>
     <artifactId>gpd</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.4.3-SNAPSHOT</version>
   </parent>
   <groupId>ru.runa.gpd</groupId>
   <artifactId>ru.runa.gpd.alfresco</artifactId>

diff --git a/plugins/ru.runa.gpd.apis_removed_from_j11/META-INF/MANIFEST.MF b/plugins/ru.runa.gpd.apis_removed_from_j11/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apis_removed_from_j11
 Bundle-SymbolicName: ru.runa.gpd.apis_removed_from_j11
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.3.qualifier
 Automatic-Module-Name: ru.runa.gpd.apis_removed_from_j11
 Bundle-ClassPath: lib/gmbal-4.0.1.jar,
  lib/istack-commons-runtime-3.0.8.jar,

diff --git a/plugins/ru.runa.gpd.apis_removed_from_j11/pom.xml b/plugins/ru.runa.gpd.apis_removed_from_j11/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.runa.gpd</groupId>
     <artifactId>gpd</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.4.3-SNAPSHOT</version>
   </parent>
   <groupId>ru.runa.gpd</groupId>
   <artifactId>ru.runa.gpd.apis_removed_from_j11</artifactId>

diff --git a/plugins/ru.runa.gpd.app/META-INF/MANIFEST.MF b/plugins/ru.runa.gpd.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RunaWFE Developer Studio application
 Bundle-SymbolicName: ru.runa.gpd.app; singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.3.qualifier
 Bundle-Vendor: Runa
 Require-Bundle: ru.runa.gpd,
  org.eclipse.core.runtime,

diff --git a/plugins/ru.runa.gpd.app/pom.xml b/plugins/ru.runa.gpd.app/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.runa.gpd</groupId>
     <artifactId>gpd</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.4.3-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.runa.gpd</groupId>

diff --git a/plugins/ru.runa.gpd.babel.nls_p2_ru.feature/feature.xml b/plugins/ru.runa.gpd.babel.nls_p2_ru.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="ru.runa.gpd.babel.nls_p2_ru.feature"
       label="Babel Language Pack for Equinox.p2 in Russian Feature"
-      version="4.4.0.qualifier"
+      version="4.4.3.qualifier"
       provider-name="Process Technologies Ltd.">
 
    <description url="http://www.example.com/description">

diff --git a/plugins/ru.runa.gpd.babel.nls_p2_ru.feature/pom.xml b/plugins/ru.runa.gpd.babel.nls_p2_ru.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.runa.gpd</groupId>
     <artifactId>gpd</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.4.3-SNAPSHOT</version>
   </parent>
   <groupId>ru.runa.gpd</groupId>
   <artifactId>ru.runa.gpd.babel.nls_p2_ru.feature</artifactId>

diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/.classpath b/plugins/ru.runa.gpd.connector.wfe.ws/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/jboss-jaxws-ext.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/wfe-webservice-client.jar"/>

diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/META-INF/MANIFEST.MF b/plugins/ru.runa.gpd.connector.wfe.ws/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RunaWFE Developer Studio Server integration through WebServices API
 Bundle-SymbolicName: ru.runa.gpd.connector.wfe.ws;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.3.qualifier
 Bundle-Activator: ru.runa.gpd.connector.wfe.ws.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  ru.runa.gpd,
  ru.runa.gpd.apis_removed_from_j11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: lib/wfe-webservice-client.jar,
- .,
- lib/jboss-jaxws-ext.jar
+ .
 Bundle-Vendor: Runa
diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/build.properties b/plugins/ru.runa.gpd.connector.wfe.ws/build.properties
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                lib/wfe-webservice-client.jar,\
-               lib/jboss-jaxws-ext.jar,\
                OSGI-INF/l10n/bundle.properties
diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/lib/jboss-jaxws-ext.jar b/plugins/ru.runa.gpd.connector.wfe.ws/lib/jboss-jaxws-ext.jar
diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/lib/wfe-webservice-client.jar b/plugins/ru.runa.gpd.connector.wfe.ws/lib/wfe-webservice-client.jar
diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/plugin.xml b/plugins/ru.runa.gpd.connector.wfe.ws/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="ru.runa.gpd.wfeServerConnectors">
       <connector
-            class="ru.runa.gpd.connector.wfe.ws.WildflyWebServiceWfeServerConnector"
+            class="ru.runa.gpd.connector.wfe.ws.WebServiceWfeServerConnector"
             description="%wildfly.ws.connector.description"
             id="wildfly.ws"
             name="%wildfly.ws.connector.name">

diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/pom.xml b/plugins/ru.runa.gpd.connector.wfe.ws/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.runa.gpd</groupId>
     <artifactId>gpd</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.4.3-SNAPSHOT</version>
   </parent>
   <groupId>ru.runa.gpd</groupId>
   <artifactId>ru.runa.gpd.connector.wfe.ws</artifactId>

diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/src/ru/runa/gpd/connector/wfe/ws/BotAdapter.java b/plugins/ru.runa.gpd.connector.wfe.ws/src/ru/runa/gpd/connector/wfe/ws/BotAdapter.java
@@ -1,18 +1,15 @@
 package ru.runa.gpd.connector.wfe.ws;
 
+import com.google.common.collect.Lists;
 import java.util.List;
-
 import ru.runa.wfe.bot.Bot;
 
-import com.google.common.collect.Lists;
-
 public class BotAdapter {
 
     public static Bot toDTO(ru.runa.wfe.webservice.Bot bot) {
         Bot result = new Bot();
         result.setId(bot.getId());
         result.setCreateDate(DateAdapter.toDTO(bot.getCreateDate()));
-        result.setPassword(bot.getPassword());
         result.setUsername(bot.getUsername());
         result.setVersion(bot.getVersion());
         return result;
@@ -30,7 +27,6 @@ public static ru.runa.wfe.webservice.Bot toJAXB(Bot bot) {
         ru.runa.wfe.webservice.Bot result = new ru.runa.wfe.webservice.Bot();
         result.setId(bot.getId());
         result.setCreateDate(DateAdapter.toJAXB(bot.getCreateDate()));
-        result.setPassword(bot.getPassword());
         result.setUsername(bot.getUsername());
         result.setVersion(bot.getVersion());
         return result;

diff --git a/plugins/ru.runa.gpd.connector.wfe.ws/src/ru/runa/gpd/connector/wfe/ws/BotStationAdapter.java b/plugins/ru.runa.gpd.connector.wfe.ws/src/ru/runa/gpd/connector/wfe/ws/BotStationAdapter.java
@@ -1,11 +1,9 @@
 package ru.runa.gpd.connector.wfe.ws;
 
+import com.google.common.collect.Lists;
 import java.util.List;
-
 import ru.runa.wfe.bot.BotStation;
 
-import com.google.common.collect.Lists;
-
 public class BotStationAdapter {
 
     public static BotStation toDTO(ru.runa.wfe.webservice.BotStation botStation) {
@@ -16,7 +14,6 @@ public static BotStation toDTO(ru.runa.wfe.webservice.BotStation botStation) {
         result.setId(botStation.getId());
         result.setCreateDate(DateAdapter.toDTO(botStation.getCreateDate()));
         result.setVersion(botStation.getVersion());
-        result.setAddress(botStation.getAddress());
         result.setName(botStation.getName());
         return result;
     }
@@ -34,7 +31,6 @@ public static ru.runa.wfe.webservice.BotStation toJAXB(BotStation botStation) {
         result.setId(botStation.getId());
         result.setCreateDate(DateAdapter.toJAXB(botStation.getCreateDate()));
         result.setVersion(botStation.getVersion());
-        result.setAddress(botStation.getAddress());
         result.setName(botStation.getName());
         return result;
     }