From 2627822ad1e1f2f26825fc9e832182a919d37469 Mon Sep 17 00:00:00 2001 From: Jukka Lauri Zitting Date: Wed, 26 Dec 2007 22:57:57 +0000 Subject: [PATCH] TIKA-111: Missing license headers - Added license headers where needed - Merged src/site/SITE-README.txt to README.txt - Added a HEADER.txt file with the standard header git-svn-id: https://svn.eu.apache.org/repos/asf/incubator/tika/trunk@606969 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ HEADER.txt | 16 +++++++++++++ README.txt | 28 ++++++++++++++++++++++ .../java/org/apache/tika/metadata/package.html | 16 +++++++++++++ src/main/resources/tika-config.xml | 18 ++++++++++++++ src/site/SITE-README.txt | 24 ------------------- src/test/resources/log4j/log4j.properties | 16 ++++++++++++- 7 files changed, 95 insertions(+), 25 deletions(-) create mode 100644 HEADER.txt delete mode 100644 src/site/SITE-README.txt diff --git a/CHANGES.txt b/CHANGES.txt index 8ca078e..209e693 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -140,3 +140,5 @@ Unreleased changes (0.1-incubating) 63. TIKA-106 - Remove dependency on Jakarta ORO - use JDK 1.4 Regex (Niall Pemberton) + +64. TIKA-111 - Missing license headers (jukka) diff --git a/HEADER.txt b/HEADER.txt new file mode 100644 index 0000000..c2019d6 --- /dev/null +++ b/HEADER.txt @@ -0,0 +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. + */ diff --git a/README.txt b/README.txt index accb1a0..64a16bf 100644 --- a/README.txt +++ b/README.txt @@ -67,3 +67,31 @@ If you encounter errors in Tika or want to suggest an improvement or a new feature, please visit the Tika issue tracker at https://issues.apache.org/jira/browse/TIKA. There you can also find the latest information on known issues and recent bug fixes and enhancements. + +Updating the Tika web site +========================== + +Here's how to update the live Tika website (http://incubator.apache.org/tika/) + + 1) Edit the content found in src/site + + 2) Run "mvn site" to generate the website pages + + 3) Check the new content at target/site/index.html + + 4) Checkout https://svn.apache.org/repos/asf/incubator/tika/site + and update the changed pages there + + 5) Commit your changes, both here and in the tika/site module + + 6) To activate the changes on the live website, login to + people.apache.org and run: + + umask 002; svn update /www/incubator.apache.org/tika + + 7) That directory is replicated to the live website every few hours, + so your changes can take some time to be live. + +Easy and fun, isn't it? ;-) + +This will get better once Tika graduates from the Incubator. diff --git a/src/main/java/org/apache/tika/metadata/package.html b/src/main/java/org/apache/tika/metadata/package.html index bd09247..dfe3662 100644 --- a/src/main/java/org/apache/tika/metadata/package.html +++ b/src/main/java/org/apache/tika/metadata/package.html @@ -1,3 +1,19 @@ + A Multi-valued Metadata container, and set diff --git a/src/main/resources/tika-config.xml b/src/main/resources/tika-config.xml index 14da332..ba18dcc 100644 --- a/src/main/resources/tika-config.xml +++ b/src/main/resources/tika-config.xml @@ -1,4 +1,22 @@ + + + diff --git a/src/site/SITE-README.txt b/src/site/SITE-README.txt deleted file mode 100644 index 1871d36..0000000 --- a/src/site/SITE-README.txt +++ /dev/null @@ -1,24 +0,0 @@ -Here's how to update the live Tika website: -(http://incubator.apache.org/tika/) - -1) Edit the content found here - -2) Run "mvn site" to generate the website pages - -3) Check the new content at target/site/index.html - -4) Checkout https://svn.apache.org/repos/asf/incubator/tika/site - and update the changed pages there - -5) Commit your changes, both here and in the tika/site module - -6) To activate the changes on the live website, login to - people.apache.org and run svn up in /www/incubator.apache.org/tika - -7) That directory is replicated to the live website every few hours, so - your changes can take some time to be live. - -Easy and fun, isn't it? ;-) - -This will get better once Tika graduates from the incubator. - diff --git a/src/test/resources/log4j/log4j.properties b/src/test/resources/log4j/log4j.properties index 0f6b0c0..c3880f0 100644 --- a/src/test/resources/log4j/log4j.properties +++ b/src/test/resources/log4j/log4j.properties @@ -1,3 +1,18 @@ +# 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. + #info,debug, error,fatal ... log4j.rootLogger=info,stdout,R @@ -18,4 +33,3 @@ log4j.appender.R.MaxBackupIndex=1 log4j.appender.R.layout=org.apache.log4j.PatternLayout log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n - -- 2.11.4.GIT