release

.gitignore

@@ -1,6 +1,7 @@
 /out
 /edt_workspace/*
 /.idea/*
+!/.idea/misc.xml
 !/.idea/modules.xml
 !/.idea/libraries/
 !/.idea/runConfigurations/
@@ -14,3 +15,8 @@ build/
 !gradle.properties
 *.hprof
 /gradle.properties
+workspace/
+*/.classpath
+*/.project
+/dev
+.project

README.md

@@ -1,5 +1,36 @@
 # Плагин для запуска обычного приложения из EDT
 
-Содержит исходники плагина
+## Возможности
 
-[Установка плагинов](docs/Установка.md)
+Добавляет новый тип запускатора 1С:Предприятия
+
+![Команда запуска](docs/images/launch-configuration.png)
+![Команда запуска](docs/images/shortcut.png)
+
+Работает с оффлайн версией EDT 2021.3+
+
+## Установка
+
+Для избежания некоторых проблем лучше использовать offline версию EDT.
+
+1. Скачайте архив плагина со страницы [релизов](https://github.com/bia-technologies/edt-runordinaryapplication-plugin/releases/latest)
+
+   ![Релиз](/docs/images/release-page.png)
+2. Перейдя в 1C:EDT, воспользуйтесь стандартным установщиком eclipse - `Справка` -> `Установить новое ПО`
+3. Добавьте репозиторий, выбрав `архив` укажите путь к скачанному архиву плагина.
+
+   ![Выбираем репозиторий](docs/images/select-repository.png)
+4. Отметьте нужный плагин
+
+   ![Отмечаем нужный плагин](docs/images/select-plugin.png)
+5. Для ускорения установки можно убрать галочку `Обращаться во время инсталляции ко всем сайтам ...` (внизу)
+6. `Далее`
+7. После необходимо ознакомиться и принять лицензионной соглашение.
+8. И согласиться с предупреждением безопасности.
+
+    ![Соглашаемся с предупреждением безопасности](docs/images/confirm-warning.png)
+9. Перезагрузить IDE
+10. Не редко возникает проблема, что после установки плагин не активируется, для это необходимо запустить EDT с ключом `-clean`.
+    1. Открыть терминал (консоль)
+    2. Перейти в каталог установки EDT `cd /opt/1C/1CE/components/1c-edt-2023.2.4+6-x86_64/`
+    3. Запустить EDT с ключом `./1cedt -clean`

build.gradle.kts

@@ -4,33 +4,30 @@ import java.util.*
 plugins {
     `java-library`
     id("com.github.hierynomus.license") version "0.16.1"
-    id("it.filippor.p2") version "0.0.10"
 }
 
 group = "ru.biatech.edt.ordinaryapp"
-version = "0.1.0"
+version = "24.2.0"
 val vendor = "BIA-Technologies Limited Liability Company"
 val createProjectYear = 2022
 
 val licenseYear = if (Calendar.getInstance().get(Calendar.YEAR) == createProjectYear) "$createProjectYear"
-    else "$createProjectYear-${Calendar.getInstance().get(Calendar.YEAR)}"
+else "$createProjectYear-${Calendar.getInstance().get(Calendar.YEAR)}"
 val edtLocation = findProperty("edtLocation") ?: ""
 val pluginBuildPath = layout.buildDirectory.dir("buildPlugin").get().asFile
 val publishTo = (findProperty("publishTo") ?: "").toString()
 
+var subProjects = arrayOf("core", "ui")
+
 repositories {
     mavenCentral()
 }
 
 sourceSets {
     main {
-        java.srcDirs("src/main/java")
-        resources.srcDirs("src/main/resources")
-        resources.srcDirs("META-INF")
-    }
-    test {
-        java.srcDirs("src/test/java")
-        resources.srcDirs("src/test/resources")
+        java.srcDirs(subProjects.map { "$it/src/main/java" })
+        resources.srcDirs(subProjects.map { "$it/src/main/resources" })
+        resources.srcDirs(subProjects.map { "$it/META-INF" })
     }
 }
 
@@ -55,17 +52,18 @@ license {
     header = rootProject.file("templates/HEADER.txt")
     ext["year"] = licenseYear
     ext["owner"] = vendor
-    useDefaultMappings = false
-    includes(listOf("**/*.java", "**/*.properties", "**/*.gradle.kts"))
+    useDefaultMappings = true
+    includes(listOf("**/*.java", "**/*.properties", "**/*.xml"))
     strictCheck = true
+    mapping("xml", "XML_STYLE")
     mapping("java", "SLASHSTAR_STYLE")
 }
 
 tasks.register<com.hierynomus.gradle.license.tasks.LicenseFormat>("licenseEclipseProject") {
     header = rootProject.file("templates/HEADER_FOR_PLUGIN_TEMPLATE.txt")
     ext["year"] = licenseYear
     ext["owner"] = vendor
-    source = fileTree("eclipse_project")
+    source = fileTree("templates/eclipse_project")
     useDefaultMappings = true
     strictCheck = true
     setIncludes(listOf("**/*.properties", "**/*.xml"))
@@ -77,25 +75,17 @@ tasks.named("licenseFormat") {
 }
 
 tasks.register<Copy>("buildPlugin-copyFiles") {
-    from("eclipse_project") {
-        filter { line -> line.replace("{version}", version.toString()) }
-    }
+    from("templates/eclipse_project") {}
 
     into(pluginBuildPath)
 
-    from(layout.projectDirectory.dir("src/main/java")) {
-        into("bundles/ru.biatech.edt.ordinaryapp/src")
-    }
-    from(layout.projectDirectory.dir("src/main/resources")) {
-        into("bundles/ru.biatech.edt.ordinaryapp/resources")
-    }
-    from(layout.projectDirectory.dir("META-INF")) {
-        into("bundles/ru.biatech.edt.ordinaryapp/META-INF")
-        filter { line -> line.replace(Regex("Bundle-Version.*"), "Bundle-Version: $version.qualifier") }
-    }
-    from(layout.projectDirectory.dir("plugin.xml")) {
-        into("bundles/ru.biatech.edt.ordinaryapp")
+    subProjects.forEach {
+        var sourceDir = layout.projectDirectory.dir(it)
+        from(sourceDir) {
+            into("bundles/$it")
+        }
     }
+
     group = "build"
 }
 
@@ -107,9 +97,9 @@ tasks.register<Exec>("buildPlugin") {
     environment("MAVEN_OPTS", "-Dhttps.protocols=TLSv1.2")
 
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        commandLine("mvn.cmd", "package")
+        commandLine("mvn.cmd", "dependency:resolve", "package")
     } else {
-        commandLine("mvn", "package")
+        commandLine("mvn", "dependency:resolve", "package")
     }
 
     dependsOn(tasks.named("buildPlugin-copyFiles"))
@@ -122,12 +112,16 @@ tasks.register<Copy>("publishToPath") {
             throw GradleException("You must specify a property 'publishTo' for the publish task is 'gradle.properties'")
         }
     }
-    from("$pluginBuildPath/repositories/ru.biatech.edt.ordinaryapp.repository/target/repository") {
+    from("$pluginBuildPath/repositories/repository/target/repository") {
         into("$version")
+    }
+    from("$pluginBuildPath/repositories/repository/target/repository") {
         into("latest")
     }
-    from("$pluginBuildPath/repositories/ru.biatech.edt.ordinaryapp.repository/target/ru.biatech.edt.ordinaryapp.repository.zip") {
+    from("$pluginBuildPath/repositories/repository/target/ru.biatech.edt.ordinaryapp.repository.zip") {
         into("$version")
+    }
+    from("$pluginBuildPath/repositories/repository/target/ru.biatech.edt.ordinaryapp.repository.zip") {
         into("latest")
     }
     into(publishTo)

core/META-INF/MANIFEST.MF

@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: OrdinaryApp.Core
+Bundle-SymbolicName: ru.biatech.edt.ordinaryapp.core;singleton:=true
+Automatic-Module-Name: ru.biatech.edt.ordinaryapp.core
+Bundle-Version: 24.2.0.qualifier
+Bundle-Vendor: BIA-Technologies LLC
+Fragment-Host: com._1c.g5.v8.dt.platform.services.core
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Excluded-Imports: *.internal.*,*

core/build.properties

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2020,2021 1C-Soft LLC
+# Copyright 2021-2022 BIA-Technologies Limited Liability Company
+#
+# This program and the accompanying materials are made available under
+# the terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/, or the Apache License, Version 2.0
+# which is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+# Contributors:
+#    1C-Soft LLC - initial API and implementation
+#    BIA-Technologies LLC - Using a Template
+#
+
+javacCustomEncodings.. = src/[UTF-8]
+source.. = src/
+bin.includes = META-INF/,\
+               .,\
+               fragment.xml

core/core.iml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Osmorc" name="OSGi">
+      <configuration manifestGenerationMode="Manually" manifestLocation="META-INF/MANIFEST.MF" jarfileLocation="$EDT_PATH$\dropins\core.jar" outputPathType="SpecificOutputPath" bndFileLocation="" bundlorFileLocation="" bundleActivator="" bundleSymbolicName="" bundleVersion="1.0.0" ignoreFilePattern="" useProjectDefaultManifestFileLocation="false" alwaysRebuildBundleJAR="true" doNotSynchronizeWithMaven="false">
+        <additionalProperties />
+        <additionalJARContents>
+          <entry source="$MODULE_DIR$/fragment.xml" dest="fragment.xml" />
+        </additionalJARContents>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="plugins" level="project" />
+  </component>
+</module>

core/fragment.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<fragment>
+   <extension point="com._1c.g5.v8.dt.platform.services.core.runtimeComponentTypes">
+      <type
+            id="ru.biatech.edt.ordinaryapp.OrdinaryClient"
+            name="Обычное приложение"
+            visible="true">
+      </type>
+   </extension>
+
+    <extension point="com._1c.g5.v8.dt.platform.services.core.runtimeComponentExecutors">
+        <executor
+                class="com._1c.g5.v8.dt.internal.platform.services.core.PlatformServicesExecutableExtensionFactory:ru.biatech.edt.ordinaryapp.core.OrdinaryAppLauncher"
+                type="ru.biatech.edt.ordinaryapp.OrdinaryClient">
+            <runtime>
+                <since value="com._1c.g5.v8.dt.platform.runtime.8.3.8"/>
+            </runtime>
+        </executor>    </extension>
+    <extension
+          point="com._1c.g5.v8.dt.platform.services.core.runtimeComponentResolvers">
+      <resolver
+            class="com._1c.g5.v8.dt.internal.platform.services.core.PlatformServicesExecutableExtensionFactory:ru.biatech.edt.ordinaryapp.core.OrdinaryAppComponentResolver"
+            runtimeType="com._1c.g5.v8.dt.platform.services.core.runtimeType.EnterprisePlatform">
+      </resolver>
+    </extension>
+</fragment>

core/pom.xml

@@ -0,0 +1,15 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ru.biatech.edt.ordinaryapp.core</artifactId>
+    <packaging>eclipse-plugin</packaging>
+
+    <parent>
+        <groupId>ru.biatech.edt.ordinaryapp</groupId>
+        <artifactId>bundles</artifactId>
+        <version>24.2.0-SNAPSHOT</version>
+    </parent>
+</project>