Mercurial > hg > release > thermostat-0.9

changeset 792:948d43df4d08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use version-less dep names consistently. This patch fixes our somewhat inconsistent use of $JAR_FILE_NAME in commands/$COMMAND.properties. Using version less filenames in command property files makes packaging easier since symlinks which are required can be looked up in one place. I've also noticed that agent (the command) had jetty* bundles listed, which it shouldn't. It's just a web client as is gui. These bundles have been removed from the bundles list of agent command. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004142.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 20 Nov 2012 11:48:04 +0100
parents 9fdbdf22d9d4
children 03f70aded260
files distribution/config/commands/agent.properties distribution/config/commands/gui.properties distribution/config/commands/webservice.properties distribution/pom.xml
diffstat 4 files changed, 15 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/commands/agent.properties	Mon Nov 19 18:21:20 2012 +0100
+++ b/distribution/config/commands/agent.properties	Tue Nov 20 11:48:04 2012 +0100
@@ -1,21 +1,9 @@
 bundles = thermostat-agent-core-@project.version@.jar, \
           thermostat-web-common-@project.version@.jar, \
           thermostat-web-client-@project.version@.jar, \
-          commons-fileupload-@fileupload.version@.jar, \
-          commons-io-@commons-io.version@.jar, \
-          httpcore-osgi-@httpcomponents.version@.jar, \
-          httpclient-osgi-@httpcomponents.version@.jar, \
+          httpcomponents-core.jar, \
+          httpcomponents-client.jar, \
           gson.jar, \
-          jetty-continuation.jar, \
-          jetty-http.jar, \
-          jetty-io.jar, \
-          jetty-security.jar, \
-          jetty-server.jar, \
-          jetty-servlet.jar, \
-          jetty-util.jar, \
-          jetty-webapp.jar, \
-          jetty-xml.jar, \
-          javax-servlet.jar, \
           thermostat-osgi-process-handler-@project.version@.jar, \
           thermostat-common-core-@project.version@.jar, \
           thermostat-agent-cli-@project.version@.jar, \
--- a/distribution/config/commands/gui.properties	Mon Nov 19 18:21:20 2012 +0100
+++ b/distribution/config/commands/gui.properties	Tue Nov 20 11:48:04 2012 +0100
@@ -1,5 +1,5 @@
 bundles = thermostat-common-core-@project.version@.jar, \
-          gson-2.2.2.jar, \
+          gson.jar, \
           thermostat-web-common-@project.version@.jar, \
           thermostat-web-client-@project.version@.jar, \
           thermostat-common-command-@project.version@.jar, \
@@ -24,8 +24,8 @@
           thermostat-gc-remote-collector-client-common-@project.version@.jar, \
           thermostat-gc-remote-collector-client-swing-@project.version@.jar, \
           thermostat-osgi-process-handler-@project.version@.jar, \
-          httpcore-osgi-@httpcomponents.version@.jar, \
-          httpclient-osgi-@httpcomponents.version@.jar, \
+          httpcomponents-core.jar, \
+          httpcomponents-client.jar, \
           netty.jar
 
 description = launches the GUI client
--- a/distribution/config/commands/webservice.properties	Mon Nov 19 18:21:20 2012 +0100
+++ b/distribution/config/commands/webservice.properties	Tue Nov 20 11:48:04 2012 +0100
@@ -1,8 +1,8 @@
 bundles = thermostat-web-server-@project.version@.jar, \
           thermostat-web-common-@project.version@.jar, \
           thermostat-thread-collector-@project.version@.jar, \
-          commons-fileupload-@fileupload.version@.jar, \
-          commons-io-@commons-io.version@.jar, \
+          commons-fileupload.jar, \
+          commons-io.jar, \
           gson.jar, \
           jetty-continuation.jar, \
           jetty-http.jar, \
--- a/distribution/pom.xml	Mon Nov 19 18:21:20 2012 +0100
+++ b/distribution/pom.xml	Tue Nov 20 11:48:04 2012 +0100
@@ -223,6 +223,14 @@
                          resource="${project.build.directory}/libs/jetty-xml-8.1.5.v20120716.jar" />
                 <symlink link="${project.build.directory}/libs/javax-servlet.jar"
                          resource="${project.build.directory}/libs/javax.servlet-3.0.0.v201112011016.jar" />
+                <symlink link="${project.build.directory}/libs/commons-io.jar"
+                         resource="${project.build.directory}/libs/commons-io-2.4.jar" />
+                <symlink link="${project.build.directory}/libs/commons-fileupload.jar"
+                         resource="${project.build.directory}/libs/commons-fileupload-1.2.2.jar" />
+                <symlink link="${project.build.directory}/libs/httpcomponents-core.jar"
+                         resource="${project.build.directory}/libs/httpcore-osgi-4.1.2.jar" />
+                <symlink link="${project.build.directory}/libs/httpcomponents-client.jar"
+                         resource="${project.build.directory}/libs/httpclient-osgi-4.1.2.jar" />
               </target>
             </configuration>
             <goals>