svn commit: r1669431 - in /lucene/dev/trunk: lucene/ivy-versions.properties solr/CHANGES.txt solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1 solr/server/etc/jetty.xml solr/server/ivy.xml

[ho...@apache.org]

Author: hossman
Date: Thu Mar 26 20:51:23 2015
New Revision: 1669431

URL: http://svn.apache.org/r1669431
Log:
SOLR-7240: '/' redirects to '/solr/' for convinience

Added:
    lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1   (with props)
Modified:
    lucene/dev/trunk/lucene/ivy-versions.properties
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/server/etc/jetty.xml
    lucene/dev/trunk/solr/server/ivy.xml

Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1669431&r1=1669430&r2=1669431&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Thu Mar 26 20:51:23 2015
@@ -190,6 +190,7 @@ org.eclipse.jetty.version = 9.2.9.v20150
 /org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-io = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-jmx = ${org.eclipse.jetty.version}
+/org.eclipse.jetty/jetty-rewrite = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-security = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-server = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-servlet = ${org.eclipse.jetty.version}

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1669431&r1=1669430&r2=1669431&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Mar 26 20:51:23 2015
@@ -224,7 +224,7 @@ New Features
 * SOLR-7226: Make /query/* jmx/* , requestDispatcher/*, <listener> <initParams>
   properties in solrconfig.xml editable (Noble Paul)
 
-
+* SOLR-7240: '/' redirects to '/solr/ for convinience (Martijn Koster, hossman)
 
 
 Bug Fixes

Added: lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1?rev=1669431&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1 Thu Mar 26 20:51:23 2015
@@ -0,0 +1 @@
+c6ad2ded06bdda6444286fc18348016d82750cf0

Modified: lucene/dev/trunk/solr/server/etc/jetty.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/etc/jetty.xml?rev=1669431&r1=1669430&r2=1669431&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/etc/jetty.xml (original)
+++ lucene/dev/trunk/solr/server/etc/jetty.xml Thu Mar 26 20:51:23 2015
@@ -13,13 +13,34 @@
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
     <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            --> 
+    <!-- RewriteHandle to redirect root to Solr                      -->
+    <!-- =========================================================== -->
+     <New id="RewriteHandler" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+      <Set name="rewriteRequestURI">true</Set>
+      <Set name="rewritePathInfo">false</Set>
+      <Set name="originalPathAttribute">requestedPath</Set>
+
+      <Call name="addRule">
+        <Arg>
+          <New class="org.eclipse.jetty.rewrite.handler.RedirectRegexRule">
+            <Set name="regex">^/$</Set>
+            <Set name="replacement">/solr/</Set>
+          </New>
+        </Arg>
+      </Call>
+     </New>
+
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            -->
     <!-- =========================================================== -->
     <Set name="handler">
       <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
         <Set name="handlers">
          <Array type="org.eclipse.jetty.server.Handler">
            <Item>
+             <Ref id="RewriteHandler"/>
+           </Item>
+           <Item>
              <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
            </Item>
            <Item>

Modified: lucene/dev/trunk/solr/server/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/ivy.xml?rev=1669431&r1=1669430&r2=1669431&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/ivy.xml (original)
+++ lucene/dev/trunk/solr/server/ivy.xml Thu Mar 26 20:51:23 2015
@@ -37,6 +37,7 @@
     <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="${/org.eclipse.jetty/jetty-jmx}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty" name="jetty-rewrite" rev="${/org.eclipse.jetty/jetty-rewrite}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-security" rev="${/org.eclipse.jetty/jetty-security}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-server" rev="${/org.eclipse.jetty/jetty-server}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${/org.eclipse.jetty/jetty-servlet}" conf="jetty"/>