You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by dh...@apache.org on 2009/03/16 00:16:09 UTC
svn commit: r754788 - in /incubator/esme/trunk/server: ./
src/main/resources/props/ src/main/scala/bootstrap/liftweb/
src/main/scala/org/apache/esme/model/
Author: dhague
Date: Sun Mar 15 23:16:09 2009
New Revision: 754788
URL: http://svn.apache.org/viewvc?rev=754788&view=rev
Log:
Version numbers of major dependencies (e.g. Lift) are now parameters at the top of pom.xml. Compass & Lucene updated to newer versions. Compass config file can now be set via properties file & added sample config files for file, jdbc & jndi-jdbc persistence of index.
Added:
incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml (contents, props changed)
- copied, changed from r734453, incubator/esme/trunk/server/src/main/resources/props/compass.cfg.xml
incubator/esme/trunk/server/src/main/resources/props/compass.jdbc.cfg.xml
incubator/esme/trunk/server/src/main/resources/props/compass.jndi.cfg.xml
incubator/esme/trunk/server/src/main/resources/props/default.props
Removed:
incubator/esme/trunk/server/src/main/resources/props/compass.cfg.xml
Modified:
incubator/esme/trunk/server/pom.xml
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=754788&r1=754787&r2=754788&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Sun Mar 15 23:16:09 2009
@@ -1,278 +1,280 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.esme</groupId>
- <artifactId>esme-server</artifactId>
- <version>0.2.3-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>ESME</name>
- <inceptionYear>2008</inceptionYear>
- <properties>
- <scala.version>2.7.3</scala.version>
- <lucene.version>2.3.2</lucene.version>
- <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
- </properties>
-
- <repositories>
- <repository>
- <id>scala-tools.org</id>
- <name>Scala-Tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </repository>
- <repository>
- <id>scala-tools.org.snapshots</id>
- <name>Scala-Tools Maven2 Repository for Snapshots</name>
- <url>http://scala-tools.org/repo-snapshots</url>
- <snapshots />
- </repository>
- <repository>
- <id>compass-project.org</id>
- <name>Compass</name>
- <url>http://repo.compass-project.org</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools.org</id>
- <name>Scala-Tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </pluginRepository>
- </pluginRepositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- <version>0.9.3</version>
- </dependency>
-
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-util</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-webkit</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-mapper</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-testkit</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-openid</artifactId>
- <version>1.0</version>
- </dependency>
- <!--
- <dependency>
- <groupId>com.socialmaterial</groupId>
- <artifactId>social</artifactId>
- <version>0.1-SNAPSHOT</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.compass-project</groupId>
- <artifactId>compass</artifactId>
- <version>2.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-507.jdbc3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>[6.1.6,)</version>
- <scope>test</scope>
- </dependency>
- <!-- for LiftConsole -->
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.specs</groupId>
- <artifactId>specs</artifactId>
- <version>1.3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src/main/scala</sourceDirectory>
- <testSourceDirectory>src/test/scala</testSourceDirectory>
-
- <plugins>
-
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <scalaVersion>${scala.version}</scalaVersion>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <contextPath>/</contextPath>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- </configuration>
- </plugin>
- <plugin>
- <groupId>net.sf.alchim</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <nosuffix>true</nosuffix>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <excludes>
- <exclude>org.scala-lang:scala-library</exclude>
- </excludes>
- <classpathContainers>
- <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER</classpathContainer>
- </classpathContainers>
- <projectnatures>
- <java.lang.String>ch.epfl.lamp.sdt.core.scalanature</java.lang.String>
- <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
- </projectnatures>
- <buildcommands>
- <java.lang.String>ch.epfl.lamp.sdt.core.scalabuilder</java.lang.String>
- </buildcommands>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <configuration>
- <scalaVersion>${scala.version}</scalaVersion>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.esme</groupId>
+ <artifactId>esme-server</artifactId>
+ <version>0.2.3-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>ESME</name>
+ <inceptionYear>2008</inceptionYear>
+ <properties>
+ <lift.version>1.0</lift.version>
+ <scala.version>2.7.3</scala.version>
+ <compass.version>2.1.1</compass.version>
+ <lucene.version>2.4.0</lucene.version>
+ <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>scala-tools.org</id>
+ <name>Scala-Tools Maven2 Repository</name>
+ <url>http://scala-tools.org/repo-releases</url>
+ </repository>
+ <repository>
+ <id>scala-tools.org.snapshots</id>
+ <name>Scala-Tools Maven2 Repository for Snapshots</name>
+ <url>http://scala-tools.org/repo-snapshots</url>
+ <snapshots />
+ </repository>
+ <repository>
+ <id>compass-project.org</id>
+ <name>Compass</name>
+ <url>http://repo.compass-project.org</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>scala-tools.org</id>
+ <name>Scala-Tools Maven2 Repository</name>
+ <url>http://scala-tools.org/repo-releases</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-util</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-webkit</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-mapper</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-testkit</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-openid</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>com.socialmaterial</groupId>
+ <artifactId>social</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.compass-project</groupId>
+ <artifactId>compass</artifactId>
+ <version>${compass.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-507.jdbc3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <version>1.4.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>[6.1.6,)</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- for LiftConsole -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/main/scala</sourceDirectory>
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <scalaVersion>${scala.version}</scalaVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <contextPath>/</contextPath>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.sf.alchim</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <nosuffix>true</nosuffix>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <excludes>
+ <exclude>org.scala-lang:scala-library</exclude>
+ </excludes>
+ <classpathContainers>
+ <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER</classpathContainer>
+ </classpathContainers>
+ <projectnatures>
+ <java.lang.String>ch.epfl.lamp.sdt.core.scalanature</java.lang.String>
+ <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
+ </projectnatures>
+ <buildcommands>
+ <java.lang.String>ch.epfl.lamp.sdt.core.scalabuilder</java.lang.String>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <configuration>
+ <scalaVersion>${scala.version}</scalaVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Copied: incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml (from r734453, incubator/esme/trunk/server/src/main/resources/props/compass.cfg.xml)
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml?p2=incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml&p1=incubator/esme/trunk/server/src/main/resources/props/compass.cfg.xml&r1=734453&r2=754788&rev=754788&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/props/compass.cfg.xml (original)
+++ incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml Sun Mar 15 23:16:09 2009
@@ -2,7 +2,7 @@
<compass-core-config xmlns="http://www.compass-project.org/schema/core-config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.compass-project.org/schema/core-config
- http://www.compass-project.org/schema/compass-core-config-2.0.xsd">
+ http://www.compass-project.org/schema/compass-core-config-2.1.xsd">
<compass name="default">
Propchange: incubator/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Added: incubator/esme/trunk/server/src/main/resources/props/compass.jdbc.cfg.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/props/compass.jdbc.cfg.xml?rev=754788&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/props/compass.jdbc.cfg.xml (added)
+++ incubator/esme/trunk/server/src/main/resources/props/compass.jdbc.cfg.xml Sun Mar 15 23:16:09 2009
@@ -0,0 +1,38 @@
+
+<compass-core-config xmlns="http://www.compass-project.org/schema/core-config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.compass-project.org/schema/core-config
+ http://www.compass-project.org/schema/compass-core-config-2.1.xsd">
+
+ <compass name="default">
+
+ <connection>
+ <jdbc>
+ <dataSourceProvider>
+ <driverManager url="jdbc:mysql://localhost/esme"
+ username="esme" password="esme"
+ driverClass="com.mysql.jdbc.Driver" />
+ </dataSourceProvider>
+ </jdbc>
+
+ </connection>
+ <searchEngine >
+ <analyzer name="default" type="Stop" />
+ <analyzer name="tag" type="Standard" />
+ <analyzer name="stemming" type="Snowball" snowballType="English">
+ <stopWords>
+ <stopWord value="no" />
+ <stopWord value="the" />
+ <stopWord value="and" />
+ <stopWord value="a" />
+ <stopWord value="this" />
+ <stopWord value="i" />
+ <stopWord value="is" />
+ </stopWords>
+ </analyzer>
+
+ </searchEngine>
+
+ </compass>
+
+</compass-core-config>
Added: incubator/esme/trunk/server/src/main/resources/props/compass.jndi.cfg.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/props/compass.jndi.cfg.xml?rev=754788&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/props/compass.jndi.cfg.xml (added)
+++ incubator/esme/trunk/server/src/main/resources/props/compass.jndi.cfg.xml Sun Mar 15 23:16:09 2009
@@ -0,0 +1,36 @@
+
+<compass-core-config xmlns="http://www.compass-project.org/schema/core-config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.compass-project.org/schema/core-config
+ http://www.compass-project.org/schema/compass-core-config-2.1.xsd">
+
+ <compass name="default">
+
+ <connection>
+ <jdbc>
+ <dataSourceProvider>
+ <jndi lookup="esme" username="testusername" password="testpassword" />
+ </dataSourceProvider>
+ </jdbc>
+
+ </connection>
+ <searchEngine >
+ <analyzer name="default" type="Stop" />
+ <analyzer name="tag" type="Standard" />
+ <analyzer name="stemming" type="Snowball" snowballType="English">
+ <stopWords>
+ <stopWord value="no" />
+ <stopWord value="the" />
+ <stopWord value="and" />
+ <stopWord value="a" />
+ <stopWord value="this" />
+ <stopWord value="i" />
+ <stopWord value="is" />
+ </stopWords>
+ </analyzer>
+
+ </searchEngine>
+
+ </compass>
+
+</compass-core-config>
Added: incubator/esme/trunk/server/src/main/resources/props/default.props
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/props/default.props?rev=754788&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/props/default.props (added)
+++ incubator/esme/trunk/server/src/main/resources/props/default.props Sun Mar 15 23:16:09 2009
@@ -0,0 +1 @@
+compass_config_file=/props/compass.filesystem.cfg.xml
Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=754788&r1=754787&r2=754788&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sun Mar 15 23:16:09 2009
@@ -145,7 +145,10 @@
object Compass {
// Set up Compass for search
- val conf = new CompassConfiguration().configure("/props/compass.cfg.xml").addClass((new Message).clazz)
+ val conf = new CompassConfiguration()
+ .configure(Props.get("compass_config_file") openOr "/props/compass.cfg.xml")
+ .addClass((new Message).clazz)
+
val compass = conf.buildCompass()
if (!compass.getSearchEngineIndexManager.indexExists)
{
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=754788&r1=754787&r2=754788&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sun Mar 15 23:16:09 2009
@@ -34,7 +34,7 @@
import org.compass.core._
import lucene.util._
import org.apache.lucene.index.TermFreqVector
-import net.sf.snowball.ext._
+import org.tartarus.snowball.ext.PorterStemmer
import org.apache.esme._
import lib._