Author: mattmann
Date: Thu Dec 27 22:17:13 2007
New Revision: 607178
URL: http://svn.apache.org/viewvc?rev=607178&view=rev
Log:
Merge trunk r607176 into 0.1-incubating branch r606652
Added:
incubator/tika/branches/0.1-incubating/HEADER.txt
- copied unchanged from r607177, incubator/tika/trunk/HEADER.txt
incubator/tika/branches/0.1-incubating/KEYS
- copied unchanged from r607177, incubator/tika/trunk/KEYS
Removed:
incubator/tika/branches/0.1-incubating/src/site/SITE-README.txt
Modified:
incubator/tika/branches/0.1-incubating/CHANGES.txt
incubator/tika/branches/0.1-incubating/README.txt
incubator/tika/branches/0.1-incubating/src/main/java/org/apache/tika/metadata/package.html
incubator/tika/branches/0.1-incubating/src/main/resources/tika-config.xml
incubator/tika/branches/0.1-incubating/src/test/resources/log4j/log4j.properties
Modified: incubator/tika/branches/0.1-incubating/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/branches/0.1-incubating/CHANGES.txt?rev=607178&r1=607177&r2=607178&view=diff
==============================================================================
--- incubator/tika/branches/0.1-incubating/CHANGES.txt (original)
+++ incubator/tika/branches/0.1-incubating/CHANGES.txt Thu Dec 27 22:17:13 2007
@@ -1,6 +1,6 @@
Tika Change Log
-Unreleased changes (0.1-incubating)
+Release 0.1-incubating - 12/27/2007
1. TIKA-5 - Port Metadata Framework from Nutch (mattmann)
@@ -140,3 +140,5 @@
63. TIKA-106 - Remove dependency on Jakarta ORO - use JDK 1.4 Regex
(Niall Pemberton)
+
+64. TIKA-111 - Missing license headers (jukka)
Modified: incubator/tika/branches/0.1-incubating/README.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/branches/0.1-incubating/README.txt?rev=607178&r1=607177&r2=607178&view=diff
==============================================================================
--- incubator/tika/branches/0.1-incubating/README.txt (original)
+++ incubator/tika/branches/0.1-incubating/README.txt Thu Dec 27 22:17:13 2007
@@ -67,3 +67,31 @@
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.
Modified:
incubator/tika/branches/0.1-incubating/src/main/java/org/apache/tika/metadata/package.html
URL:
http://svn.apache.org/viewvc/incubator/tika/branches/0.1-incubating/src/main/java/org/apache/tika/metadata/package.html?rev=607178&r1=607177&r2=607178&view=diff
==============================================================================
---
incubator/tika/branches/0.1-incubating/src/main/java/org/apache/tika/metadata/package.html
(original)
+++
incubator/tika/branches/0.1-incubating/src/main/java/org/apache/tika/metadata/package.html
Thu Dec 27 22:17:13 2007
@@ -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.
+-->
<html>
<body>
A Multi-valued Metadata container, and set
Modified:
incubator/tika/branches/0.1-incubating/src/main/resources/tika-config.xml
URL:
http://svn.apache.org/viewvc/incubator/tika/branches/0.1-incubating/src/main/resources/tika-config.xml?rev=607178&r1=607177&r2=607178&view=diff
==============================================================================
--- incubator/tika/branches/0.1-incubating/src/main/resources/tika-config.xml
(original)
+++ incubator/tika/branches/0.1-incubating/src/main/resources/tika-config.xml
Thu Dec 27 22:17:13 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
<properties>
<mimeTypeRepository resource="/org/apache/tika/mime/tika-mimetypes.xml"
magic="false"/>
Modified:
incubator/tika/branches/0.1-incubating/src/test/resources/log4j/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/tika/branches/0.1-incubating/src/test/resources/log4j/log4j.properties?rev=607178&r1=607177&r2=607178&view=diff
==============================================================================
---
incubator/tika/branches/0.1-incubating/src/test/resources/log4j/log4j.properties
(original)
+++
incubator/tika/branches/0.1-incubating/src/test/resources/log4j/log4j.properties
Thu Dec 27 22:17:13 2007
@@ -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.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
-
