Mercurial > hg > release > thermostat-0.15

changeset 1244:9ad2d74ff780

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update mongo-java-driver to 2.11.2 (latest) Reviewed-by: jreboaa, vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-September/008138.html
author Omair Majid <omajid@redhat.com>
date Thu, 05 Sep 2013 12:36:53 -0400
parents 3282fac13d06
children 484de0a847c4
files distribution/config/commands/agent.properties distribution/config/commands/clean-data.properties distribution/config/commands/connect.properties distribution/config/commands/gui.properties distribution/config/commands/list-vms.properties distribution/config/commands/ping.properties distribution/config/commands/service.properties distribution/config/commands/vm-info.properties distribution/config/commands/vm-stat.properties distribution/config/commands/webservice.properties eclipse/com.redhat.thermostat.client.feature/feature.xml pom.xml vm-heap-analysis/distribution/thermostat-plugin.xml
diffstat 13 files changed, 28 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/commands/agent.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/agent.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -12,7 +12,7 @@
           com.redhat.thermostat.killvm.agent=${project.version}, \
           com.redhat.thermostat.backend.system=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/clean-data.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/clean-data.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -5,7 +5,7 @@
           org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
           org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
           com.google.gson=${gson.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/connect.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/connect.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -3,7 +3,7 @@
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/gui.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/gui.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -1,5 +1,5 @@
 bundles = com.redhat.thermostat.storage.mongodb=${project.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.collections=${commons-collections.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
--- a/distribution/config/commands/list-vms.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/list-vms.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -5,7 +5,7 @@
           org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
           org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
           com.google.gson=${gson.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/ping.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/ping.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -6,7 +6,7 @@
           org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
           org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
           com.google.gson=${gson.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/service.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/service.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -1,6 +1,6 @@
 bundles = com.redhat.thermostat.agent.core=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.collections=${commons-collections.version}, \
           org.apache.commons.logging=${commons-logging.version}, \
--- a/distribution/config/commands/vm-info.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/vm-info.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -5,7 +5,7 @@
           org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
           org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
           com.google.gson=${gson.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/vm-stat.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/vm-stat.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -5,7 +5,7 @@
           org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
           org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
           com.google.gson=${gson.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/distribution/config/commands/webservice.properties	Wed Sep 04 13:08:12 2013 -0400
+++ b/distribution/config/commands/webservice.properties	Thu Sep 05 12:36:53 2013 -0400
@@ -4,7 +4,7 @@
           com.redhat.thermostat.web.server=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.version}, \
-          com.mongodb=${mongo-driver.version}, \
+          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
--- a/eclipse/com.redhat.thermostat.client.feature/feature.xml	Wed Sep 04 13:08:12 2013 -0400
+++ b/eclipse/com.redhat.thermostat.client.feature/feature.xml	Thu Sep 05 12:36:53 2013 -0400
@@ -131,6 +131,13 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
+         unpack="false"/>33
+
+   <plugin
+         id="org.mongodb.mongo-java-driver"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
--- a/pom.xml	Wed Sep 04 13:08:12 2013 -0400
+++ b/pom.xml	Thu Sep 05 12:36:53 2013 -0400
@@ -76,13 +76,16 @@
 
     <jdktools.version>1.7.0</jdktools.version>
     <jfreechart.version>1.0.14</jfreechart.version>
-    <mongo-driver.version>2.7.3</mongo-driver.version>
+    <mongo-driver.version>2.11.2</mongo-driver.version>
+    <!-- the OSGi Bundle-Version; should match the manifest in the jar -->
+    <mongo-driver.osgi-version>2.11.2.RELEASE</mongo-driver.osgi-version>
     <commons-beanutils.version>1.8.3</commons-beanutils.version>
     <commons-cli.version>1.2</commons-cli.version>
     <commons-io.version>2.4</commons-io.version>
     <commons-collections.version>3.2.1</commons-collections.version>
     <commons-logging.version>1.1.3</commons-logging.version>
     <commons-codec.version>1.7</commons-codec.version>
+    <!-- the OSGi Bundle-Version; should match the manifest in the jar -->
     <commons-codec.osgi-version>1.7.0</commons-codec.osgi-version>
     <commons-fileupload.version>1.2.2</commons-fileupload.version>
 
--- a/vm-heap-analysis/distribution/thermostat-plugin.xml	Wed Sep 04 13:08:12 2013 -0400
+++ b/vm-heap-analysis/distribution/thermostat-plugin.xml	Thu Sep 05 12:36:53 2013 -0400
@@ -79,7 +79,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
@@ -132,7 +132,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
@@ -188,7 +188,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
@@ -238,7 +238,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
@@ -288,7 +288,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
@@ -338,7 +338,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
@@ -381,7 +381,7 @@
         <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>com.mongodb</symbolic-name><version>${mongo-driver.version}</version></bundle>
+        <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>