Index: docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml	(revision 2201)
+++ docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml	(working copy)
@@ -386,10 +386,11 @@ deploy/modeshape-services.jar/META-INF/
 deploy/modeshape-services.jar/aperture-1.1.0.Beta1.jar 
 deploy/modeshape-services.jar/google-collections-1.0.jar  
 deploy/modeshape-services.jar/joda-time-1.6.jar  
-deploy/modeshape-services.jar/lucene-analyzers-3.0.0.jar  
-deploy/modeshape-services.jar/lucene-core-3.0.0.jar  
-deploy/modeshape-services.jar/lucene-regex-3.0.0.jar  
-deploy/modeshape-services.jar/lucene-snowball-3.0.0.jar  
+deploy/modeshape-services.jar/lucene-analyzers-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-core-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-regex-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-snowball-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-misc-3.0.2.jar  
 deploy/modeshape-services.jar/poi-3.6.jar  
 deploy/modeshape-services.jar/poi-scratchpad-3.6.jar  
 deploy/modeshape-services.jar/managedConfigRepository.xml  
Index: docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml
===================================================================
--- docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml	(revision 2201)
+++ docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml	(working copy)
@@ -865,10 +865,11 @@ deploy/modeshape-services.jar/META-INF/
 deploy/modeshape-services.jar/aperture-1.1.0.Beta1.jar 
 deploy/modeshape-services.jar/google-collections-1.0.jar  
 deploy/modeshape-services.jar/joda-time-1.6.jar  
-deploy/modeshape-services.jar/lucene-analyzers-3.0.0.jar  
-deploy/modeshape-services.jar/lucene-core-3.0.0.jar  
-deploy/modeshape-services.jar/lucene-regex-3.0.0.jar  
-deploy/modeshape-services.jar/lucene-snowball-3.0.0.jar  
+deploy/modeshape-services.jar/lucene-analyzers-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-core-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-regex-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-snowball-3.0.2.jar  
+deploy/modeshape-services.jar/lucene-misc-3.0.2.jar  
 deploy/modeshape-services.jar/poi-3.6.jar  
 deploy/modeshape-services.jar/poi-scratchpad-3.6.jar  
 deploy/modeshape-services.jar/managedConfigRepository.xml  
Index: docs/reference/src/main/docbook/en-US/content/jcr/web_access.xml
===================================================================
--- docs/reference/src/main/docbook/en-US/content/jcr/web_access.xml	(revision 2201)
+++ docs/reference/src/main/docbook/en-US/content/jcr/web_access.xml	(working copy)
@@ -373,10 +373,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 	|	+ jcr-2.0.jar
 	|	+ joda-time-1.6.jar
 	|	+ junit-dep-4.4.jar
-	|	+ lucene-analyzers-3.0.0.jar
-	|	+ lucene-core-3.0.0.jar
-	|	+ lucene-regex-3.0.0.jar
-	|	+ lucene-snowball-3.0.0.jar
+	|	+ lucene-analyzers-3.0.2.jar
+	|	+ lucene-core-3.0.2.jar
+	|	+ lucene-regex-3.0.2.jar
+	|	+ lucene-snowball-3.0.2.jar
+	|	+ lucene-misc-3.0.2.jar
 	|	+ modeshape-cnd-&versionNumber;.jar
 	|	+ modeshape-common-&versionNumber;.jar
 	|	+ modeshape-graph-&versionNumber;.jar
Index: extensions/modeshape-search-lucene/pom.xml
===================================================================
--- extensions/modeshape-search-lucene/pom.xml	(revision 2201)
+++ extensions/modeshape-search-lucene/pom.xml	(working copy)
@@ -31,22 +31,27 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-snowball</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-regex</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-misc</artifactId>
+      <version>3.0.2</version>
     </dependency>
       <dependency>
          <groupId>com.google.collections</groupId>
Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/AbstractLuceneSearchEngine.java
===================================================================
--- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/AbstractLuceneSearchEngine.java	(revision 2201)
+++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/AbstractLuceneSearchEngine.java	(working copy)
@@ -37,6 +37,8 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.TermAttribute;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.complexPhrase.ComplexPhraseQueryParser;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Collector;
@@ -45,6 +47,7 @@ import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.util.Version;
 import org.modeshape.common.collection.SimpleProblems;
 import org.modeshape.common.util.Logger;
 import org.modeshape.graph.ExecutionContext;
@@ -109,6 +112,7 @@ import org.modeshape.graph.search.AbstractSearchEngine;
 import org.modeshape.graph.search.SearchEngine;
 import org.modeshape.graph.search.SearchEngineProcessor;
 import org.modeshape.graph.search.SearchEngineWorkspace;
+import org.modeshape.search.lucene.query.CompareStringQuery;
 import org.modeshape.search.lucene.query.HasValueQuery;
 import org.modeshape.search.lucene.query.MatchNoneQuery;
 
@@ -290,7 +294,7 @@ public abstract class AbstractLuceneSearchEngine<WorkspaceType extends SearchEng
         /**
          * Create the field name that will be used to store the full-text searchable property values.
          * 
-         * @param propertyName the name of the property; may not be null
+         * @param propertyName the name of the property; may not null
          * @return the field name for the full-text searchable property values; never null
          */
         protected abstract String fullTextFieldName( String propertyName );
@@ -785,8 +789,30 @@ public abstract class AbstractLuceneSearchEngine<WorkspaceType extends SearchEng
                 }
                 if (term instanceof FullTextSearch.SimpleTerm) {
                     FullTextSearch.SimpleTerm simple = (FullTextSearch.SimpleTerm)term;
+                    Analyzer analyzer = session.getAnalyzer();
                     if (simple.containsWildcards()) {
-                        return session.findNodesLike(fieldName, simple.getValue(), false);
+                        // Use the ComplexPhraseQueryParser, but instead of wildcard queries (which don't work with leading
+                        // wildcards) we should use our like queries (which often use RegexQuery where applicable) ...
+                        ComplexPhraseQueryParser parser = new ComplexPhraseQueryParser(session.getVersion(), fieldName, analyzer) {
+                            @Override
+                            protected Query getWildcardQuery( String field,
+                                                              String termStr ) {
+                                return CompareStringQuery.createQueryForNodesWithFieldLike(termStr, field, valueFactories, false);
+                            }
+                        };
+                        try {
+                            String expression = simple.getValue();
+                            // The ComplexPhraseQueryParser only understands the '?' and '*' as being wildcards ...
+                            expression = expression.replaceAll("(?<![\\\\])_", "?");
+                            expression = expression.replaceAll("(?<![\\\\])%", "*");
+                            // // Replace any '-' between tokens, except when preceded or followed by a digit, '*', or '?' ...
+                            expression = expression.replaceAll("((?<![\\d*?]))[-]((?![\\d*?]))", "$1 $2");
+                            // Then use the parser ...
+                            Query query = parser.parse(expression);
+                            return query;
+                        } catch (ParseException e) {
+                            throw new IOException(e);
+                        }
                     }
                     PhraseQuery query = new PhraseQuery();
                     query.setSlop(0); // terms must be adjacent
@@ -841,6 +867,8 @@ public abstract class AbstractLuceneSearchEngine<WorkspaceType extends SearchEng
 
         Analyzer getAnalyzer();
 
+        Version getVersion();
+
         /**
          * Create a {@link TupleCollector} instance that collects the results from the index(es).
          * 
Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneConfiguration.java
===================================================================
--- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneConfiguration.java	(revision 2201)
+++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneConfiguration.java	(working copy)
@@ -25,15 +25,23 @@ package org.modeshape.search.lucene;
 
 import net.jcip.annotations.ThreadSafe;
 import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.Version;
 import org.modeshape.graph.search.SearchEngineException;
 
 /**
  * Interface used to obtain the Lucene {@link Directory} instance that should be used for a workspace given the name of the
- * workspace. There are several implementations (see {@link LuceneConfigurations}), but custom implementations can always be
- * used.
+ * workspace. There are several implementations (see {@link LuceneConfigurations}), but custom implementations can always be used.
  */
 @ThreadSafe
 public interface LuceneConfiguration {
+
+    /**
+     * Get the version for the Lucene configuration.
+     * 
+     * @return the version
+     */
+    Version getVersion();
+
     /**
      * Get the {@link Directory} that should be used for the workspace with the supplied name.
      * 
Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneConfigurations.java
===================================================================
--- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneConfigurations.java	(revision 2201)
+++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneConfigurations.java	(working copy)
@@ -32,6 +32,7 @@ import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.LockFactory;
 import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
 import org.modeshape.common.i18n.I18n;
 import org.modeshape.common.text.NoOpEncoder;
 import org.modeshape.common.text.TextEncoder;
@@ -188,6 +189,16 @@ public class LuceneConfigurations {
         protected RamDirectoryFactory() {
         }
 
+        /**
+         * {@inheritDoc}
+         * 
+         * @see org.modeshape.search.lucene.LuceneConfiguration#getVersion()
+         */
+        @Override
+        public Version getVersion() {
+            return Version.LUCENE_30;
+        }
+
         @Override
         protected RAMDirectory createDirectory( String workspaceName,
                                                 String indexName ) {
@@ -286,6 +297,16 @@ public class LuceneConfigurations {
             this.indexNameEncoder = indexNameEncoder != null ? indexNameEncoder : new NoOpEncoder();
         }
 
+        /**
+         * {@inheritDoc}
+         * 
+         * @see org.modeshape.search.lucene.LuceneConfiguration#getVersion()
+         */
+        @Override
+        public Version getVersion() {
+            return Version.LUCENE_30;
+        }
+
         @Override
         protected FSDirectory createDirectory( String workspaceName,
                                                String indexName ) {
Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchEngine.java
===================================================================
--- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchEngine.java	(revision 2201)
+++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchEngine.java	(working copy)
@@ -35,7 +35,6 @@ import net.jcip.annotations.Immutable;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.util.Version;
 import org.modeshape.common.text.FilenameEncoder;
 import org.modeshape.common.text.TextEncoder;
 import org.modeshape.common.text.UrlEncoder;
@@ -136,7 +135,7 @@ public class LuceneSearchEngine extends AbstractLuceneSearchEngine<LuceneSearchW
         super(sourceName, connectionFactory, verifyWorkspaceInSource);
         CheckArg.isNotNull(configuration, "configuration");
         this.configuration = configuration;
-        this.analyzer = analyzer != null ? analyzer : new StandardAnalyzer(Version.LUCENE_30);
+        this.analyzer = analyzer != null ? analyzer : new StandardAnalyzer(configuration.getVersion());
         this.rules = rules != null ? rules : DEFAULT_RULES;
     }
 
Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchSession.java
===================================================================
--- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchSession.java	(revision 2201)
+++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchSession.java	(working copy)
@@ -213,6 +213,16 @@ public class LuceneSearchSession implements WorkspaceSession {
         return workspace.analyzer;
     }
 
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.modeshape.search.lucene.AbstractLuceneSearchEngine.WorkspaceSession#getVersion()
+     */
+    @Override
+    public Version getVersion() {
+        return workspace.getVersion();
+    }
+
     public boolean hasWriters() {
         return contentWriter != null;
     }
@@ -347,7 +357,7 @@ public class LuceneSearchSession implements WorkspaceSession {
                                  int offset ) throws ParseException, IOException {
         // Parse the full-text search and search against the 'fts' field ...
         long planningNanos = System.nanoTime();
-        QueryParser parser = new QueryParser(Version.LUCENE_29, ContentIndex.FULL_TEXT, workspace.analyzer);
+        QueryParser parser = new QueryParser(workspace.getVersion(), ContentIndex.FULL_TEXT, workspace.analyzer);
         Query query = parser.parse(fullTextSearchExpression);
         planningNanos = System.nanoTime() - planningNanos;
 
Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchWorkspace.java
===================================================================
--- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchWorkspace.java	(revision 2201)
+++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchWorkspace.java	(working copy)
@@ -88,7 +88,7 @@ public class LuceneSearchWorkspace implements SearchEngineWorkspace {
         assert configuration != null;
         this.workspaceName = workspaceName;
         this.workspaceDirectoryName = workspaceName.trim().length() != 0 ? workspaceName : UUID.randomUUID().toString();
-        this.analyzer = analyzer != null ? analyzer : new StandardAnalyzer(Version.LUCENE_30);
+        this.analyzer = analyzer != null ? analyzer : new StandardAnalyzer(configuration.getVersion());
         this.rules = rules != null ? rules : LuceneSearchEngine.DEFAULT_RULES;
         this.configuration = configuration;
         this.contentDirectory = this.configuration.getDirectory(workspaceDirectoryName, INDEX_NAME);
@@ -141,4 +141,15 @@ public class LuceneSearchWorkspace implements SearchEngineWorkspace {
             changesLock.unlock();
         }
     }
+
+    /**
+     * Get the version information for Lucene.
+     * 
+     * @return the version information; never null
+     * @see org.modeshape.search.lucene.LuceneConfiguration#getVersion()
+     */
+    public Version getVersion() {
+        return configuration.getVersion();
+    }
+
 }
Index: modeshape-jcr/src/test/java/org/modeshape/jcr/JcrQueryManagerTest.java
===================================================================
--- modeshape-jcr/src/test/java/org/modeshape/jcr/JcrQueryManagerTest.java	(revision 2201)
+++ modeshape-jcr/src/test/java/org/modeshape/jcr/JcrQueryManagerTest.java	(working copy)
@@ -960,6 +960,92 @@ public class JcrQueryManagerTest {
         assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
     }
 
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithHyphen() throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"5-speed\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 1);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithHyphenAndNumberAndWildcard()
+        throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"5-s*\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 1);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithNoHyphenAndNoWildcard() throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"heavy duty\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 1);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithHyphenAndNoWildcard() throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"heavy-duty\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 1);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithNoHyphenAndWildcard() throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"heavy du*\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 1);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithHyphenAndWildcard() throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"heavy-du*\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 1);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
+    @SuppressWarnings( "deprecation" )
+    @Test
+    public void shouldBeAbleToExecuteXPathQueryWithComplexContainsCriteriaWithHyphenAndLeadingWildcard()
+        throws RepositoryException {
+        Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root//*[jcr:contains(., '\"*-speed\"')]",
+                                                                           Query.XPATH);
+        assertThat(query, is(notNullValue()));
+        QueryResult result = query.execute();
+        assertThat(result, is(notNullValue()));
+        assertResults(query, result, 2);
+        assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score");
+    }
+
     @FixFor( "MODE-790" )
     @SuppressWarnings( "deprecation" )
     @Test
Index: modeshape-jcr/src/test/resources/io/cars-system-view.xml
===================================================================
--- modeshape-jcr/src/test/resources/io/cars-system-view.xml	(revision 2201)
+++ modeshape-jcr/src/test/resources/io/cars-system-view.xml	(working copy)
@@ -131,6 +131,7 @@
       <sv:property sv:name="car:valueRating" sv:type="Long"><sv:value>4</sv:value></sv:property>
       <sv:property sv:name="car:mpgCity" sv:type="Long"><sv:value>13</sv:value></sv:property>
       <sv:property sv:name="car:mpgHighway" sv:type="Long"><sv:value>16</sv:value></sv:property>
+      <sv:property sv:name="car:engine" sv:type="String"><sv:value>5.7 L Vortec 5700 gasoline V8 TBI/GM 4L80-E 4-speed</sv:value></sv:property>
     </sv:node>
     <sv:node sv:name="Ford F-150">
       <sv:property sv:name="jcr:primaryType" sv:type="Name"><sv:value>car:Car</sv:value></sv:property>
@@ -142,6 +143,7 @@
       <sv:property sv:name="car:valueRating" sv:type="Long"><sv:value>1</sv:value></sv:property>
       <sv:property sv:name="car:mpgCity" sv:type="Long"><sv:value>14</sv:value></sv:property>
       <sv:property sv:name="car:mpgHighway" sv:type="Long"><sv:value>20</sv:value></sv:property>
+      <sv:property sv:name="car:engine" sv:type="String"><sv:value>4.6L 260 hp V8 5-speed (heavy-duty)</sv:value></sv:property>
     </sv:node>
   </sv:node>
 </sv:node>