Mercurial > hg > thermostat-ng > agent

changeset 2475:404613dd8275

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Windows - use templating for portable property files This patch modifies the distribution pom.xml to enable the same versions of some files (agent.properties for example) to build for Linux or Windows, without having separate versions of these files. To do this, it uses templates and properties defined in distribution/pom.xml Reviewed-by: sgehwolf Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-October/021255.html
author Simon Tooke <stooke@redhat.com>
date Thu, 13 Oct 2016 14:57:38 -0400
parents ff7e92342414
children da549e428ff5
files distribution/config/commands/agent.properties distribution/config/commands/service.properties distribution/pom.xml
diffstat 3 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/commands/agent.properties	Thu Oct 13 14:51:30 2016 -0400
+++ b/distribution/config/commands/agent.properties	Thu Oct 13 14:57:38 2016 -0400
@@ -2,10 +2,9 @@
           com.redhat.thermostat.agent.cli=${project.version}, \
           com.redhat.thermostat.backend.system=${project.version}, \
           com.redhat.thermostat.agent.ipc.tcpsocket.server=${project.version}, \
-          com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
-          ${jffi-native.bundle.symbolic.name}=${jffi.version}, \
           com.redhat.thermostat.storage.mongodb=${project.version}, \
-          com.redhat.thermostat.process=${project.version}
+          com.redhat.thermostat.process=${project.version} \
+          @agent.extra.bundles@
 
 summary = run the thermostat agent
 
--- a/distribution/config/commands/service.properties	Thu Oct 13 14:51:30 2016 -0400
+++ b/distribution/config/commands/service.properties	Thu Oct 13 14:57:38 2016 -0400
@@ -4,8 +4,7 @@
           com.redhat.thermostat.storage.cli=${project.version}, \
           com.redhat.thermostat.agent.cli=${project.version}, \
           com.redhat.thermostat.agent.ipc.tcpsocket.server=${project.version}, \
-          com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
-          ${jffi-native.bundle.symbolic.name}=${jffi.version}, \
+          @service.extra.bundles@
 
 summary = run the thermostat storage and agent
 
--- a/distribution/pom.xml	Thu Oct 13 14:51:30 2016 -0400
+++ b/distribution/pom.xml	Thu Oct 13 14:57:38 2016 -0400
@@ -66,7 +66,7 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <assemblyfile.suffix></assemblyfile.suffix>
+        <assemblyfile.suffix/>
       </properties>
     </profile>
 
@@ -76,7 +76,11 @@
         <os><family>Unix</family></os>
       </activation>
       <properties>
-        <assemblyfile.suffix></assemblyfile.suffix>
+        <assemblyfile.suffix/>
+        <agent.extra.bundles>,com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
+          ${jffi-native.bundle.symbolic.name}=${jffi.version}</agent.extra.bundles>
+        <service.extra.bundles>,com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
+          ${jffi-native.bundle.symbolic.name}=${jffi.version}</service.extra.bundles>
       </properties>
       <dependencies>
         <dependency>
@@ -149,6 +153,8 @@
       </activation>
       <properties>
         <assemblyfile.suffix>-windows</assemblyfile.suffix>
+        <agent.extra.bundles/>
+        <service.extra.bundles/>
       </properties>
       <build>
         <plugins>