From 3e5d464f1e6091a86f6d238ac47018dbf3840397 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Sun, 30 Aug 2009 17:09:57 +0000 Subject: [PATCH] more license updates from LUCENE-1865 git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@809380 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/java/org/apache/lucene/ant/antlib.xml | 17 +++++++++++++++++ contrib/db/bdb-je/build.xml | 16 ++++++++++++++++ contrib/db/bdb/build.xml | 16 ++++++++++++++++ contrib/lucli/run.sh | 16 ++++++++++++++++ .../src/demo/WebContent/index.jsp | 18 +++++++++++++++++- .../webdemo/FormBasedXmlQueryDemo.java | 17 +++++++++++++++++ src/jsp/configuration.jsp | 16 ++++++++++++++++ src/jsp/footer.jsp | 16 ++++++++++++++++ src/jsp/header.jsp | 16 ++++++++++++++++ src/jsp/index.jsp | 16 ++++++++++++++++ src/jsp/results.jsp | 16 ++++++++++++++++ 11 files changed, 179 insertions(+), 1 deletion(-) diff --git a/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml b/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml index 1dd8a9bae59..89315608c19 100644 --- a/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml +++ b/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml @@ -1,4 +1,21 @@ + + diff --git a/contrib/db/bdb-je/build.xml b/contrib/db/bdb-je/build.xml index 782a297a9ea..4d4c60b3777 100644 --- a/contrib/db/bdb-je/build.xml +++ b/contrib/db/bdb-je/build.xml @@ -1,4 +1,20 @@ + diff --git a/contrib/db/bdb/build.xml b/contrib/db/bdb/build.xml index 77e63622bdd..39d22d05885 100644 --- a/contrib/db/bdb/build.xml +++ b/contrib/db/bdb/build.xml @@ -1,4 +1,20 @@ + diff --git a/contrib/lucli/run.sh b/contrib/lucli/run.sh index e6b592d74ba..60fe360f72c 100755 --- a/contrib/lucli/run.sh +++ b/contrib/lucli/run.sh @@ -1,3 +1,19 @@ + +# 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. + LUCLI=. LUCLI_MEMORY=128M #JAVA_HOME=/home/dror/j2sdk1.4.1_03/ diff --git a/contrib/xml-query-parser/src/demo/WebContent/index.jsp b/contrib/xml-query-parser/src/demo/WebContent/index.jsp index 1718bb09450..705f27d2620 100644 --- a/contrib/xml-query-parser/src/demo/WebContent/index.jsp +++ b/contrib/xml-query-parser/src/demo/WebContent/index.jsp @@ -1,3 +1,19 @@ + <%@ page language="java" contentType="text/html; charset=ISO-8859-1" import="org.apache.lucene.search.*,org.apache.lucene.document.*" pageEncoding="ISO-8859-1"%> @@ -126,4 +142,4 @@ pageEncoding="ISO-8859-1"%> }//end if has results %> - \ No newline at end of file + diff --git a/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java b/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java index 38e89ae8352..faba7bfdd79 100644 --- a/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java +++ b/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java @@ -1,3 +1,20 @@ +/** + * 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. + */ + package org.apache.lucene.xmlparser.webdemo; import java.io.BufferedReader; diff --git a/src/jsp/configuration.jsp b/src/jsp/configuration.jsp index 3365a7c3400..907f4e0fb6b 100644 --- a/src/jsp/configuration.jsp +++ b/src/jsp/configuration.jsp @@ -1,3 +1,19 @@ + <% /* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net) */ String appTitle = "Apache Lucene Example - Intranet Server Search Application"; diff --git a/src/jsp/footer.jsp b/src/jsp/footer.jsp index a3e037ce066..85af3ee8f13 100644 --- a/src/jsp/footer.jsp +++ b/src/jsp/footer.jsp @@ -1,3 +1,19 @@ + <% /* Author Andrew C. Oliver (acoliver2@users.sourceforge.net) */ %>

<%=appfooter%> diff --git a/src/jsp/header.jsp b/src/jsp/header.jsp index aba6bf16807..f1cbe38400b 100644 --- a/src/jsp/header.jsp +++ b/src/jsp/header.jsp @@ -1,3 +1,19 @@ + <%@include file="configuration.jsp"%> <% /* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net */ %> diff --git a/src/jsp/index.jsp b/src/jsp/index.jsp index 60df5b091ce..ca95a38096a 100755 --- a/src/jsp/index.jsp +++ b/src/jsp/index.jsp @@ -1,3 +1,19 @@ + <%@include file="header.jsp"%> <% /* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net) */ %>

diff --git a/src/jsp/results.jsp b/src/jsp/results.jsp index 391fd12f87c..1198888055d 100755 --- a/src/jsp/results.jsp +++ b/src/jsp/results.jsp @@ -1,3 +1,19 @@ + <%@ page import = " javax.servlet.*, javax.servlet.http.*, java.io.*, org.apache.lucene.analysis.*, org.apache.lucene.analysis.standard.StandardAnalyzer, org.apache.lucene.document.*, org.apache.lucene.index.*, org.apache.lucene.store.*, org.apache.lucene.search.*, org.apache.lucene.queryParser.*, org.apache.lucene.demo.*, org.apache.lucene.demo.html.Entities, java.net.URLEncoder, org.apache.lucene.util.Version" %> <%