From 16df0cfe1695fb10cf6a8f186971ef52c9320ef9 Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Sat, 17 Oct 2009 19:05:53 +0000
Subject: [PATCH] simplify classpath regex

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@826289 13f79535-47bb-0310-9956-ffa450edef68
---
 contrib/clustering/example/conf/solrconfig.xml    | 2 +-
 example/example-DIH/solr/mail/conf/solrconfig.xml | 2 +-
 example/solr/conf/solrconfig.xml                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/clustering/example/conf/solrconfig.xml b/contrib/clustering/example/conf/solrconfig.xml
index 54627d653fe..3547f2f582f 100644
--- a/contrib/clustering/example/conf/solrconfig.xml
+++ b/contrib/clustering/example/conf/solrconfig.xml
@@ -26,7 +26,7 @@
      -->
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <lib dir="../../../dist/" regex="apache-solr-clustering-(nightly|\d).*\.jar" />
+  <lib dir="../../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
   <lib dir="../lib" />
   <!-- these jars are not inlcuded in the release because of their licenses,
        they will be downlodded when 'ant example' is run
diff --git a/example/example-DIH/solr/mail/conf/solrconfig.xml b/example/example-DIH/solr/mail/conf/solrconfig.xml
index 5a6d9ebb608..617b1422044 100644
--- a/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -27,7 +27,7 @@
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
   <lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" />
-  <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-extras-(nightly|\d).*jar" />
+  <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-extras-\d.*\.jar" />
   
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default unless overridden. -->
diff --git a/example/solr/conf/solrconfig.xml b/example/solr/conf/solrconfig.xml
index a5c551afce3..93737043a86 100755
--- a/example/solr/conf/solrconfig.xml
+++ b/example/solr/conf/solrconfig.xml
@@ -51,7 +51,7 @@
        directory which completely match the regex (anchored on both ends)
        will be included.
     -->
-  <lib dir="../../dist/" regex="apache-solr-cell-(nightly|\d).*\.jar" />
+  <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
   <!-- If a dir option (with or without a regex) is used and nothing is found
        that matches, it will be ignored
     -->