Showing
3 changed files
with
15 additions
and
8 deletions
| @@ -112,7 +112,7 @@ public class EventEntity extends BaseSqlEntity<Event> implements BaseEntity<Eve | @@ -112,7 +112,7 @@ public class EventEntity extends BaseSqlEntity<Event> implements BaseEntity<Eve | ||
| 112 | return event; | 112 | return event; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | - private long getTs(UUID uuid) { | 115 | + private static long getTs(UUID uuid) { |
| 116 | return (uuid.timestamp() - EPOCH_DIFF) / 10000; | 116 | return (uuid.timestamp() - EPOCH_DIFF) / 10000; |
| 117 | } | 117 | } |
| 118 | } | 118 | } |
| @@ -92,10 +92,13 @@ buildRpm { | @@ -92,10 +92,13 @@ buildRpm { | ||
| 92 | permissionGroup pkgUser | 92 | permissionGroup pkgUser |
| 93 | 93 | ||
| 94 | // Copy the system unit files | 94 | // Copy the system unit files |
| 95 | - from("${buildDir}/control/${pkgName}.service") { | 95 | + from("${buildDir}/control/template.service") { |
| 96 | addParentDirs = false | 96 | addParentDirs = false |
| 97 | fileMode 0644 | 97 | fileMode 0644 |
| 98 | into "/usr/lib/systemd/system" | 98 | into "/usr/lib/systemd/system" |
| 99 | + rename { String filename -> | ||
| 100 | + "${pkgName}.service" | ||
| 101 | + } | ||
| 99 | } | 102 | } |
| 100 | 103 | ||
| 101 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") | 104 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") |
| @@ -121,6 +124,16 @@ buildDeb { | @@ -121,6 +124,16 @@ buildDeb { | ||
| 121 | user pkgUser | 124 | user pkgUser |
| 122 | permissionGroup pkgUser | 125 | permissionGroup pkgUser |
| 123 | 126 | ||
| 127 | + // Copy the system unit files | ||
| 128 | + from("${buildDir}/control/template.service") { | ||
| 129 | + addParentDirs = false | ||
| 130 | + fileMode 0644 | ||
| 131 | + into "/lib/systemd/system" | ||
| 132 | + rename { String filename -> | ||
| 133 | + "${pkgName}.service" | ||
| 134 | + } | ||
| 135 | + } | ||
| 136 | + | ||
| 124 | link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/init/${pkgName}") | 137 | link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/init/${pkgName}") |
| 125 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") | 138 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") |
| 126 | } | 139 | } |
| @@ -1370,11 +1370,6 @@ | @@ -1370,11 +1370,6 @@ | ||
| 1370 | <version>${commons-collections.version}</version> | 1370 | <version>${commons-collections.version}</version> |
| 1371 | </dependency> | 1371 | </dependency> |
| 1372 | <dependency> | 1372 | <dependency> |
| 1373 | - <groupId>org.yaml</groupId> | ||
| 1374 | - <artifactId>snakeyaml</artifactId> | ||
| 1375 | - <version>${snakeyaml.version}</version> | ||
| 1376 | - </dependency> | ||
| 1377 | - <dependency> | ||
| 1378 | <groupId>org.apache.struts</groupId> | 1373 | <groupId>org.apache.struts</groupId> |
| 1379 | <artifactId>struts-core</artifactId> | 1374 | <artifactId>struts-core</artifactId> |
| 1380 | <version>${struts.version}</version> | 1375 | <version>${struts.version}</version> |
| @@ -1389,7 +1384,6 @@ | @@ -1389,7 +1384,6 @@ | ||
| 1389 | <artifactId>struts-tiles</artifactId> | 1384 | <artifactId>struts-tiles</artifactId> |
| 1390 | <version>${struts.version}</version> | 1385 | <version>${struts.version}</version> |
| 1391 | </dependency> | 1386 | </dependency> |
| 1392 | - | ||
| 1393 | </dependencies> | 1387 | </dependencies> |
| 1394 | </dependencyManagement> | 1388 | </dependencyManagement> |
| 1395 | 1389 |