You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2007/12/27 18:57:57 UTC
svn commit: r607101 - in /lucene/solr/trunk: LICENSE.txt NOTICE.txt
example/solr/conf/solrconfig.xml lib/xpp3-1.1.3.4.O.jar
src/java/org/apache/solr/handler/XppUpdateRequestHandler.java
Author: ryan
Date: Thu Dec 27 09:57:55 2007
New Revision: 607101
URL: http://svn.apache.org/viewvc?rev=607101&view=rev
Log:
SOLR-437 remove XPP -- not used since SOLR-133
Removed:
lucene/solr/trunk/lib/xpp3-1.1.3.4.O.jar
lucene/solr/trunk/src/java/org/apache/solr/handler/XppUpdateRequestHandler.java
Modified:
lucene/solr/trunk/LICENSE.txt
lucene/solr/trunk/NOTICE.txt
lucene/solr/trunk/example/solr/conf/solrconfig.xml
Modified: lucene/solr/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/LICENSE.txt?rev=607101&r1=607100&r2=607101&view=diff
==============================================================================
--- lucene/solr/trunk/LICENSE.txt (original)
+++ lucene/solr/trunk/LICENSE.txt Thu Dec 27 09:57:55 2007
@@ -200,55 +200,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-==========================================================================
-The following license applies only to the xpp3 jar included with Solr
---------------------------------------------------------------------------
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any,
- must include the following acknowledgment:
-
- "This product includes software developed by the Indiana University
- Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
-must not be used to endorse or promote products derived from this
-software without prior written permission. For written permission,
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy"
-name nor may "Indiana Univeristy" appear in their name, without prior
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
==========================================================================
Portions of Jetty 6 are bundled in the Solr example server.
Modified: lucene/solr/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/NOTICE.txt?rev=607101&r1=607100&r2=607101&view=diff
==============================================================================
--- lucene/solr/trunk/NOTICE.txt (original)
+++ lucene/solr/trunk/NOTICE.txt Thu Dec 27 09:57:55 2007
@@ -11,10 +11,6 @@
- Apache Lucene Java
- Apache Tomcat (lib/servlet-api-2.4.jar)
-This product includes software developed by the Indiana University
-Extreme! Lab (http://www.extreme.indiana.edu/).
-(specifically, the XPP3 XML pull parser)
-
This product includes software developed by Mort Bay Consulting
(specifically, Jetty 6.1.3, the bundled servlet container in example)
Modified: lucene/solr/trunk/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/solr/conf/solrconfig.xml?rev=607101&r1=607100&r2=607101&view=diff
==============================================================================
--- lucene/solr/trunk/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/solr/conf/solrconfig.xml Thu Dec 27 09:57:55 2007
@@ -488,8 +488,6 @@
<str name="update.processor.class">org.apache.solr.handler.UpdateRequestProcessor</str>
-->
</requestHandler>
- <!-- this will be removed before solr 1.3 -->
- <requestHandler name="/update/xpp" class="solr.XppUpdateRequestHandler" />
<!-- CSV update handler, loaded on demand -->
<requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" />