Mercurial > hg > release > thermostat-0.7

changeset 713:d0ac896ea3b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start mongo java driver as bundle. Similar as previous patches. Since it's already a bundle, we should start it via the OSGi framework. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003799.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Mon, 22 Oct 2012 17:17:09 +0200
parents 82eed668f880
children 3a4f6e0ded6b
files distribution/config/osgi-export.properties distribution/pom.xml main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
diffstat 3 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/osgi-export.properties	Tue Oct 23 14:45:07 2012 +0200
+++ b/distribution/config/osgi-export.properties	Mon Oct 22 17:17:09 2012 +0200
@@ -33,12 +33,8 @@
 # to do so, delete this exception statement from your version.
 
 # OSGi public API
-com.mongodb
-com.mongodb.gridfs
 org.apache.commons.cli=1.2.0
 org.apache.commons.beanutils=1.8.3
-org.bson
-org.bson.types
 org.jfree.chart
 org.jfree.chart.axis
 org.jfree.chart.event
--- a/distribution/pom.xml	Tue Oct 23 14:45:07 2012 +0200
+++ b/distribution/pom.xml	Mon Oct 22 17:17:09 2012 +0200
@@ -197,6 +197,8 @@
                          resource="${project.build.directory}/libs/netty-3.2.4.Final.jar" />
                 <symlink link="${project.build.directory}/libs/jline2.jar"
                          resource="${project.build.directory}/libs/jline-2.9.jar" />
+                <symlink link="${project.build.directory}/libs/mongo.jar"
+                         resource="${project.build.directory}/libs/mongo-java-driver-2.7.3.jar" />
               </target>
             </configuration>
             <goals>
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties	Tue Oct 23 14:45:07 2012 +0200
+++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties	Mon Oct 22 17:17:09 2012 +0200
@@ -4,4 +4,5 @@
         thermostat-tools-${project.version}.jar, \
         thermostat-launcher-${project.version}.jar, \
         thermostat-main-${project.version}.jar, \
-        jline2.jar
+        jline2.jar, \
+        mongo.jar