Upgrade Apache Solr to 4.5.0 and PySolr to 3.1.0.

All Solr indexes will need to be re-created.

java/solr/README.txt

@@ -1,117 +1,120 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
+# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
+# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
+# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
+# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
+# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# the License.  You may obtain a copy of the License at
-#
+#
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
-#
+#
-# Unless required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+# See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
-
+
-
+
-Welcome to the Apache Solr project!
+Welcome to the Apache Solr project!
------------------------------------
+-----------------------------------
-
+
-Solr is the popular, blazing fast open source enterprise search platform
+Solr is the popular, blazing fast open source enterprise search platform
-from the Apache Lucene project.
+from the Apache Lucene project.
-
+
-For a complete description of the Solr project, team composition, source
+For a complete description of the Solr project, team composition, source
-code repositories, and other details, please see the Solr web site at
+code repositories, and other details, please see the Solr web site at
-http://lucene.apache.org/solr
+http://lucene.apache.org/solr
-
+
-
+
-Getting Started
+Getting Started
----------------
+---------------
-
+
-See the "example" directory for an example Solr setup.  A tutorial
+See the "example" directory for an example Solr setup.  A tutorial
-using the example setup can be found at
+using the example setup can be found at
-http://lucene.apache.org/solr/tutorial.html
+   http://lucene.apache.org/solr/tutorial.html
-or in in "docs/tutorial.html" in a binary distribution.
+or linked from "docs/index.html" in a binary distribution.
-
+Also, there are Solr clients for many programming languages, see 
-
+   http://wiki.apache.org/solr/IntegratingSolr
-
+
-Files included in an Apache Solr binary distribution
+
-----------------------------------------------------
+Files included in an Apache Solr binary distribution
-
+----------------------------------------------------
-example/
+
-  A self-contained example Solr instance, complete with a sample
+example/
-  configuration, documents to index, and the Jetty Servlet container.
+  A self-contained example Solr instance, complete with a sample
-  Please see example/README.txt for information about running this
+  configuration, documents to index, and the Jetty Servlet container.
-  example.
+  Please see example/README.txt for information about running this
-
+  example.
-dist/apache-solr-XX.war
+
-  The Apache Solr Application.  Deploy this WAR file to any servlet
+dist/solr-XX.war
-  container to run Apache Solr.
+  The Apache Solr Application.  Deploy this WAR file to any servlet
-
+  container to run Apache Solr.
-dist/apache-solr-XX.jar
+
-  The Apache Solr Libraries.  This JAR file is needed to compile
+dist/solr-<component>-XX.jar
-  Apache Solr Plugins (see http://wiki.apache.org/solr/SolrPlugins for
+  The Apache Solr libraries.  To compile Apache Solr Plugins,
-  more information).
+  one or more of these will be required.  The core library is
-
+  required at a minimum. (see http://wiki.apache.org/solr/SolrPlugins
-docs/index.html
+  for more information).
-  The contents of the Apache Solr website.
+
-  
+docs/index.html
-docs/api/index.html
+  The Apache Solr Javadoc API documentation and Tutorial
-  The Apache Solr Javadoc API documentation.
+
-
+
-
+Instructions for Building Apache Solr from Source
-
+-------------------------------------------------
-Instructions for Building Apache Solr from Source
+
--------------------------------------------------
+1. Download the Java SE 6 JDK (Java Development Kit) or later from http://java.sun.com/
-
+   You will need the JDK installed, and the $JAVA_HOME/bin (Windows: %JAVA_HOME%\bin) 
-1. Download the J2SE 5.0 JDK (Java Development Kit) or later from http://java.sun.com.
+   folder included on your command path. To test this, issue a "java -version" command 
-   You will need the JDK installed, and the %JAVA_HOME%\bin directory included
+   from your shell (command prompt) and verify that the Java version is 1.6 or later.
-   on your command path.  To test this, issue a "java -version" command from your
+
-   shell and verify that the Java version is 5.0 or later.
+2. Download the Apache Ant binary distribution (1.8.2+) from 
-
+   http://ant.apache.org/  You will need Ant installed and the $ANT_HOME/bin (Windows: 
-2. Download the Apache Ant binary distribution (1.7.x, not 1.6.x, not 1.8.x) from http://ant.apache.org.
+   %ANT_HOME%\bin) folder included on your command path. To test this, issue a 
-   You will need Ant installed and the %ANT_HOME%\bin directory included on your
+   "ant -version" command from your shell (command prompt) and verify that Ant is 
-   command path.  To test this, issue a "ant -version" command from your
+   available. 
-   shell and verify that Ant is available.
+
-
+   You will also need to install Apache Ivy binary distribution (2.2.0) from 
-3. Download the Apache Solr distribution, linked from the above 
+   http://ant.apache.org/ivy/ and place ivy-2.2.0.jar file in ~/.ant/lib -- if you skip 
-   web site.  Expand the distribution to a folder of your choice, e.g. c:\solr.   
+   this step, the Solr build system will offer to do it for you.
-   Alternately, you can obtain a copy of the latest Apache Solr source code
+
-   directly from the Subversion repository:
+3. Download the Apache Solr distribution, linked from the above web site. 
-
+   Unzip the distribution to a folder of your choice, e.g. C:\solr or ~/solr
-     http://lucene.apache.org/solr/version_control.html
+   Alternately, you can obtain a copy of the latest Apache Solr source code
-
+   directly from the Subversion repository:
-4. Navigate to the "solr" folder and issue an "ant" command to see the available options
+
-   for building, testing, and packaging Solr.
+     http://lucene.apache.org/solr/versioncontrol.html
-  
+
-   NOTE: 
+4. Navigate to the "solr" folder and issue an "ant" command to see the available options
-   To see Solr in action, you may want to use the "ant example" command to build
+   for building, testing, and packaging Solr.
-   and package Solr into the example/webapps directory. See also example/README.txt.
+  
-
+   NOTE: 
-
+   To see Solr in action, you may want to use the "ant example" command to build
-Export control
+   and package Solr into the example/webapps directory. See also example/README.txt.
--------------------------------------------------
+
-This distribution includes cryptographic software.  The country in
+
-which you currently reside may have restrictions on the import,
+Export control
-possession, use, and/or re-export to another country, of
+-------------------------------------------------
-encryption software.  BEFORE using any encryption software, please
+This distribution includes cryptographic software.  The country in
-check your country's laws, regulations and policies concerning the
+which you currently reside may have restrictions on the import,
-import, possession, or use, and re-export of encryption software, to
+possession, use, and/or re-export to another country, of
-see if this is permitted.  See <http://www.wassenaar.org/> for more
+encryption software.  BEFORE using any encryption software, please
-information.
+check your country's laws, regulations and policies concerning the
-
+import, possession, or use, and re-export of encryption software, to
-The U.S. Government Department of Commerce, Bureau of Industry and
+see if this is permitted.  See <http://www.wassenaar.org/> for more
-Security (BIS), has classified this software as Export Commodity
+information.
-Control Number (ECCN) 5D002.C.1, which includes information security
+
-software using or performing cryptographic functions with asymmetric
+The U.S. Government Department of Commerce, Bureau of Industry and
-algorithms.  The form and manner of this Apache Software Foundation
+Security (BIS), has classified this software as Export Commodity
-distribution makes it eligible for export under the License Exception
+Control Number (ECCN) 5D002.C.1, which includes information security
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
+software using or performing cryptographic functions with asymmetric
-Export Administration Regulations, Section 740.13) for both object
+algorithms.  The form and manner of this Apache Software Foundation
-code and source code.
+distribution makes it eligible for export under the License Exception
-
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
-The following provides more details on the included cryptographic
+Export Administration Regulations, Section 740.13) for both object
-software:
+code and source code.
-    Apache Solr uses the Apache Tika which uses the Bouncy Castle generic encryption libraries for
+
-    extracting text content and metadata from encrypted PDF files.
+The following provides more details on the included cryptographic
-    See http://www.bouncycastle.org/ for more details on Bouncy Castle.
+software:
+    Apache Solr uses the Apache Tika which uses the Bouncy Castle generic encryption libraries for
+    extracting text content and metadata from encrypted PDF files.
+    See http://www.bouncycastle.org/ for more details on Bouncy Castle.

java/solr/SYSTEM_REQUIREMENTS.txt

@@ -0,0 +1,13 @@
+# System Requirements 
+
+Apache Solr runs of Java 6 or greater. When using Java 7, be sure to 
+install at least Update 1! With all Java versions it is strongly 
+recommended to not use experimental `-XX` JVM options. It is also 
+recommended to always use the latest update version of your Java VM, 
+because bugs may affect Solr. An overview of known JVM bugs can be 
+found on http://wiki.apache.org/lucene-java/JavaBugs. 
+
+CPU, disk and memory requirements are based on the many choices made in 
+implementing Solr (document size, number of documents, and number of 
+hits retrieved to name a few). The benchmarks page has some information 
+related to performance on particular platforms. 

java/solr/dist/test-framework/README.txt

@@ -0,0 +1,6 @@
+The Solr test-framework products base classes and utility classes for 
+writting JUnit tests excercising Solr functionality.
+
+This test framework relies on the lucene components found in in the 
+./lucene-libs/ directory, as well as the third-party libraries found 
+in the ./lib directory.

java/solr/server/README.txt

@@ -1,51 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Solr example configuration
---------------------------
-
-To run this example configuration, use 
-
-  java -jar start.jar
-
-in this directory, and when Solr is started connect to 
-
-  http://localhost:8983/solr/admin/
-
-To add documents to the index, use the post.sh script in the exampledocs
-subdirectory (while Solr is running), for example:
-
-  cd exampledocs
-  sh post.sh *.xml
-
-See also README.txt in the solr subdirectory, and check
-http://wiki.apache.org/solr/SolrResources for a list of tutorials and
-introductory articles.
-
-NOTE: This Solr example server references certain Solr jars outside of
-this server directory for non-core modules with <lib> statements in
-solrconfig.xml.  If you make a copy of this example server and wish
-to use the ExtractingRequestHandler (SolrCell), DataImportHandler (DIH),
-UIMA, the clustering component, or other modules in "contrib",
-you will need to copy the required jars into solr/lib or update the paths to
-the jars in your solrconfig.xml.
-
-By default, start.jar starts Solr in Jetty using the default solr home
-directory of "./solr/" -- To run other example configurations, you can
-speciy the solr.solr.home system property when starting jetty...
-
-  java -Dsolr.solr.home=multicore -jar start.jar
-  java -Dsolr.solr.home=example-DIH -jar start.jar
-

java/solr/server/contexts/solr-jetty-context.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+  <Set name="contextPath"><SystemProperty name="hostContext" default="/solr"/></Set>
+  <Set name="war"><SystemProperty name="jetty.home"/>/webapps/solr.war</Set>
+  <Set name="defaultsDescriptor"><SystemProperty name="jetty.home"/>/etc/webdefault.xml</Set>
+  <Set name="tempDirectory"><Property name="jetty.home" default="."/>/solr-webapp</Set>
+</Configure>

java/solr/server/etc/create-solrtest.keystore.sh

@@ -0,0 +1,37 @@
+#!/bin/bash -ex
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+############
+ 
+# This script shows how the solrtest.keystore file used for solr tests 
+# and these example configs was generated.
+#
+# Running this script should only be necessary if the keystore file
+# needs to be replaced, which shouldn't be required until sometime around
+# the year 4751.
+#
+# NOTE: the "-ext" option used in the "keytool" command requires that you have
+# the java7 version of keytool, but the generated key will work with any 
+# version of java
+
+echo "### remove old keystore"
+rm -f solrtest.keystore
+
+echo "### create keystore and keys"
+keytool -keystore solrtest.keystore -storepass "secret" -alias solrtest -keypass "secret" -genkey -keyalg RSA -dname "cn=localhost, ou=SolrTest, o=lucene.apache.org, c=US" -ext "san=ip:127.0.0.1" -validity 999999
+
+

java/solr/server/etc/jetty.xml

@@ -1,227 +1,205 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
+
-<!-- =============================================================== -->
+<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
+<!-- Configure the Jetty Server                                      -->
-<!--                                                                 -->
+<!--                                                                 -->
-<!-- Documentation of this file format can be found at:              -->
+<!-- Documentation of this file format can be found at:              -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
-<!--                                                                 -->
+<!--                                                                 -->
-<!-- =============================================================== -->
+<!-- =============================================================== -->
-
+
-
+
-<Configure id="Server" class="org.mortbay.jetty.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
+
-    <!-- Increase the maximum POST size to 1 MB to be able to handle large shard requests -->
+    <!-- =========================================================== -->
-    <Call class="java.lang.System" name="setProperty">
+    <!-- Server Thread Pool                                          -->
-      <Arg>org.mortbay.jetty.Request.maxFormContentSize</Arg>
+    <!-- =========================================================== -->
-      <Arg>1000000</Arg>
+    <Set name="ThreadPool">
-    </Call>
+      <!-- Default queued blocking threadpool -->
-
+      <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-    <!-- =========================================================== -->
+        <Set name="minThreads">10</Set>
-    <!-- Server Thread Pool                                          -->
+        <Set name="maxThreads">10000</Set>
-    <!-- =========================================================== -->
+        <Set name="detailedDump">false</Set>
-    <Set name="ThreadPool">
+      </New>
-
+    </Set>
-      <New class="org.mortbay.thread.QueuedThreadPool">
+
-        <Set name="minThreads">10</Set>
+    <!-- =========================================================== -->
-        <Set name="maxThreads">10000</Set>
+    <!-- Set connectors                                              -->
-        <Set name="lowThreads">20</Set>
+    <!-- =========================================================== -->
-      </New>
+
-
+  <!--
-      <!-- Optional Java 5 bounded threadpool with job queue 
+    <Call name="addConnector">
-      <New class="org.mortbay.thread.concurrent.ThreadPool">
+      <Arg>
-        <Set name="corePoolSize">50</Set>
+          <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-        <Set name="maximumPoolSize">50</Set>
+            <Set name="host"><SystemProperty name="jetty.host" /></Set>
-      </New>
+            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
-      -->
+            <Set name="maxIdleTime">50000</Set>
-    </Set>
+            <Set name="Acceptors">2</Set>
-
+            <Set name="statsOn">false</Set>
-
+            <Set name="confidentialPort">8443</Set>
-
+	    <Set name="lowResourcesConnections">5000</Set>
-    <!-- =========================================================== -->
+	    <Set name="lowResourcesMaxIdleTime">5000</Set>
-    <!-- Set connectors                                              -->
+          </New>
-    <!-- =========================================================== -->
+      </Arg>
-    <!-- One of each type!                                           -->
+    </Call>
-    <!-- =========================================================== -->
+  -->
-
+
-    <!-- Use this connector for many frequently idle connections
+    <!-- This connector is currently being used for Solr because it
-         and for threadless continuations.
+          showed better performance than nio.SelectChannelConnector
-    -->    
+          for typical Solr requests.  -->
-  <!--
+    <Call name="addConnector">
-    <Call name="addConnector">
+      <Arg>
-      <Arg>
+          <New class="org.eclipse.jetty.server.bio.SocketConnector">
-          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+            <Call class="java.lang.System" name="setProperty"> <Arg>log4j.configuration</Arg> <Arg>etc/log4j.properties</Arg> </Call>
-            <Set name="host"><SystemProperty name="jetty.host" /></Set>
+            <Set name="host"><SystemProperty name="jetty.host" /></Set>
-            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
-            <Set name="maxIdleTime">30000</Set>
+            <Set name="maxIdleTime">50000</Set>
-            <Set name="Acceptors">2</Set>
+            <Set name="lowResourceMaxIdleTime">1500</Set>
-            <Set name="statsOn">false</Set>
+            <Set name="statsOn">false</Set>
-            <Set name="confidentialPort">8443</Set>
+          </New>
-	    <Set name="lowResourcesConnections">5000</Set>
+      </Arg>
-	    <Set name="lowResourcesMaxIdleTime">5000</Set>
+    </Call>
-          </New>
+
-      </Arg>
+    <!-- if the connector below is uncommented, then jetty will also accept SSL
-    </Call>
+         connections on port 8984, using a self signed certificate and can 
-  -->
+         optionally require the client to authenticate with a certificate. 
-
+         (which can be the same as the server certificate_
-    <!-- This connector is currently being used for Solr because it
+         
-          showed better performance than nio.SelectChannelConnector
+         # Run solr example with SSL on port 8984
-          for typical Solr requests.  -->
+         java -jar start.jar
-    <Call name="addConnector">
+         # 
-      <Arg>
+         # Run post.jar so that it trusts the server cert...
-          <New class="org.mortbay.jetty.bio.SocketConnector">
+         java -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-            <Set name="host"><SystemProperty name="jetty.host" default="localhost" /></Set>
+
-            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+         # Run solr example with SSL requiring client certs on port 8984
-            <Set name="maxIdleTime">50000</Set>
+         java -Djetty.ssl.clientAuth=true -jar start.jar
-            <Set name="lowResourceMaxIdleTime">1500</Set>
+         #
-            <Set name="statsOn">false</Set>
+         # Run post.jar so that it trusts the server cert, 
-          </New>
+         # and authenticates with a client cert
-      </Arg>
+         java -Djavax.net.ssl.keyStorePassword=secret -Djavax.net.ssl.keyStore=../etc/solrtest.keystore -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-    </Call>
+
-
+    -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!--
-    <!-- To add a HTTPS SSL listener                                     -->
+    <Call name="addConnector">
-    <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
+      <Arg>
-    <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml             -->
+        <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+          <Arg>
-
+            <New class="org.eclipse.jetty.http.ssl.SslContextFactory">
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+              <Set name="keyStore"><SystemProperty name="jetty.home" default="."/>/etc/solrtest.keystore</Set>
-    <!-- To allow Jetty to be started from xinetd                        -->
+              <Set name="keyStorePassword">secret</Set>
-    <!-- mixin jetty-xinetd.xml:                                         -->
+              <Set name="needClientAuth"><SystemProperty name="jetty.ssl.clientAuth" default="false"/></Set>
-    <!--   java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml        -->
+            </New>
-    <!--                                                                 -->
+          </Arg>
-    <!-- See jetty-xinetd.xml for further instructions.                  -->
+          <Set name="port"><SystemProperty name="jetty.ssl.port" default="8984"/></Set>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+          <Set name="maxIdleTime">30000</Set>
-    
+        </New>
-    <!-- =========================================================== -->
+      </Arg>
-    <!-- Set up global session ID manager                            -->
+    </Call>
-    <!-- =========================================================== -->
+    -->
-    <!--
+
-    <Set name="sessionIdManager">
+    <!-- =========================================================== -->
-      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+    <!-- Set handler Collection Structure                            --> 
-        <Set name="workerName">node1</Set>
+    <!-- =========================================================== -->
-      </New>
+    <Set name="handler">
-    </Set>
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-    -->
+        <Set name="handlers">
-
+         <Array type="org.eclipse.jetty.server.Handler">
-    <!-- =========================================================== -->
+           <Item>
-    <!-- Set handler Collection Structure                            --> 
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-    <!-- =========================================================== -->
+           </Item>
-    <Set name="handler">
+           <Item>
-      <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-        <Set name="handlers">
+           </Item>
-         <Array type="org.mortbay.jetty.Handler">
+           <Item>
-           <Item>
+             <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
-             <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+           </Item>
-           </Item>
+         </Array>
-           <Item>
+        </Set>
-             <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+      </New>
-           </Item>
+    </Set>
-           <Item>
+    
-             <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+    <!-- =========================================================== -->
-           </Item>
+    <!-- Configure Request Log                                       -->
-         </Array>
+    <!-- =========================================================== -->
-        </Set>
+    <!-- 
-      </New>
+    <Ref id="Handlers">
-    </Set>
+      <Call name="addHandler">
-    
+        <Arg>
-    <!-- =========================================================== -->
+          <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
-    <!-- Configure the context deployer                              -->
+            <Set name="requestLog">
-    <!-- A context deployer will deploy contexts described in        -->
+              <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
-    <!-- configuration files discovered in a directory.              -->
+                <Set name="filename">
-    <!-- The configuration directory can be scanned for hot          -->
+                   logs/request.yyyy_mm_dd.log
-    <!-- deployments at the configured scanInterval.                 -->
+                </Set>
-    <!--                                                             -->
+                <Set name="filenameDateFormat">yyyy_MM_dd</Set>
-    <!-- This deployer is configured to deploy contexts configured   -->
+                <Set name="retainDays">90</Set>
-    <!-- in the $JETTY_HOME/contexts directory                       -->
+                <Set name="append">true</Set>
-    <!--                                                             -->
+                <Set name="extended">false</Set>
-    <!-- =========================================================== -->
+                <Set name="logCookies">false</Set>
-    <Call name="addLifeCycle">
+                <Set name="LogTimeZone">UTC</Set>
-      <Arg>
+              </New>
-        <New class="org.mortbay.jetty.deployer.ContextDeployer">
+            </Set>
-          <Set name="contexts"><Ref id="Contexts"/></Set>
+          </New>
-          <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
+        </Arg>
-          <Set name="scanInterval">5</Set>
+      </Call>
-        </New>
+    </Ref>
-      </Arg>
+    -->
-    </Call>
+
-
+    <!-- =========================================================== -->
-    <!-- =========================================================== -->
+    <!-- extra options                                               -->
-    <!-- Configure the webapp deployer.                              -->
+    <!-- =========================================================== -->
-    <!-- A webapp  deployer will deploy standard webapps discovered  -->
+    <Set name="stopAtShutdown">true</Set>
-    <!-- in a directory at startup, without the need for additional  -->
+    <Set name="sendServerVersion">false</Set>
-    <!-- configuration files.    It does not support hot deploy or   -->
+    <Set name="sendDateHeader">false</Set>
-    <!-- non standard contexts (see ContextDeployer above).          -->
+    <Set name="gracefulShutdown">1000</Set>
-    <!--                                                             -->
+    <Set name="dumpAfterStart">false</Set>
-    <!-- This deployer is configured to deploy webapps from the      -->
+    <Set name="dumpBeforeStop">false</Set>
-    <!-- $JETTY_HOME/webapps directory                               -->
+
-    <!--                                                             -->
+
-    <!-- Normally only one type of deployer need be used.            -->
+
-    <!--                                                             -->
+
-    <!-- =========================================================== -->
+    <Call name="addBean">
-    <Call name="addLifeCycle">
+      <Arg>
-      <Arg>
+        <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-        <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+          <Set name="contexts">
-          <Set name="contexts"><Ref id="Contexts"/></Set>
+            <Ref id="Contexts" />
-          <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
+          </Set>
-	  <Set name="parentLoaderPriority">false</Set>
+          <Call name="setContextAttribute">
-	  <Set name="extract">true</Set>
+            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-	  <Set name="allowDuplicates">false</Set>
+            <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
-          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+          </Call>
-        </New>
+          
-      </Arg>
+          
-    </Call>
+          <!-- Add a customize step to the deployment lifecycle -->
-
+          <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class 
-    <!-- =========================================================== -->
+          <Call name="insertLifeCycleNode">
-    <!-- Configure Authentication Realms                             -->
+            <Arg>deployed</Arg>
-    <!-- Realms may be configured for the entire server here, or     -->
+            <Arg>starting</Arg>
-    <!-- they can be configured for a specific web app in a context  -->
+            <Arg>customise</Arg>
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+          </Call>
-    <!-- example).                                                   -->
+          <Call name="addLifeCycleBinding">
-    <!-- =========================================================== -->
+            <Arg>
-  <!--
+              <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
-    <Set name="UserRealms">
+                <Arg>customise</Arg>
-      <Array type="org.mortbay.jetty.security.UserRealm">
+              </New>
-        <Item>
+            </Arg>
-          <New class="org.mortbay.jetty.security.HashUserRealm">
+          </Call>
-            <Set name="name">Test Realm</Set>
+          -->
-            <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+          
-            <Set name="refreshInterval">0</Set>
+        </New>
-          </New>
+      </Arg>
-        </Item>
+    </Call>
-      </Array>
+    
-    </Set>
+    <Ref id="DeploymentManager">
-  -->
+      <Call name="addAppProvider">
-
+        <Arg>
-    <!-- =========================================================== -->
+          <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
-    <!-- Configure Request Log                                       -->
+            <Set name="monitoredDirName"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
-    <!-- Request logs  may be configured for the entire server here, -->
+            <Set name="scanInterval">0</Set>
-    <!-- or they can be configured for a specific web app in a       -->
+          </New>
-    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+        </Arg>
-    <!-- for an example).                                            -->
+      </Call>
-    <!-- =========================================================== -->
+    </Ref>
-  <!--
+
-    <Ref id="RequestLog">
+</Configure>
-      <Set name="requestLog">
-        <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
-          <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
-          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
-          <Set name="retainDays">90</Set>
-          <Set name="append">true</Set>
-          <Set name="extended">false</Set>
-          <Set name="logCookies">false</Set>
-          <Set name="LogTimeZone">GMT</Set>
-        </New>
-      </Set>
-    </Ref>
-  -->
-    <!-- =========================================================== -->
-    <!-- extra options                                               -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <Set name="sendServerVersion">false</Set>
-    <Set name="sendDateHeader">false</Set>
-    <Set name="gracefulShutdown">1000</Set>
-
-</Configure>

java/solr/server/etc/logging.properties

@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# To use this log config, start solr with the following system property: 
+# -Djava.util.logging.config.file=etc/logging.properties
+
+## Default global logging level:
+.level = INFO
+
+## Log every update command (add, delete, commit, ...)
+#org.apache.solr.update.processor.LogUpdateProcessor.level = FINE
+
+## Where to log (space separated list).
+handlers = java.util.logging.FileHandler
+
+java.util.logging.FileHandler.level = FINE
+
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+
+# 1 GB limit per file
+java.util.logging.FileHandler.limit = 1073741824
+
+# Log to the logs directory, with log files named solrxxx.log
+java.util.logging.FileHandler.pattern = ./logs/solr%u.log

java/solr/server/lib/jetty-NOTICE.txt

@@ -1,36 +0,0 @@
-==============================================================
- Jetty Web Container 
- Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
-
-The javax.servlet package used by Jetty is copyright 
-Sun Microsystems, Inc and Apache Software Foundation. It is 
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at 
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt 
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum 
-  1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006 
-Tanuki Software, Inc.  and 2001 Silver Egg Technology.  It is 
-covered by an open license which is viewable at
-http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt

java/solr/server/resources/log4j.properties

@@ -0,0 +1,24 @@
+#  Logging level
+solr.log=logs/
+log4j.rootLogger=INFO, file, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x \u2013 %m%n
+
+#- size rotation with log cleanup.
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.MaxFileSize=4MB
+log4j.appender.file.MaxBackupIndex=9
+
+#- File to log to and log format
+log4j.appender.file.File=${solr.log}/solr.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+
+log4j.logger.org.apache.zookeeper=WARN
+log4j.logger.org.apache.hadoop=WARN
+
+# set to INFO to enable infostream log messages
+log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF

java/solr/server/solr-webapp/webapp/META-INF/LICENSE.txt

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -200,3 +199,28 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+==========================================================================
+The following license applies to the JQuery JavaScript library
+--------------------------------------------------------------------------
+Copyright (c) 2010 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

java/solr/server/solr-webapp/webapp/META-INF/MANIFEST.MF

@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Implementation-Vendor: The Apache Software Foundation
+Ant-Version: Apache Ant 1.8.2
+Implementation-Title: org.apache.solr
+Implementation-Version: 4.5.0 1527178 - jpountz - 2013-09-28 14:09:34
+Specification-Vendor: The Apache Software Foundation
+Specification-Title: Apache Solr Search Server
+Created-By: 1.6.0_45-b06 (Sun Microsystems Inc.)
+Specification-Version: 4.5.0
+Extension-Name: org.apache.solr
+X-Compile-Source-JDK: 1.6
+X-Compile-Target-JDK: 1.6
+