svn commit: r394143 - /lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Hit.java

2006-04-14 Thread siren
Author: siren
Date: Fri Apr 14 10:13:28 2006
New Revision: 394143

URL: http://svn.apache.org/viewcvs?rev=394143view=rev
Log:
Fixed typos in javadoc

Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Hit.java

Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Hit.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Hit.java?rev=394143r1=394142r2=394143view=diff
==
--- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Hit.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Hit.java Fri Apr 14 
10:13:28 2006
@@ -67,11 +67,11 @@
   /** Return the value of the field that hits should be deduplicated on. */
   public String getDedupValue() { return dedupValue; }
 
-  /** True iff other, lower-scoring, hits with the same dedup value have been
+  /** True if other, lower-scoring, hits with the same dedup value have been
* excluded from the list which contains this hit.. */
   public boolean moreFromDupExcluded() { return moreFromDupExcluded; }
 
-  /** True iff other, lower-scoring, hits with the same deup value have been
+  /** True if other, lower-scoring, hits with the same deup value have been
* excluded from the list which contains this hit.. */
   public void setMoreFromDupExcluded(boolean more){moreFromDupExcluded=more;}
 




svn commit: r394228 - in /lucene/nutch/trunk: ./ src/java/org/apache/nutch/plugin/ src/plugin/ src/plugin/analysis-de/ src/plugin/analysis-fr/ src/plugin/clustering-carrot2/ src/plugin/creativecommons

2006-04-14 Thread jerome
Author: jerome
Date: Fri Apr 14 16:57:24 2006
New Revision: 394228

URL: http://svn.apache.org/viewcvs?rev=394228view=rev
Log:
NUTCH-245 : Added a DTD for Nutch Plugin Manifest
  - Add a commented DTD in src
  - Add the DTD in javadoc
  - Change the implementation element structure : uses name-value parameters 
instead of proprietary attributes
  - Fix unit tests regarding changes in DTD
  - Fix the plugin.xml file in nutch plugins regarding changes in DTD

Added:
lucene/nutch/trunk/src/plugin/plugin.dtd   (with props)
Modified:
lucene/nutch/trunk/build.xml

lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/package.html
lucene/nutch/trunk/src/plugin/analysis-de/plugin.xml
lucene/nutch/trunk/src/plugin/analysis-fr/plugin.xml
lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml
lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml
lucene/nutch/trunk/src/plugin/index-basic/plugin.xml
lucene/nutch/trunk/src/plugin/index-more/plugin.xml
lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml
lucene/nutch/trunk/src/plugin/lib-commons-httpclient/plugin.xml
lucene/nutch/trunk/src/plugin/lib-http/plugin.xml
lucene/nutch/trunk/src/plugin/lib-jakarta-poi/plugin.xml
lucene/nutch/trunk/src/plugin/lib-log4j/plugin.xml
lucene/nutch/trunk/src/plugin/lib-lucene-analyzers/plugin.xml
lucene/nutch/trunk/src/plugin/lib-nekohtml/plugin.xml
lucene/nutch/trunk/src/plugin/lib-parsems/plugin.xml
lucene/nutch/trunk/src/plugin/lib-regex-filter/plugin.xml
lucene/nutch/trunk/src/plugin/lib-xml/plugin.xml
lucene/nutch/trunk/src/plugin/microformats-reltag/plugin.xml
lucene/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml
lucene/nutch/trunk/src/plugin/ontology/plugin.xml
lucene/nutch/trunk/src/plugin/parse-ext/plugin.xml
lucene/nutch/trunk/src/plugin/parse-html/plugin.xml
lucene/nutch/trunk/src/plugin/parse-js/plugin.xml
lucene/nutch/trunk/src/plugin/parse-mp3/plugin.xml
lucene/nutch/trunk/src/plugin/parse-msexcel/plugin.xml
lucene/nutch/trunk/src/plugin/parse-mspowerpoint/plugin.xml
lucene/nutch/trunk/src/plugin/parse-msword/plugin.xml
lucene/nutch/trunk/src/plugin/parse-pdf/plugin.xml
lucene/nutch/trunk/src/plugin/parse-rss/plugin.xml
lucene/nutch/trunk/src/plugin/parse-rtf/plugin.xml
lucene/nutch/trunk/src/plugin/parse-swf/plugin.xml
lucene/nutch/trunk/src/plugin/parse-text/plugin.xml
lucene/nutch/trunk/src/plugin/parse-zip/plugin.xml
lucene/nutch/trunk/src/plugin/protocol-file/plugin.xml
lucene/nutch/trunk/src/plugin/protocol-ftp/plugin.xml
lucene/nutch/trunk/src/plugin/protocol-http/plugin.xml
lucene/nutch/trunk/src/plugin/protocol-httpclient/plugin.xml
lucene/nutch/trunk/src/plugin/query-basic/plugin.xml
lucene/nutch/trunk/src/plugin/query-more/plugin.xml
lucene/nutch/trunk/src/plugin/query-site/plugin.xml
lucene/nutch/trunk/src/plugin/query-url/plugin.xml
lucene/nutch/trunk/src/plugin/urlfilter-automaton/plugin.xml
lucene/nutch/trunk/src/plugin/urlfilter-prefix/plugin.xml
lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml
lucene/nutch/trunk/src/test/org/apache/nutch/plugin/TestPluginSystem.java

Modified: lucene/nutch/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/build.xml?rev=394228r1=394227r2=394228view=diff
==
--- lucene/nutch/trunk/build.xml (original)
+++ lucene/nutch/trunk/build.xml Fri Apr 14 16:57:24 2006
@@ -279,6 +279,9 @@
   !-- Documentation  --
   !-- == --
   target name=javadoc depends=compile
+!-- Copy the plugin.dtd file to the plugin doc-files dir --
+copy file=${plugins.dir}/plugin.dtd
+  todir=${src.dir}/org/apache/nutch/plugin/doc-files/
 mkdir dir=${build.javadoc}/
 javadoc
   overview=${src.dir}/overview.html
@@ -353,6 +356,7 @@
   group title=Ontology Plugins packages=${plugins.ontology}/
   group title=Misc. Plugins packages=${plugins.misc}/
 /javadoc
+
   /target

   target name=default-doc

Modified: 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java?rev=394228r1=394227r2=394228view=diff
==
--- 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java 
(original)
+++ 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java 
Fri Apr 14 16:57:24 2006
@@ -36,6 +36,8 @@
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;

svn commit: r394231 - in /lucene/nutch/trunk: build.xml src/plugin/plugin.dtd

2006-04-14 Thread jerome
Author: jerome
Date: Fri Apr 14 17:13:21 2006
New Revision: 394231

URL: http://svn.apache.org/viewcvs?rev=394231view=rev
Log:
NUTCH-245 : Some minor fixes
  - Added Apache License in DTD (?)
  - Delete the org/apache/nutch/plugin/doc-files once javadoc task completed.

Modified:
lucene/nutch/trunk/build.xml
lucene/nutch/trunk/src/plugin/plugin.dtd

Modified: lucene/nutch/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/build.xml?rev=394231r1=394230r2=394231view=diff
==
--- lucene/nutch/trunk/build.xml (original)
+++ lucene/nutch/trunk/build.xml Fri Apr 14 17:13:21 2006
@@ -356,7 +356,8 @@
   group title=Ontology Plugins packages=${plugins.ontology}/
   group title=Misc. Plugins packages=${plugins.misc}/
 /javadoc
-
+!-- Clean the doc-files dir from src --
+delete dir=${src.dir}/org/apache/nutch/plugin/doc-files/
   /target

   target name=default-doc

Modified: lucene/nutch/trunk/src/plugin/plugin.dtd
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/plugin.dtd?rev=394231r1=394230r2=394231view=diff
==
--- lucene/nutch/trunk/src/plugin/plugin.dtd (original)
+++ lucene/nutch/trunk/src/plugin/plugin.dtd Fri Apr 14 17:13:21 2006
@@ -1,10 +1,25 @@
 ?xml version=1.0 encoding=UTF-8?
 
 !--
+ ! Copyright 2005 The Apache Software Foundation
+ !
+ ! Licensed 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.
+ !
+ !
  !  Document   : plugin.dtd
  !  Created on : 14 avril 2006, 22:14
- !  Author : Jerome Charron
- !  Description: Nutch plug-in manifest
+ !  Author : Chris Mattmann, Jerome Charron
+ !  Description: Nutch plug-in manifest DTD
  !
  !  PUBLIC ID  : -//Apache Software Fundation//DTD Nutch Plugin Manifest 
1.0//EN
  !  SYSTEM ID  : http://lucene.apache.org/nutch/plugin.dtd