From b635941f706b79102b22765a270607fa3cdab910 Mon Sep 17 00:00:00 2001
From: "sergey.tolstyh" <sergey.tolstyh@red-soft.ru>
Date: Mon, 19 Jan 2026 19:25:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20Sample?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20<%%RESERVED=5FNAME%%>=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=84=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  2 +-
 README.md                                     | 53 ++-----------------
 build.gradle                                  |  2 +-
 ncore-properties-template.xml                 |  4 +-
 ncore-properties.xml                          |  6 +--
 settings.gradle                               |  2 +-
 src/dist/bin/starter                          |  2 +-
 src/dist/bin/starter.bat                      |  2 +-
 src/dist/config/ncore-properties.xml          |  6 +--
 src/main/java/biz/redsoft/sample/Product.java |  2 +-
 src/main/java/biz/redsoft/sample/Version.java |  2 +-
 .../biz.redsoft.sample/register.json          |  6 +--
 src/main/webapp/WEB-INF/ncore-properties.xml  |  6 +--
 src/main/webapp/WEB-INF/web.xml               |  2 +-
 .../java/biz/redsoft/sample/SampleTests.java  |  6 +--
 .../biz/redsoft/sample/TomcatStarter.java     |  2 +-
 updates/SAMPLE-0000001.xml                    | 16 +++---
 17 files changed, 37 insertions(+), 84 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f0a3acf..f2c1963 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/README.md b/README.md
index 4d108a4..1d91184 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 Для данного проекта можно использовать базу ядра.
 
-Таски запускаются с помощью gradle wrapper. Версия Gradle - 7.6.4.
+Таски запускаются с помощью gradle wrapper. Версия Gradle - 9.0.0.
 
 Nix
 ```bash
@@ -55,58 +55,11 @@ gradlew.bat build
 ```
 
 Названия тасков можно сокращать. Например, вместо generateSources можно указать gS, вместо ncoreLoadPatches nLP и т.д.
-
-### Intellij Idea
-
-Синхронизация настроек  - Ctrl+Shift+A, далее выбрать пункт "Refresh All External Projects", или в окне Gradle нажать кнопку Refresh.
-
-Для зависимостей создаются библиотеки с префиксом "Gradle__". По данному префиксу можно лего создть шаблоны для svn:ignore или .gitignore.
-
-Таски можно запускать прямо из Idea. В конфигурациях запуска имеется соответствующий тип.
-
-В Idea 14.1 появилось действие "Execute Gradle Task", которое позволяет выполнять таски без указания конфигурации запуска.
-
-
 ### Основные соглашения
 
 * Группа проекта в gradle-скрипте соответствует основному пакету
 * Основной пакет содержит классы Product и Version
 * Файлы с версией (version.properties)  и переопределенными классами (register.json)
-  находятся в ресурсах по следующему пути: META-INF/ncore-product/[группа проекта]
+  находятся в ресурсах по следующему пути: META-INF/ncore-product/[product.name]
 * В корне проекта обязательно присутствет файл ncore-properties.xml, содержайщий свойство
-  product.name.
-
-
-### Создание проекта myproject на основе sample
-
-1. Создать директорию myproject и скопировать в нее содержимое ncore-sample
-
-2. Удалить директорию .git
-
-3. В build.gradle изменить значение group
-```
-group = 'biz.redsoft.myproject'
-```
-4. В settings.gradle изменить значение rootProject.name
-```
-rootProject.name = 'biz.redsoft.myproject'
-```
-
-5. В ncore-properties.xml (в папках ./, src/main/webapp/WEB-INF и src/dist/config  изменить значение product.name и product.title
-```
-<entry key="product.name">biz.redsoft.myproject</entry>
-<entry key="product.title">MyProject title</entry>
-```
-
-6. В файлах starter и starter.bat поменять bin/sample на bin/biz.redsoft.myproject
-
-7. В исходниках пакет biz.redsoft.sample заменить на biz.redsoft.myproject (это можно сделать в IDE)
-
-8. В META-INF/ncore-product изменить имя диектории biz.redsoft.sample на biz.redsoft.myproject
-
-9. Актуальная версия ядра указывается в файле gradle.properties:
-```
-biz.redsoft.ncore.version=1.10.339.9
-```
-Запуск толстого клиента осуществляется в собранном дистрибутиве (distTar или distZip) в каталоге bin командой:
-start-client.bat (или ./start-client в линуксе)
+  product.name.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4bd0631..5f91686 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ ncore {
     sourceEncoding = 'UTF-8'
 }
 
-group = 'biz.redsoft.sample'
+group = 'biz.redsoft.<%%RESERVED_NAME%%>'
 
 repositories {
     maven {
diff --git a/ncore-properties-template.xml b/ncore-properties-template.xml
index 2d8aae4..aa23097 100644
--- a/ncore-properties-template.xml
+++ b/ncore-properties-template.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
   <entry key="ncore.developer.mode">true</entry>
-  <!--  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-sample-dev?lc_ctype=WIN1251</entry> -->
+  <!--  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-<%%RESERVED_NAME%%>-dev?lc_ctype=WIN1251</entry> -->
   <!-- Для автоматизированного рестора базы данных запустить gradlew nRDB-->
   <!-- На линуксе файл должен быть доступен группе firbird/reddatabase!!! -->
   <entry key="ncore.db.backup.path">db/ncore.zip</entry>
   <!-- На линуксе файл должен быть доступен группе firbird/reddatabase!!! -->
-  <entry key="ncore.db.restore.path">/db/ncore-sample.fdb</entry>
+  <entry key="ncore.db.restore.path">/db/ncore-<%%RESERVED_NAME%%>.fdb</entry>
 </properties>
diff --git a/ncore-properties.xml b/ncore-properties.xml
index 88d2d9a..e367d56 100644
--- a/ncore-properties.xml
+++ b/ncore-properties.xml
@@ -4,12 +4,12 @@
   <comment>Configuration settings for ncore platform</comment>
 
   <!-- Product settings -->
-  <entry key="product.name">sample</entry>
-  <entry key="product.title">Sample ncore project</entry>
+  <entry key="product.name"><%%RESERVED_NAME%%></entry>
+  <entry key="product.title"><%%RESERVED_NAME%%> ncore project</entry>
 
   <!-- Database settings -->
   <entry key="jdbc.drivers">org.firebirdsql.jdbc.FBDriver</entry>
-  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-sample-dev?lc_ctype=WIN1251</entry>
+  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-<%%RESERVED_NAME%%>-dev?lc_ctype=WIN1251</entry>
   <entry key="ncore.db.user">SYSDBA</entry>
   <entry key="ncore.db.password">masterkey</entry>
 
diff --git a/settings.gradle b/settings.gradle
index 1329a58..87dbfbf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,4 +10,4 @@ pluginManagement{
     }
 }
 
-rootProject.name = 'sample'
\ No newline at end of file
+rootProject.name = '<%%RESERVED_NAME%%>'
\ No newline at end of file
diff --git a/src/dist/bin/starter b/src/dist/bin/starter
index ac830c3..679465a 100755
--- a/src/dist/bin/starter
+++ b/src/dist/bin/starter
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 cd $(dirname $0)/..
-bin/sample $1 -config config/ncore-properties.xml $2 $3 $4 $5
+bin/<%%RESERVED_NAME%%> $1 -config config/ncore-properties.xml $2 $3 $4 $5
 cd $OLDPWD
\ No newline at end of file
diff --git a/src/dist/bin/starter.bat b/src/dist/bin/starter.bat
index 52b1d63..b0f19e8 100755
--- a/src/dist/bin/starter.bat
+++ b/src/dist/bin/starter.bat
@@ -1,5 +1,5 @@
 @echo off
 
 pushd  "%~dp0\.."
-call bin\sample.bat %1 -config config\ncore-properties.xml %2 %3 %4 %5
+call bin\<%%RESERVED_NAME%%>.bat %1 -config config\ncore-properties.xml %2 %3 %4 %5
 popd
\ No newline at end of file
diff --git a/src/dist/config/ncore-properties.xml b/src/dist/config/ncore-properties.xml
index c105852..a64fdf7 100644
--- a/src/dist/config/ncore-properties.xml
+++ b/src/dist/config/ncore-properties.xml
@@ -4,12 +4,12 @@
   <comment>Configuration settings for ncore platform</comment>
 
   <!-- Product settings -->
-  <entry key="product.name">sample</entry>
-  <entry key="product.title">Sample ncore project</entry>
+  <entry key="product.name"><%%RESERVED_NAME%%></entry>
+  <entry key="product.title"><%%RESERVED_NAME%%> ncore project</entry>
 
   <!-- Database settings -->
   <entry key="jdbc.drivers">org.firebirdsql.jdbc.FBDriver</entry>
-  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-sample?lc_ctype=WIN1251</entry>
+  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-<%%RESERVED_NAME%%>?lc_ctype=WIN1251</entry>
   <entry key="ncore.db.user">SYSDBA</entry>
   <entry key="ncore.db.password">masterkey</entry>
 
diff --git a/src/main/java/biz/redsoft/sample/Product.java b/src/main/java/biz/redsoft/sample/Product.java
index 204471d..4d0ee6c 100644
--- a/src/main/java/biz/redsoft/sample/Product.java
+++ b/src/main/java/biz/redsoft/sample/Product.java
@@ -1,4 +1,4 @@
-package biz.redsoft.sample;
+package biz.redsoft.<%%RESERVED_NAME%%>;
 
 import biz.redsoft.ncore.system.application.Application;
 
diff --git a/src/main/java/biz/redsoft/sample/Version.java b/src/main/java/biz/redsoft/sample/Version.java
index 9595cce..8c428ee 100644
--- a/src/main/java/biz/redsoft/sample/Version.java
+++ b/src/main/java/biz/redsoft/sample/Version.java
@@ -1,4 +1,4 @@
-package biz.redsoft.sample;
+package biz.redsoft.<%%RESERVED_NAME%%>;
 
 import biz.redsoft.util.IncorrectVersionFormat;
 import biz.redsoft.util.VersionUtils;
diff --git a/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json b/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json
index 7b492c4..3bddad5 100644
--- a/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json
+++ b/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json
@@ -1,4 +1,4 @@
 {
-  "dependencies": [],
-  "register": {}
-}
+  "dependencies" : [ ],
+  "register" : { }
+}
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/ncore-properties.xml b/src/main/webapp/WEB-INF/ncore-properties.xml
index c105852..a64fdf7 100644
--- a/src/main/webapp/WEB-INF/ncore-properties.xml
+++ b/src/main/webapp/WEB-INF/ncore-properties.xml
@@ -4,12 +4,12 @@
   <comment>Configuration settings for ncore platform</comment>
 
   <!-- Product settings -->
-  <entry key="product.name">sample</entry>
-  <entry key="product.title">Sample ncore project</entry>
+  <entry key="product.name"><%%RESERVED_NAME%%></entry>
+  <entry key="product.title"><%%RESERVED_NAME%%> ncore project</entry>
 
   <!-- Database settings -->
   <entry key="jdbc.drivers">org.firebirdsql.jdbc.FBDriver</entry>
-  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-sample?lc_ctype=WIN1251</entry>
+  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-<%%RESERVED_NAME%%>?lc_ctype=WIN1251</entry>
   <entry key="ncore.db.user">SYSDBA</entry>
   <entry key="ncore.db.password">masterkey</entry>
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index cbadd8a..e9c4c54 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
   <session-config>
     <session-timeout>30</session-timeout>
   </session-config>
-  <display-name>Sample server</display-name>
+  <display-name><%%RESERVED_NAME%%> server</display-name>
   <context-param>
     <param-name>productionMode</param-name>
     <param-value>true</param-value>
diff --git a/src/test/java/biz/redsoft/sample/SampleTests.java b/src/test/java/biz/redsoft/sample/SampleTests.java
index d3059a2..3097db6 100644
--- a/src/test/java/biz/redsoft/sample/SampleTests.java
+++ b/src/test/java/biz/redsoft/sample/SampleTests.java
@@ -1,4 +1,4 @@
-package biz.redsoft.sample;
+package biz.redsoft.<%%RESERVED_NAME%%>;
 
 import biz.redsoft.ncore.util.Misc;
 
@@ -10,11 +10,11 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 
-public class SampleTests {
+public class <%%RESERVED_NAME%%>Tests {
   @Test
   public void testProductName() throws IOException {
     final Properties props = new Properties(System.getProperties());
     Misc.loadProperties(props, Arrays.asList("ncore-properties.xml", "ncore-properties-local.xml"));
-    Assertions.assertEquals(props.getProperty("product.name"), "sample");
+    Assertions.assertEquals(props.getProperty("product.name"), "<%%RESERVED_NAME%%>");
   }
 }
diff --git a/src/test/java/biz/redsoft/sample/TomcatStarter.java b/src/test/java/biz/redsoft/sample/TomcatStarter.java
index f290142..cc6f804 100644
--- a/src/test/java/biz/redsoft/sample/TomcatStarter.java
+++ b/src/test/java/biz/redsoft/sample/TomcatStarter.java
@@ -35,7 +35,7 @@
  * exception statement from your version.
  */
 
-package biz.redsoft.sample;
+package biz.redsoft.<%%RESERVED_NAME%%>;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/updates/SAMPLE-0000001.xml b/updates/SAMPLE-0000001.xml
index 6722382..618a4bf 100644
--- a/updates/SAMPLE-0000001.xml
+++ b/updates/SAMPLE-0000001.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Objects xsi:schemaLocation="http://www.red-soft.biz/2009/ncore xsd/ncore.xsd" xmlns="http://www.red-soft.biz/2009/ncore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <SysPatch CreateDate="2025-05-27T19:56:20.177" Description="Создана подсистема &quot;SAMPLE&quot;" Documentclassid="8001" DocDate="2025-05-27" DocNumber="SAMPLE-0000001" Metaobjectname="SYS_PATCH"
-        SpNumber="1" SpRevision="1" SpStatus="2" SpSubsystem="SAMPLE" SpTimestamp="2025-05-27T19:56:20.177" SpUser="SYSDBA">
+    <SysPatch CreateDate="2025-05-27T19:56:20.177" Description="Создана подсистема &quot;<%%RESERVED_NAME%%>&quot;" Documentclassid="8001" DocDate="2025-05-27" DocNumber="<%%RESERVED_NAME%%>-0000001" Metaobjectname="SYS_PATCH"
+        SpNumber="1" SpRevision="1" SpStatus="2" SpSubsystem="<%%RESERVED_NAME%%>" SpTimestamp="2025-05-27T19:56:20.177" SpUser="SYSDBA">
         <DetSysLogSysPatch>
         <SysLog SlogAction="I" SlogAddress="127.0.0.1/54126" SlogSubsystem="NCORE" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"
             SobjName="SYS_SUBSYSTEM">
             <DetSysLogFieldsSysLog>
-            <SysLogFields SlfFieldName="CAPTION" SlfFieldString="SAMPLE" SlfIsNew="true"/>
-            <SysLogFields SlfFieldName="CODE" SlfFieldString="SAMPLE" SlfIsNew="true"/>
+            <SysLogFields SlfFieldName="CAPTION" SlfFieldString="<%%RESERVED_NAME%%>" SlfIsNew="true"/>
+            <SysLogFields SlfFieldName="CODE" SlfFieldString="<%%RESERVED_NAME%%>" SlfIsNew="true"/>
             <SysLogFields SlfFieldName="UPDATE_ORDER" SlfFieldString="10" SlfIsNew="true"/>
         </DetSysLogFieldsSysLog>
     </SysLog>
-    <SysLog SlogAction="I" SlogAddress="127.0.0.1/54126" SlogSubsystem="SAMPLE" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"
+    <SysLog SlogAction="I" SlogAddress="127.0.0.1/54126" SlogSubsystem="<%%RESERVED_NAME%%>" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"
         SobjName="SYS_LOOKUP">
         <DetSysLogFieldsSysLog>
         <SysLogFields SlfFieldName="SDOM_NAME" SlfFieldString="D_SUBSYSTEM" SlfIsNew="true"/>
-        <SysLogFields SlfFieldName="SLU_CAPTION" SlfFieldString="SAMPLE" SlfIsNew="true"/>
+        <SysLogFields SlfFieldName="SLU_CAPTION" SlfFieldString="<%%RESERVED_NAME%%>" SlfIsNew="true"/>
         <SysLogFields SlfFieldName="SLU_GROUP" SlfIsNew="true"/>
-        <SysLogFields SlfFieldName="SLU_KEY" SlfFieldString="SAMPLE" SlfIsNew="true"/>
+        <SysLogFields SlfFieldName="SLU_KEY" SlfFieldString="<%%RESERVED_NAME%%>" SlfIsNew="true"/>
         <SysLogFields SlfFieldName="SLU_MEMO" SlfIsNew="true"/>
         <SysLogFields SlfFieldName="SLU_ORDER" SlfFieldString="10" SlfIsNew="true"/>
-        <SysLogFields SlfFieldName="SLU_SUBSYSTEM" SlfFieldString="SAMPLE" SlfIsNew="true"/>
+        <SysLogFields SlfFieldName="SLU_SUBSYSTEM" SlfFieldString="<%%RESERVED_NAME%%>" SlfIsNew="true"/>
     </DetSysLogFieldsSysLog>
 </SysLog>
 <SysLog SlogAction="U" SlogAddress="127.0.0.1/54126" SlogSubsystem="NCORE" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"