You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/12/24 17:03:04 UTC

svn commit: r1553294 - in /lucene/dev/branches/lucene5376/lucene/server: ./ plugins/ src/java/org/apache/lucene/server/http/ src/python/ src/scripts/ src/test/org/apache/lucene/server/

Author: rmuir
Date: Tue Dec 24 16:03:03 2013
New Revision: 1553294

URL: http://svn.apache.org/r1553294
Log:
LUCENE-5376: fix documentation-lint, rat-sources, remove python build, remove plugin (it can be a separate module?)

Added:
    lucene/dev/branches/lucene5376/lucene/server/src/scripts/another-post.py
      - copied unchanged from r1553282, lucene/dev/branches/lucene5376/lucene/server/src/python/post.py
    lucene/dev/branches/lucene5376/lucene/server/src/scripts/loadTest2.py
      - copied unchanged from r1553282, lucene/dev/branches/lucene5376/lucene/server/src/python/loadTest2.py
Removed:
    lucene/dev/branches/lucene5376/lucene/server/.classpath
    lucene/dev/branches/lucene5376/lucene/server/.hgignore
    lucene/dev/branches/lucene5376/lucene/server/.project
    lucene/dev/branches/lucene5376/lucene/server/README.txt
    lucene/dev/branches/lucene5376/lucene/server/build.py
    lucene/dev/branches/lucene5376/lucene/server/plugins/
    lucene/dev/branches/lucene5376/lucene/server/src/python/
Modified:
    lucene/dev/branches/lucene5376/lucene/server/ivy.xml
    lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java
    lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/MockPlugin-lucene-server-plugin.properties

Modified: lucene/dev/branches/lucene5376/lucene/server/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/ivy.xml?rev=1553294&r1=1553293&r2=1553294&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/ivy.xml (original)
+++ lucene/dev/branches/lucene5376/lucene/server/ivy.xml Tue Dec 24 16:03:03 2013
@@ -1,3 +1,21 @@
+<!--
+   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.    
+-->
 <ivy-module version="2.0">
   <info organisation="org.apache.lucene" module="lucene-server"/>
   <dependencies>

Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java?rev=1553294&r1=1553293&r2=1553294&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java Tue Dec 24 16:03:03 2013
@@ -1,21 +1,25 @@
 package org.apache.lucene.server.http;
 
 /*
- * Copyright 2012 The Netty Project
+ * 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
  *
- * The Netty Project 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
+ *     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.
+ * 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 file adapted from the netty example (under apache 2.0 license):
+// https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;

Modified: lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/MockPlugin-lucene-server-plugin.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/MockPlugin-lucene-server-plugin.properties?rev=1553294&r1=1553293&r2=1553294&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/MockPlugin-lucene-server-plugin.properties (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/MockPlugin-lucene-server-plugin.properties Tue Dec 24 16:03:03 2013
@@ -1 +1,16 @@
+#  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.
+
 class: org.apache.lucene.server.MockPlugin