Stage 1 refactoring

application/pom.xml

@@ -358,7 +358,7 @@
                                 </resource>
                             </resources>
                             <filters>
-                                <filter>src/main/filters/unix.properties</filter>
+                                <filter>${main.dir}/packaging/filters/unix.properties</filter>
                             </filters>
                         </configuration>
                     </execution>
@@ -387,7 +387,7 @@
                                 </resource>
                             </resources>
                             <filters>
-                                <filter>src/main/filters/windows.properties</filter>
+                                <filter>${main.dir}/packaging/filters/windows.properties</filter>
                             </filters>
                         </configuration>
                     </execution>
@@ -401,12 +401,12 @@
                             <outputDirectory>${project.build.directory}/control</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/scripts/control</directory>
+                                    <directory>${main.dir}/packaging/scripts/control</directory>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <filters>
-                                <filter>src/main/filters/unix.properties</filter>
+                                <filter>${main.dir}/packaging/filters/unix.properties</filter>
                             </filters>
                         </configuration>
                     </execution>
@@ -420,7 +420,7 @@
                             <outputDirectory>${project.build.directory}/bin/install</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/scripts/install</directory>
+                                    <directory>${main.dir}/packaging/scripts/install</directory>
                                     <includes>
                                         <include>**/*.sh</include>
                                         <include>**/*.xml</include>
@@ -429,7 +429,7 @@
                                 </resource>
                             </resources>
                             <filters>
-                                <filter>src/main/filters/unix.properties</filter>
+                                <filter>${main.dir}/packaging/filters/unix.properties</filter>
                             </filters>
                         </configuration>
                     </execution>
@@ -443,12 +443,12 @@
                             <outputDirectory>${pkg.win.dist}</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/scripts/windows</directory>
+                                    <directory>${main.dir}/packaging/scripts/windows</directory>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <filters>
-                                <filter>src/main/filters/windows.properties</filter>
+                                <filter>${main.dir}/packaging/filters/windows.properties</filter>
                             </filters>
                         </configuration>
                     </execution>
@@ -462,7 +462,7 @@
                             <outputDirectory>${pkg.win.dist}/install</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/scripts/install</directory>
+                                    <directory>${main.dir}/packaging/scripts/install</directory>
                                     <includes>
                                         <include>logback.xml</include>
                                     </includes>
@@ -470,7 +470,7 @@
                                 </resource>
                             </resources>
                             <filters>
-                                <filter>src/main/filters/windows.properties</filter>
+                                <filter>${main.dir}/packaging/filters/windows.properties</filter>
                             </filters>
                         </configuration>
                     </execution>
@@ -567,19 +567,26 @@
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <configuration>
+                    <gradleProjectDirectory>${main.dir}/packaging</gradleProjectDirectory>
                     <tasks>
                         <task>build</task>
                         <task>buildDeb</task>
                         <task>buildRpm</task>
+                        <task>renameDeb</task>
+                        <task>renameRpm</task>
                     </tasks>
                     <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
+                        <arg>-PpackagingDir=${main.dir}/packaging</arg>
+                        <arg>-PprojectBuildDir=${basedir}/target</arg>
                         <arg>-PprojectVersion=${project.version}</arg>
                         <arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}
                         </arg>
                         <arg>-PpkgName=${pkg.name}</arg>
+                        <arg>-PpkgUser=${pkg.user}</arg>
                         <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
                         <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
+                        <arg>--warning-mode</arg>
+                        <arg>all</arg>
                     </args>
                 </configuration>
                 <executions>
@@ -597,7 +604,7 @@
                 <configuration>
                     <finalName>${pkg.name}</finalName>
                     <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
+                        <descriptor>../packaging/assembly/windows.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>

msa/js-executor/package-lock.json

@@ -1461,7 +1461,7 @@
     },
     "enabled": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
       "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
       "requires": {
         "env-variable": "0.0.x"
@@ -1740,7 +1740,7 @@
     },
     "fecha": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+      "resolved": "http://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
       "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
     },
     "file-stream-rotator": {
@@ -1872,14 +1872,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1894,20 +1892,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2024,8 +2019,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2037,7 +2031,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2052,7 +2045,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2164,8 +2156,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2298,7 +2289,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2400,7 +2390,7 @@
     },
     "get-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
@@ -2557,7 +2547,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -2889,7 +2879,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -3251,7 +3241,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "mixin-deep": {
@@ -3277,7 +3267,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "dev": true,
       "requires": {
@@ -3286,7 +3276,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         }
@@ -3550,7 +3540,7 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
@@ -3989,7 +3979,7 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -4299,7 +4289,7 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },

packaging/build.gradle

@@ -17,7 +17,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
     ext {
-        osPackageVersion = "3.8.0"
+        osPackageVersion = "8.3.0"
     }
     repositories {
         jcenter()
@@ -43,8 +43,8 @@ ospackage {
 
     into pkgInstallFolder
 
-    user pkgName
+    user pkgUser
-    permissionGroup pkgName
+    permissionGroup pkgUser
 
     // Copy the actual .jar file
     from(mainJar) {
@@ -57,22 +57,22 @@ ospackage {
     }
 
     // Copy the install files
-    from("target/bin/install/install.sh") {
+    from("${buildDir}/bin/install/install.sh") {
         fileMode 0775
         into "bin/install"
     }
 
-    from("target/bin/install/upgrade.sh") {
+    from("${buildDir}/bin/install/upgrade.sh") {
         fileMode 0775
         into "bin/install"
     }
 
-    from("target/bin/install/logback.xml") {
+    from("${buildDir}/bin/install/logback.xml") {
         into "bin/install"
     }
 
     // Copy the config files
-    from("target/conf") {
+    from("${buildDir}/conf") {
         exclude "${pkgName}.conf"
         fileType CONFIG | NOREPLACE
         fileMode 0754
@@ -80,14 +80,14 @@ ospackage {
     }
 
     // Copy the data files
-    from("target/data") {
+    from("${buildDir}/data") {
         fileType CONFIG | NOREPLACE
         fileMode 0754
         into "data"
     }
 
     // Copy the extensions files
-    from("target/extensions") {
+    from("${buildDir}/extensions") {
         into "extensions"
     }
 }
@@ -97,12 +97,12 @@ buildRpm {
 
     arch = NOARCH
 
-    version = projectVersion.replace('-', '')
+    archiveVersion = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
+    archiveFileName = "${pkgName}.rpm"
 
     requires("java-1.8.0")
 
-    from("target/conf") {
+    from("${buildDir}/conf") {
         include "${pkgName}.conf"
         filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm'])
         fileType CONFIG | NOREPLACE
@@ -115,17 +115,19 @@ buildRpm {
     preUninstall file("${buildDir}/control/rpm/prerm")
     postUninstall file("${buildDir}/control/rpm/postrm")
 
-    user pkgName
+    user pkgUser
-    permissionGroup pkgName
+    permissionGroup pkgUser
 
     // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
+    from("${buildDir}/control/template.service") {
         addParentDirs = false
         fileMode 0644
         into "/usr/lib/systemd/system"
+        rename { String filename ->
+            "${pkgName}.service"
+        }
     }
 
-    directory(pkgLogFolder, 0755)
     link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
@@ -135,11 +137,11 @@ buildDeb {
 
     arch = "all"
 
-    archiveName = "${pkgName}.deb"
+    archiveFileName = "${pkgName}.deb"
 
     requires("openjdk-8-jre").or("java8-runtime").or("oracle-java8-installer").or("openjdk-8-jre-headless")
 
-    from("target/conf") {
+    from("${buildDir}/conf") {
         include "${pkgName}.conf"
         filter(ReplaceTokens, tokens: ['pkg.platform': 'deb'])
         fileType CONFIG | NOREPLACE
@@ -157,18 +159,40 @@ buildDeb {
     preUninstall file("${buildDir}/control/deb/prerm")
     postUninstall file("${buildDir}/control/deb/postrm")
 
-    user pkgName
+    user pkgUser
-    permissionGroup pkgName
+    permissionGroup pkgUser
 
     // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
+    from("${buildDir}/control/template.service") {
         addParentDirs = false
         fileMode 0644
         into "/lib/systemd/system"
+        rename { String filename ->
+            "${pkgName}.service"
+        }
     }
 
-    directory(pkgLogFolder, 0755)
     link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar")
     link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
+
+task renameDeb(type: Copy) {
+    from("${buildDir}/") {
+        include '*.deb'
+        destinationDir file("${buildDir}/")
+        rename { String filename ->
+            "${pkgName}.deb"
+        }
+    }
+}
+
+task renameRpm(type: Copy) {
+    from("${buildDir}/") {
+        include '*.rpm'
+        destinationDir file("${buildDir}/")
+        rename { String filename ->
+            "${pkgName}.rpm"
+        }
+    }
+}

packaging/scripts/control/deb/postinst

@@ -2,6 +2,7 @@
 
 set -e
 
+mkdir -m 0755 -p ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.installFolder}
 systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || :

packaging/scripts/control/rpm/postinst

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+mkdir -m 0755 -p ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.installFolder}
 

pom.xml

@@ -182,7 +182,7 @@
                 <plugin>
                     <groupId>org.thingsboard</groupId>
                     <artifactId>gradle-maven-plugin</artifactId>
-                    <version>1.0.9</version>
+                    <version>1.0.10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -321,6 +321,8 @@
                             <exclude>src/vendor/**</exclude>
                             <exclude>src/font/**</exclude>
                             <exclude>src/sh/**</exclude>
+                            <exclude>packaging/scripts/control/**</exclude>
+                            <exclude>packaging/scripts/windows/**</exclude>
                             <exclude>src/main/scripts/control/**</exclude>
                             <exclude>src/main/scripts/windows/**</exclude>
                             <exclude>src/main/resources/public/static/rulenode/**</exclude>