Mercurial > hg > release > thermostat-0.6

changeset 711:ced47d3fad73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start netty as bundle. This patch removes packages exported by the netty bundle from osgi-export.properties and starts it as a bundle. Netty is required for common-command. Any bundle depending on it needs netty started as bundle. In order to be able to refer to things in command.properties file in a version-less manner I've added a symlink to the actual jar. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003797.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Mon, 22 Oct 2012 14:23:57 +0200
parents 3a47a18e5b4a
children 82eed668f880
files distribution/config/commands/agent.properties distribution/config/commands/dump-heap.properties distribution/config/commands/find-objects.properties distribution/config/commands/find-root.properties distribution/config/commands/gui.properties distribution/config/commands/list-heap-dumps.properties distribution/config/commands/object-info.properties distribution/config/commands/ping.properties distribution/config/commands/save-heap-dump-to-file.properties distribution/config/commands/service.properties distribution/config/commands/show-heap-histogram.properties distribution/config/commands/storage.properties distribution/config/osgi-export.properties distribution/pom.xml
diffstat 14 files changed, 38 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/commands/agent.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/agent.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -8,7 +8,8 @@
           thermostat-killvm-agent-@project.version@.jar, \
           thermostat-thread-collector-@project.version@.jar, \
           thermostat-thread-harvester-@project.version@.jar, \
-          thermostat-system-backend-@project.version@.jar
+          thermostat-system-backend-@project.version@.jar, \
+          netty.jar
 
 description = starts and stops the thermostat agent
 
--- a/distribution/config/commands/dump-heap.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/dump-heap.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = trigger a heap dump on the VM
 
--- a/distribution/config/commands/find-objects.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/find-objects.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = Finds objects in a heapdump
 
--- a/distribution/config/commands/find-root.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/find-root.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = finds the shortest path from an object to a GC root
 
--- a/distribution/config/commands/gui.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/gui.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -16,7 +16,8 @@
           thermostat-thread-client-swing-@project.version@.jar, \
           thermostat-thread-client-controllers-@project.version@.jar, \
           thermostat-thread-client-common-@project.version@.jar, \
-          thermostat-osgi-process-handler-@project.version@.jar
+          thermostat-osgi-process-handler-@project.version@.jar, \
+          netty.jar
 
 description = launches the GUI client
 
--- a/distribution/config/commands/list-heap-dumps.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/list-heap-dumps.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = list all heap dumps
 
--- a/distribution/config/commands/object-info.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/object-info.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = prints information about an object in a heap dump
 
--- a/distribution/config/commands/ping.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/ping.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -1,5 +1,6 @@
 bundles = thermostat-common-command-@project.version@.jar, \
-          thermostat-client-command-@project.version@.jar
+          thermostat-client-command-@project.version@.jar, \
+          netty.jar
 
 description = using the Command Channel, send a ping to a running agent
 
--- a/distribution/config/commands/save-heap-dump-to-file.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/save-heap-dump-to-file.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = saves a heap dump to a local file
 
--- a/distribution/config/commands/service.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/service.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -17,7 +17,8 @@
           jetty-servlet-8.1.5.v20120716.jar, \
           jetty-util-8.1.5.v20120716.jar, \
           jetty-webapp-8.1.5.v20120716.jar, \
-          jetty-xml-8.1.5.v20120716.jar
+          jetty-xml-8.1.5.v20120716.jar, \
+          netty.jar
 
 description = starts and stops the thermostat storage and agent
 
--- a/distribution/config/commands/show-heap-histogram.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/show-heap-histogram.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -4,7 +4,8 @@
           thermostat-client-command-@project.version@.jar, \
           thermostat-client-heapdumper-@project.version@.jar, \
           thermostat-swing-components-@project.version@.jar, \
-          thermostat-laf-@project.version@.jar
+          thermostat-laf-@project.version@.jar, \
+          netty.jar
 
 description = show the heap histogram
 
--- a/distribution/config/commands/storage.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/commands/storage.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -3,7 +3,8 @@
           thermostat-common-core-@project.version@.jar, \
           thermostat-agent-cli-@project.version@.jar, \
           thermostat-common-command-@project.version@.jar, \
-          thermostat-agent-command-@project.version@.jar
+          thermostat-agent-command-@project.version@.jar, \
+          netty.jar
 
 description = starts and stops the thermostat storage
 
@@ -31,4 +32,4 @@
 quiet.long = quiet
 quiet.hasarg = false
 quiet.required = false
-quiet.description = don't produce any output
\ No newline at end of file
+quiet.description = don't produce any output
--- a/distribution/config/osgi-export.properties	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/config/osgi-export.properties	Mon Oct 22 14:23:57 2012 +0200
@@ -69,14 +69,6 @@
 sun.jvmstat.monitor
 sun.jvmstat.monitor.event
 
-org.jboss.netty=3.2.4.Final
-org.jboss.netty.bootstrap=3.2.4.Final
-org.jboss.netty.buffer=3.2.4.Final
-org.jboss.netty.channel=3.2.4.Final
-org.jboss.netty.channel.group=3.2.4.Final
-org.jboss.netty.channel.socket.nio=3.2.4.Final
-org.jboss.netty.handler.codec.frame=3.2.4.Final
-
 org.apache.lucene.analysis
 org.apache.lucene.document
 org.apache.lucene.index
--- a/distribution/pom.xml	Mon Oct 22 18:24:19 2012 -0400
+++ b/distribution/pom.xml	Mon Oct 22 14:23:57 2012 +0200
@@ -188,6 +188,19 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <execution>
+            <id>version-less-dep-symlinks</id>
+            <phase>prepare-package</phase>
+            <configuration>
+              <target>
+                <symlink link="${project.build.directory}/libs/netty.jar"
+                         resource="${project.build.directory}/libs/netty-3.2.4.Final.jar" />
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
     </plugins>