svn commit: r280176 - in /lucene/nutch/trunk: conf/ src/java/org/apache/nutch/plugin/

2005-09-11 Thread jerome
Author: jerome
Date: Sun Sep 11 13:28:07 2005
New Revision: 280176

URL: http://svn.apache.org/viewcvs?rev=280176view=rev
Log:
Automatically loads active plugins dependencies (add a property, default is on)

Added:

lucene/nutch/trunk/src/java/org/apache/nutch/plugin/CircularDependencyException.java
   (with props)

lucene/nutch/trunk/src/java/org/apache/nutch/plugin/MissingDependencyException.java
   (with props)
Modified:
lucene/nutch/trunk/conf/nutch-default.xml

lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/PluginRepository.java

Modified: lucene/nutch/trunk/conf/nutch-default.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/conf/nutch-default.xml?rev=280176r1=280175r2=280176view=diff
==
--- lucene/nutch/trunk/conf/nutch-default.xml (original)
+++ lucene/nutch/trunk/conf/nutch-default.xml Sun Sep 11 13:28:07 2005
@@ -586,8 +586,17 @@
 /property
 
 property
+  nameplugin.auto-activation/name
+  valuefalse/value
+  descriptionDefines if some plugins that are not activated regarding
+  the plugin.includes and plugin.excludes properties must be automaticaly
+  activated if they are needed by some actived plugins.
+  /description
+/property
+
+property
   nameplugin.includes/name
-  
valuenutch-extensionpoints|protocol-httpclient|urlfilter-regex|parse-(text|html|js)|index-basic|query-(basic|site|url)/value
+  
valueprotocol-httpclient|urlfilter-regex|parse-(text|html|js)|index-basic|query-(basic|site|url)/value
   descriptionRegular expression naming plugin directory names to
   include.  Any plugin not matching this expression is excluded.
   In any case you need at least include the nutch-extensionpoints plugin. By

Added: 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/CircularDependencyException.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/plugin/CircularDependencyException.java?rev=280176view=auto
==
--- 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/CircularDependencyException.java
 (added)
+++ 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/CircularDependencyException.java
 Sun Sep 11 13:28:07 2005
@@ -0,0 +1,35 @@
+/*
+/**
+ * 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.
+ */
+package org.apache.nutch.plugin;
+
+
+/**
+ * codeCircularDependencyException/code will be thrown if a circular
+ * dependency is detected.
+ * 
+ * @author Jeacute;rocirc;me Charron
+ */
+public class CircularDependencyException extends Exception {
+
+  public CircularDependencyException(Throwable cause) {
+super(cause);
+  }
+
+  public CircularDependencyException(String message) {
+super(message);
+  }
+}

Propchange: 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/CircularDependencyException.java
--
svn:eol-style = native

Added: 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/MissingDependencyException.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/plugin/MissingDependencyException.java?rev=280176view=auto
==
--- 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/MissingDependencyException.java
 (added)
+++ 
lucene/nutch/trunk/src/java/org/apache/nutch/plugin/MissingDependencyException.java
 Sun Sep 11 13:28:07 2005
@@ -0,0 +1,35 @@
+/*
+/**
+ * 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.
+ */
+package org.apache.nutch.plugin;
+
+
+/**
+ * codeMissingDependencyException/code will be thrown if a plugin
+ * dependency cannot be found.
+ * 
+ * @author Jeacute;rocirc;me Charron
+ */

svn commit: r280179 - in /lucene/nutch/trunk/src/plugin: clustering-carrot2/ creativecommons/ index-basic/ index-more/ languageidentifier/ ontology/ parse-ext/ parse-html/ parse-js/ parse-mp3/ parse-mspowerpoint/ parse-msword/ parse-pdf/ parse-rss/ par...

2005-09-11 Thread jerome
Author: jerome
Date: Sun Sep 11 13:34:12 2005
New Revision: 280179

URL: http://svn.apache.org/viewcvs?rev=280179view=rev
Log:
Add a dependency to nutch-extensionpoints plugin

Modified:
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/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-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-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-prefix/plugin.xml
lucene/nutch/trunk/src/plugin/urlfilter-regex/plugin.xml

Modified: lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml?rev=280179r1=280178r2=280179view=diff
==
--- lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml (original)
+++ lucene/nutch/trunk/src/plugin/clustering-carrot2/plugin.xml Sun Sep 11 
13:34:12 2005
@@ -27,6 +27,10 @@
   library name=nekohtml-0.9.2.jar/

/runtime

 

+   requires

+  import plugin=nutch-extensionpoints/

+   /requires

+

extension id=org.apache.nutch.clustering.carrot2

   name=Carrot2 Clusterer

   point=org.apache.nutch.clustering.OnlineClusterer


Modified: lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml?rev=280179r1=280178r2=280179view=diff
==
--- lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml (original)
+++ lucene/nutch/trunk/src/plugin/creativecommons/plugin.xml Sun Sep 11 
13:34:12 2005
@@ -11,6 +11,10 @@
   /library
/runtime
 
+   requires
+  import plugin=nutch-extensionpoints/
+   /requires
+
extension id=org.creativecommons.nutch.CCParseFilter
   name=Creative Commons Metadata Filter
   point=org.apache.nutch.parse.HtmlParseFilter

Modified: lucene/nutch/trunk/src/plugin/index-basic/plugin.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-basic/plugin.xml?rev=280179r1=280178r2=280179view=diff
==
--- lucene/nutch/trunk/src/plugin/index-basic/plugin.xml (original)
+++ lucene/nutch/trunk/src/plugin/index-basic/plugin.xml Sun Sep 11 13:34:12 
2005
@@ -12,6 +12,10 @@
   /library
/runtime
 
+   requires
+  import plugin=nutch-extensionpoints/
+   /requires
+
extension id=org.apache.nutch.indexer.basic
   name=Nutch Basic Indexing Filter
   point=org.apache.nutch.indexer.IndexingFilter

Modified: lucene/nutch/trunk/src/plugin/index-more/plugin.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-more/plugin.xml?rev=280179r1=280178r2=280179view=diff
==
--- lucene/nutch/trunk/src/plugin/index-more/plugin.xml (original)
+++ lucene/nutch/trunk/src/plugin/index-more/plugin.xml Sun Sep 11 13:34:12 2005
@@ -12,6 +12,10 @@
   /library
/runtime
 
+   requires
+  import plugin=nutch-extensionpoints/
+   /requires
+
extension id=org.apache.nutch.indexer.more
   name=Nutch More Indexing Filter
   point=org.apache.nutch.indexer.IndexingFilter

Modified: lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml?rev=280179r1=280178r2=280179view=diff
==
--- lucene/nutch/trunk/src/plugin/languageidentifier/plugin.xml (original)
+++