diff --git a/distribution/config/commands/agent.properties b/distribution/config/commands/agent.properties --- a/distribution/config/commands/agent.properties +++ b/distribution/config/commands/agent.properties @@ -3,6 +3,7 @@ com.redhat.thermostat.web.client=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version}, \ com.redhat.thermostat.process=${project.version}, \ com.redhat.thermostat.common.core=${project.version}, \ diff --git a/distribution/config/commands/clean-data.properties b/distribution/config/commands/clean-data.properties --- a/distribution/config/commands/clean-data.properties +++ b/distribution/config/commands/clean-data.properties @@ -4,6 +4,7 @@ com.redhat.thermostat.web.client=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version}, \ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \ org.apache.commons.beanutils=${commons-beanutils.version}, \ diff --git a/distribution/config/commands/connect.properties b/distribution/config/commands/connect.properties --- a/distribution/config/commands/connect.properties +++ b/distribution/config/commands/connect.properties @@ -10,6 +10,7 @@ org.apache.commons.logging=${commons-logging.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version} description = persistently connect to storage diff --git a/distribution/config/commands/gui.properties b/distribution/config/commands/gui.properties --- a/distribution/config/commands/gui.properties +++ b/distribution/config/commands/gui.properties @@ -20,7 +20,10 @@ com.redhat.thermostat.process=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ - org.jboss.netty=${netty.version} + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ + org.jboss.netty=${netty.version}, \ + org.jfree.jcommon=${jcommon.osgi.version} , \ + org.jfree.jfreechart=${jfreechart.osgi.version} description = launches the GUI client diff --git a/distribution/config/commands/list-vms.properties b/distribution/config/commands/list-vms.properties --- a/distribution/config/commands/list-vms.properties +++ b/distribution/config/commands/list-vms.properties @@ -4,6 +4,7 @@ com.redhat.thermostat.web.client=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version}, \ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \ org.apache.commons.beanutils=${commons-beanutils.version}, \ diff --git a/distribution/config/commands/ping.properties b/distribution/config/commands/ping.properties --- a/distribution/config/commands/ping.properties +++ b/distribution/config/commands/ping.properties @@ -5,6 +5,7 @@ com.redhat.thermostat.web.client=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version}, \ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \ org.apache.commons.beanutils=${commons-beanutils.version}, \ diff --git a/distribution/config/commands/vm-info.properties b/distribution/config/commands/vm-info.properties --- a/distribution/config/commands/vm-info.properties +++ b/distribution/config/commands/vm-info.properties @@ -4,6 +4,7 @@ com.redhat.thermostat.web.client=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version}, \ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \ org.apache.commons.beanutils=${commons-beanutils.version}, \ diff --git a/distribution/config/commands/vm-stat.properties b/distribution/config/commands/vm-stat.properties --- a/distribution/config/commands/vm-stat.properties +++ b/distribution/config/commands/vm-stat.properties @@ -4,6 +4,7 @@ com.redhat.thermostat.web.client=${project.version}, \ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \ + org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \ com.google.gson=${gson.version}, \ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \ org.apache.commons.beanutils=${commons-beanutils.version}, \ diff --git a/distribution/config/osgi-export.properties b/distribution/config/osgi-export.properties --- a/distribution/config/osgi-export.properties +++ b/distribution/config/osgi-export.properties @@ -32,20 +32,6 @@ # library, but you are not obligated to do so. If you do not wish # to do so, delete this exception statement from your version. -# OSGi public API -org.jfree.chart -org.jfree.chart.axis -org.jfree.chart.event -org.jfree.chart.labels -org.jfree.chart.plot -org.jfree.chart.panel -org.jfree.chart.renderer.xy -org.jfree.data -org.jfree.data.general -org.jfree.data.time -org.jfree.data.xy -org.jfree.ui -org.jfree.data.gantt sun.swing sun.swing.table @@ -60,11 +46,3 @@ sun.jvmstat sun.jvmstat.monitor sun.jvmstat.monitor.event - -# webservice command depends on jetty-jndi, which requires -# javax.transaction and javax.mail. We don't use jndi stuff, -# so we add those "fake" exports here. -# javax.transaction is provided by the JVM, javax.mail is not -# available. -javax.transaction="1.1" -javax.mail="1.4" diff --git a/distribution/scripts/thermostat b/distribution/scripts/thermostat --- a/distribution/scripts/thermostat +++ b/distribution/scripts/thermostat @@ -56,15 +56,12 @@ # This is the minimal boot classpath thermostat needs. Other dependencies # will get started by the OSGi framework once that's up. -SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/org.apache.felix.framework-@felix.framework.version@.jar" +SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/org.apache.felix.framework.jar" SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-launcher-@project.version@.jar" SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-main-@project.version@.jar" SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-shared-config-@project.version@.jar" # This needs to be on the classpath for the RMI registry to find it SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-agent-proxy-common-@project.version@.jar" -# FIXME: Remove once jfreechart is a real OSGi bundle upstream -SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/jfreechart-@jfreechart.version@.jar" -SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/jcommon-@jcommon.version@.jar" SERVICE_CLASSPATH="${TOOLS_JAR}:${SERVICE_CLASSPATH}" THERMOSTAT_MAIN="com.redhat.thermostat.main.Thermostat" diff --git a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties --- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties +++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties @@ -4,6 +4,7 @@ thermostat-common-core-${project.version}.jar, \ thermostat-plugin-validator-${project.version}.jar, \ thermostat-launcher-${project.version}.jar, \ - jline-${jline.version}.jar, \ - commons-cli-${commons-cli.version}.jar, \ - org.apache.servicemix.bundles.lucene-${lucene.version}.jar + jline2.jar, \ + jansi.jar, \ + commons-cli.jar, \ + lucene.jar diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analysis/distribution/thermostat-plugin.xml --- a/vm-heap-analysis/distribution/thermostat-plugin.xml +++ b/vm-heap-analysis/distribution/thermostat-plugin.xml @@ -86,8 +86,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version} @@ -139,8 +142,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version} @@ -195,8 +201,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version} @@ -245,8 +254,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version} @@ -295,8 +307,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version} @@ -345,8 +360,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version} @@ -388,8 +406,11 @@ org.apache.commons.logging${commons-logging.version} org.apache.httpcomponents.httpcore${httpcomponents.core.version} org.apache.httpcomponents.httpclient${httpcomponents.client.version} + org.apache.httpcomponents.httpmime${httpcomponents.mime.version} com.google.gson${gson.version} org.jboss.netty${netty.version} + org.jfree.jcommon${jcommon.osgi.version} + org.jfree.jfreechart${jfreechart.osgi.version}