Mercurial > hg > release > thermostat-0.6

changeset 724:743c15d87009

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start lucene as bundle. Apache servicemix has a bundle-ified version of lucene. This is what I've used and it is now started as a bundle. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003850.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 23 Oct 2012 17:10:23 +0200
parents 173ea1f57b27
children 3c82d501a8e1
files common/core/pom.xml distribution/config/osgi-export.properties distribution/pom.xml main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties pom.xml
diffstat 5 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/common/core/pom.xml	Tue Oct 23 16:40:35 2012 +0200
+++ b/common/core/pom.xml	Tue Oct 23 17:10:23 2012 +0200
@@ -165,8 +165,8 @@
     </dependency>
     
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.lucene</artifactId>
     </dependency>
     <dependency>
       <groupId>com.sun</groupId>
--- a/distribution/config/osgi-export.properties	Tue Oct 23 16:40:35 2012 +0200
+++ b/distribution/config/osgi-export.properties	Tue Oct 23 17:10:23 2012 +0200
@@ -60,13 +60,6 @@
 sun.jvmstat.monitor
 sun.jvmstat.monitor.event
 
-org.apache.lucene.analysis
-org.apache.lucene.document
-org.apache.lucene.index
-org.apache.lucene.search
-org.apache.lucene.store
-org.apache.lucene.util
-
 org.eclipse.jetty.server=8.1.0
 org.eclipse.jetty.server.handler=8.1.0
 org.eclipse.jetty.webapp=8.1.0
--- a/distribution/pom.xml	Tue Oct 23 16:40:35 2012 +0200
+++ b/distribution/pom.xml	Tue Oct 23 17:10:23 2012 +0200
@@ -207,6 +207,8 @@
                          resource="${project.build.directory}/libs/commons-collections-3.2.1.jar" />
                 <symlink link="${project.build.directory}/libs/commons-logging.jar"
                          resource="${project.build.directory}/libs/com.springsource.org.apache.commons.logging-1.1.1.jar" />
+                <symlink link="${project.build.directory}/libs/lucene.jar"
+                         resource="${project.build.directory}/libs/org.apache.servicemix.bundles.lucene-3.6.0_1.jar" />
               </target>
             </configuration>
             <goals>
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties	Tue Oct 23 16:40:35 2012 +0200
+++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties	Tue Oct 23 17:10:23 2012 +0200
@@ -9,4 +9,5 @@
         commons-beanutils.jar, \
         commons-collections.jar, \
         commons-logging.jar, \
+        lucene.jar, \
         mongo.jar
--- a/pom.xml	Tue Oct 23 16:40:35 2012 +0200
+++ b/pom.xml	Tue Oct 23 17:10:23 2012 +0200
@@ -75,7 +75,7 @@
     <commons-collections.version>3.2.1</commons-collections.version>
     <commons-logging.version>1.1.1</commons-logging.version>
     <jline.version>2.9</jline.version>
-    <lucene.version>3.6.0</lucene.version>
+    <lucene.version>3.6.0_1</lucene.version>
     <!--
          felix 4.0 is compliant with osgi 4.3
          for osgi clients, 4.3 is backwards compatible with 4.2
@@ -314,8 +314,8 @@
         <version>${jline.version}</version>
       </dependency>
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.lucene</artifactId>
       <version>${lucene.version}</version>
     </dependency>