You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by ma...@apache.org on 2009/08/30 19:09:58 UTC
svn commit: r809380 - in /lucene/java/trunk:
contrib/ant/src/java/org/apache/lucene/ant/ contrib/db/bdb-je/
contrib/db/bdb/ contrib/lucli/ contrib/xml-query-parser/src/demo/WebContent/
contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/...
Author: markrmiller
Date: Sun Aug 30 17:09:57 2009
New Revision: 809380
URL: http://svn.apache.org/viewvc?rev=809380&view=rev
Log:
more license updates from LUCENE-1865
Modified:
lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml
lucene/java/trunk/contrib/db/bdb-je/build.xml
lucene/java/trunk/contrib/db/bdb/build.xml
lucene/java/trunk/contrib/lucli/run.sh
lucene/java/trunk/contrib/xml-query-parser/src/demo/WebContent/index.jsp
lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java
lucene/java/trunk/src/jsp/configuration.jsp
lucene/java/trunk/src/jsp/footer.jsp
lucene/java/trunk/src/jsp/header.jsp
lucene/java/trunk/src/jsp/index.jsp
lucene/java/trunk/src/jsp/results.jsp
Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml (original)
+++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml Sun Aug 30 17:09:57 2009
@@ -1,4 +1,21 @@
<?xml version="1.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.
+ -->
<antlib>
<taskdef name="index" classname="org.apache.lucene.ant.IndexTask"/>
</antlib>
Modified: lucene/java/trunk/contrib/db/bdb-je/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/db/bdb-je/build.xml?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/contrib/db/bdb-je/build.xml (original)
+++ lucene/java/trunk/contrib/db/bdb-je/build.xml Sun Aug 30 17:09:57 2009
@@ -1,4 +1,20 @@
<?xml version="1.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.
+ -->
<project name="bdb-je" default="default">
<description>
Modified: lucene/java/trunk/contrib/db/bdb/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/db/bdb/build.xml?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/contrib/db/bdb/build.xml (original)
+++ lucene/java/trunk/contrib/db/bdb/build.xml Sun Aug 30 17:09:57 2009
@@ -1,4 +1,20 @@
<?xml version="1.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.
+ -->
<project name="bdb" default="default">
<description>
Modified: lucene/java/trunk/contrib/lucli/run.sh
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/lucli/run.sh?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/contrib/lucli/run.sh (original)
+++ lucene/java/trunk/contrib/lucli/run.sh Sun Aug 30 17:09:57 2009
@@ -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/
Modified: lucene/java/trunk/contrib/xml-query-parser/src/demo/WebContent/index.jsp
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/demo/WebContent/index.jsp?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/contrib/xml-query-parser/src/demo/WebContent/index.jsp (original)
+++ lucene/java/trunk/contrib/xml-query-parser/src/demo/WebContent/index.jsp Sun Aug 30 17:09:57 2009
@@ -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.
+ -->
<%@ 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 @@
}//end if has results
%>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java (original)
+++ lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java Sun Aug 30 17:09:57 2009
@@ -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;
Modified: lucene/java/trunk/src/jsp/configuration.jsp
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/jsp/configuration.jsp?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/src/jsp/configuration.jsp (original)
+++ lucene/java/trunk/src/jsp/configuration.jsp Sun Aug 30 17:09:57 2009
@@ -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.
+ -->
<%
/* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net) */
String appTitle = "Apache Lucene Example - Intranet Server Search Application";
Modified: lucene/java/trunk/src/jsp/footer.jsp
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/jsp/footer.jsp?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/src/jsp/footer.jsp (original)
+++ lucene/java/trunk/src/jsp/footer.jsp Sun Aug 30 17:09:57 2009
@@ -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.
+ -->
<% /* Author Andrew C. Oliver (acoliver2@users.sourceforge.net) */ %>
<p align="center">
<%=appfooter%>
Modified: lucene/java/trunk/src/jsp/header.jsp
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/jsp/header.jsp?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/src/jsp/header.jsp (original)
+++ lucene/java/trunk/src/jsp/header.jsp Sun Aug 30 17:09:57 2009
@@ -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.
+ -->
<%@include file="configuration.jsp"%>
<% /* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net */ %>
<html>
Modified: lucene/java/trunk/src/jsp/index.jsp
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/jsp/index.jsp?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/src/jsp/index.jsp (original)
+++ lucene/java/trunk/src/jsp/index.jsp Sun Aug 30 17:09:57 2009
@@ -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.
+ -->
<%@include file="header.jsp"%>
<% /* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net) */ %>
<center>
Modified: lucene/java/trunk/src/jsp/results.jsp
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/jsp/results.jsp?rev=809380&r1=809379&r2=809380&view=diff
==============================================================================
--- lucene/java/trunk/src/jsp/results.jsp (original)
+++ lucene/java/trunk/src/jsp/results.jsp Sun Aug 30 17:09:57 2009
@@ -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.
+ -->
<%@ 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" %>
<%