You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by mo...@apache.org on 2012/01/14 19:48:11 UTC
svn commit: r1231556 [2/7] - in /incubator/any23/trunk:
core/src/main/java/org/apache/ core/src/main/java/org/apache/any23/
core/src/main/java/org/apache/any23/cli/
core/src/main/java/org/apache/any23/configuration/
core/src/main/java/org/apache/any23/...
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ExtractorDocumentation.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/ExtractorDocumentation.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ExtractorDocumentation.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ExtractorDocumentation.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/ExtractorDocumentation.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/ExtractorDocumentation.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ExtractorDocumentation.java Sat Jan 14 18:47:58 2012
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.util.LogUtils;
-import org.deri.any23.extractor.ExampleInputOutput;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.Extractor;
-import org.deri.any23.extractor.Extractor.BlindExtractor;
-import org.deri.any23.extractor.Extractor.ContentExtractor;
-import org.deri.any23.extractor.Extractor.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.ExtractorRegistry;
+import org.apache.any23.extractor.ExampleInputOutput;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.ExtractorRegistry;
+import org.apache.any23.util.LogUtils;
+import org.apache.any23.extractor.Extractor;
+import org.apache.any23.extractor.Extractor.BlindExtractor;
+import org.apache.any23.extractor.Extractor.ContentExtractor;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
import java.io.IOException;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MicrodataParser.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/MicrodataParser.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MicrodataParser.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MicrodataParser.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/MicrodataParser.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/MicrodataParser.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MicrodataParser.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.extractor.html.TagSoupParser;
-import org.deri.any23.http.DefaultHTTPClient;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.source.FileDocumentSource;
-import org.deri.any23.source.HTTPDocumentSource;
-import org.deri.any23.util.StreamUtils;
+import org.apache.any23.extractor.html.TagSoupParser;
+import org.apache.any23.http.DefaultHTTPClient;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.source.FileDocumentSource;
+import org.apache.any23.source.HTTPDocumentSource;
+import org.apache.any23.util.StreamUtils;
import java.io.File;
import java.io.IOException;
@@ -61,7 +61,7 @@ public class MicrodataParser implements
documentInputInputStream,
documentSource.getDocumentURI()
);
- org.deri.any23.extractor.microdata.MicrodataParser.getMicrodataAsJSON(tagSoupParser.getDOM(), System.out);
+ org.apache.any23.extractor.microdata.MicrodataParser.getMicrodataAsJSON(tagSoupParser.getDOM(), System.out);
} catch (Exception e) {
System.err.println("***ERROR: " + e.getMessage());
e.printStackTrace();
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MimeDetector.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/MimeDetector.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MimeDetector.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MimeDetector.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/MimeDetector.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/MimeDetector.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/MimeDetector.java Sat Jan 14 18:47:58 2012
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.configuration.DefaultConfiguration;
-import org.deri.any23.http.DefaultHTTPClient;
-import org.deri.any23.http.HTTPClient;
-import org.deri.any23.http.HTTPClientConfiguration;
-import org.deri.any23.mime.MIMEType;
-import org.deri.any23.mime.MIMETypeDetector;
-import org.deri.any23.mime.TikaMIMETypeDetector;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.source.FileDocumentSource;
-import org.deri.any23.source.HTTPDocumentSource;
-import org.deri.any23.source.StringDocumentSource;
+import org.apache.any23.configuration.DefaultConfiguration;
+import org.apache.any23.http.DefaultHTTPClient;
+import org.apache.any23.http.HTTPClient;
+import org.apache.any23.http.HTTPClientConfiguration;
+import org.apache.any23.mime.MIMEType;
+import org.apache.any23.mime.MIMETypeDetector;
+import org.apache.any23.mime.TikaMIMETypeDetector;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.source.FileDocumentSource;
+import org.apache.any23.source.HTTPDocumentSource;
+import org.apache.any23.source.StringDocumentSource;
import java.io.File;
import java.net.URISyntaxException;
@@ -35,7 +35,7 @@ import java.net.URISyntaxException;
/**
* Commandline tool to detect <b>MIME Type</b>s from
* file, HTTP and direct input sources.
- * The implementation of this tool is based on {@link TikaMIMETypeDetector}.
+ * The implementation of this tool is based on {@link org.apache.any23.mime.TikaMIMETypeDetector}.
*
* @author Michele Mostarda (mostarda@fbk.eu)
*/
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/PluginVerifier.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/PluginVerifier.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/PluginVerifier.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/PluginVerifier.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/PluginVerifier.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/PluginVerifier.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/PluginVerifier.java Sat Jan 14 18:47:58 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.mime.MIMEType;
-import org.deri.any23.plugin.Any23PluginManager;
-import org.deri.any23.plugin.Author;
-import org.deri.any23.plugin.ExtractorPlugin;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.mime.MIMEType;
+import org.apache.any23.plugin.Any23PluginManager;
+import org.apache.any23.plugin.Author;
+import org.apache.any23.plugin.ExtractorPlugin;
import java.io.File;
import java.io.PrintStream;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Rover.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Rover.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Rover.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Rover.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Rover.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Rover.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Rover.java Sat Jan 14 18:47:58 2012
@@ -15,30 +15,30 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
+import org.apache.any23.Any23;
+import org.apache.any23.configuration.Configuration;
+import org.apache.any23.configuration.DefaultConfiguration;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.extractor.SingleDocumentExtraction;
+import org.apache.any23.filter.IgnoreAccidentalRDFa;
+import org.apache.any23.filter.IgnoreTitlesOfEmptyDocuments;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.util.LogUtils;
+import org.apache.any23.writer.BenchmarkTripleHandler;
+import org.apache.any23.writer.LoggingTripleHandler;
+import org.apache.any23.writer.ReportingTripleHandler;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.TripleHandlerException;
+import org.apache.any23.writer.WriterRegistry;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
-import org.deri.any23.Any23;
-import org.deri.any23.util.LogUtils;
-import org.deri.any23.configuration.Configuration;
-import org.deri.any23.configuration.DefaultConfiguration;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.ExtractionParameters;
-import org.deri.any23.extractor.SingleDocumentExtraction;
-import org.deri.any23.filter.IgnoreAccidentalRDFa;
-import org.deri.any23.filter.IgnoreTitlesOfEmptyDocuments;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.writer.BenchmarkTripleHandler;
-import org.deri.any23.writer.LoggingTripleHandler;
-import org.deri.any23.writer.ReportingTripleHandler;
-import org.deri.any23.writer.TripleHandler;
-import org.deri.any23.writer.TripleHandlerException;
-import org.deri.any23.writer.WriterRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +52,7 @@ import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
-import static org.deri.any23.extractor.ExtractionParameters.ValidationMode;
+import static org.apache.any23.extractor.ExtractionParameters.ValidationMode;
/**
* A default rover implementation. Goes and fetches a URL using an hint
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Tool.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Tool.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Tool.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Tool.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Tool.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Tool.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Tool.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
/**
* Defines a runnable <i>CLI</i> tool.
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/ToolRunner.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/ToolRunner.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/ToolRunner.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/ToolRunner.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.plugin.Any23PluginManager;
+import org.apache.any23.plugin.Any23PluginManager;
import java.io.File;
import java.io.IOException;
@@ -28,10 +28,10 @@ import java.lang.annotation.Target;
/**
* This class is the main class responsible to provide a uniform command-line
- * access points to all the others tools like {@link org.deri.any23.cli.Rover}.
+ * access points to all the others tools like {@link Rover}.
*
- * @see org.deri.any23.cli.ExtractorDocumentation
- * @see org.deri.any23.cli.Rover
+ * @see ExtractorDocumentation
+ * @see Rover
*/
@ToolRunner.Skip
public class ToolRunner {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Version.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Version.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Version.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Version.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Version.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/Version.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/Version.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.Any23;
+import org.apache.any23.Any23;
/**
* Prints out the <b>Any23</b> library version.
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/VocabPrinter.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/VocabPrinter.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/VocabPrinter.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/VocabPrinter.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/VocabPrinter.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/cli/VocabPrinter.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/VocabPrinter.java Sat Jan 14 18:47:58 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
+import org.apache.any23.vocab.RDFSchemaUtils;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
-import org.deri.any23.vocab.RDFSchemaUtils;
import java.io.BufferedOutputStream;
import java.io.IOException;
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/cli/VocabPrinter.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/Configuration.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/Configuration.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/Configuration.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/Configuration.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/Configuration.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/Configuration.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/Configuration.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.configuration;
+package org.apache.any23.configuration;
/**
* Defines the main <i>Any23</code> configuration.
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultConfiguration.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/DefaultConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultConfiguration.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultConfiguration.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/DefaultConfiguration.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/DefaultConfiguration.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultConfiguration.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.configuration;
+package org.apache.any23.configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultModifiableConfiguration.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/DefaultModifiableConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultModifiableConfiguration.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultModifiableConfiguration.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/DefaultModifiableConfiguration.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/DefaultModifiableConfiguration.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/DefaultModifiableConfiguration.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.configuration;
+package org.apache.any23.configuration;
import java.util.Properties;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/ModifiableConfiguration.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/ModifiableConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/ModifiableConfiguration.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/ModifiableConfiguration.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/ModifiableConfiguration.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/configuration/ModifiableConfiguration.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/configuration/ModifiableConfiguration.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.configuration;
+package org.apache.any23.configuration;
/**
* Modifiable implementation of {@link Configuration}.
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/EncodingDetector.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/encoding/EncodingDetector.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/EncodingDetector.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/EncodingDetector.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/encoding/EncodingDetector.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/encoding/EncodingDetector.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/EncodingDetector.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.encoding;
+package org.apache.any23.encoding;
import java.io.IOException;
import java.io.InputStream;
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/EncodingDetector.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/TikaEncodingDetector.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/encoding/TikaEncodingDetector.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/TikaEncodingDetector.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/TikaEncodingDetector.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/encoding/TikaEncodingDetector.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/encoding/TikaEncodingDetector.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/TikaEncodingDetector.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.encoding;
+package org.apache.any23.encoding;
import org.apache.tika.parser.txt.CharsetDetector;
import org.apache.tika.parser.txt.CharsetMatch;
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * An implementation of {@link org.deri.any23.encoding.EncodingDetector} based on
+ * An implementation of {@link EncodingDetector} based on
* <a href="http://tika.apache.org/">Apache Tika</a>.
*
* @author Michele Mostarda ( michele.mostarda@gmail.com )
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/encoding/TikaEncodingDetector.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ErrorReporter.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ErrorReporter.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ErrorReporter.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ErrorReporter.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ErrorReporter.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ErrorReporter.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ErrorReporter.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
import java.io.PrintStream;
import java.util.Collection;
@@ -47,7 +47,7 @@ public interface ErrorReporter {
/**
* Returns all the collected errors.
*
- * @return a collection of {@link org.deri.any23.extractor.ErrorReporter.Error}s.
+ * @return a collection of {@link ErrorReporter.Error}s.
*/
Collection<Error> getErrors();
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ErrorReporter.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExampleInputOutput.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExampleInputOutput.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExampleInputOutput.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExampleInputOutput.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExampleInputOutput.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExampleInputOutput.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExampleInputOutput.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.extractor.Extractor.BlindExtractor;
-import org.deri.any23.source.MemCopyFactory;
-import org.deri.any23.source.StringDocumentSource;
-import org.deri.any23.writer.TripleHandler;
-import org.deri.any23.writer.TripleHandlerException;
-import org.deri.any23.writer.TurtleWriter;
+import org.apache.any23.source.MemCopyFactory;
+import org.apache.any23.source.StringDocumentSource;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.TripleHandlerException;
+import org.apache.any23.writer.TurtleWriter;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -95,7 +94,7 @@ public class ExampleInputOutput {
}
private boolean isBlindExtractor() {
- return factory.createExtractor() instanceof BlindExtractor;
+ return factory.createExtractor() instanceof Extractor.BlindExtractor;
}
}
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionContext.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionContext.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionContext.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionContext.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionContext.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionContext.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionContext.java Sat Jan 14 18:47:58 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
import org.openrdf.model.URI;
/**
* This class provides the context for the processing of
- * a single {@link org.deri.any23.extractor.Extractor}.
+ * a single {@link Extractor}.
*/
public class ExtractionContext {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionException.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionException.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionException.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionException.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionException.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionException.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionException.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
import java.io.PrintStream;
import java.io.PrintWriter;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionParameters.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionParameters.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionParameters.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionParameters.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionParameters.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionParameters.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionParameters.java Sat Jan 14 18:47:58 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.configuration.Configuration;
-import org.deri.any23.configuration.DefaultConfiguration;
+import org.apache.any23.configuration.Configuration;
+import org.apache.any23.configuration.DefaultConfiguration;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* This class models the parameters to be used to perform an extraction.
*
- * @see org.deri.any23.Any23
+ * @see org.apache.any23.Any23
* @author Michele Mostarda (mostarda@fbk.eu)
*/
public class ExtractionParameters {
@@ -40,7 +40,7 @@ public class ExtractionParameters {
}
/**
- * Creates the default extraction parameters with {@link DefaultConfiguration}.
+ * Creates the default extraction parameters with {@link org.apache.any23.configuration.DefaultConfiguration}.
*
* @return the default extraction parameters.
*/
@@ -71,9 +71,9 @@ public class ExtractionParameters {
* @param configuration underlying configuration.
* @param extractionMode specifies the required extraction mode.
* @param extractionFlags map of specific flags used for extraction. If not specified they will
- * be retrieved by the default {@link org.deri.any23.configuration.Configuration}.
+ * be retrieved by the default {@link org.apache.any23.configuration.Configuration}.
* @param extractionProperties map of specific properties used for extraction. If not specified
- * they will ne retrieved by the default {@link org.deri.any23.configuration.Configuration}.
+ * they will ne retrieved by the default {@link org.apache.any23.configuration.Configuration}.
*/
public ExtractionParameters(
Configuration configuration,
@@ -148,7 +148,7 @@ public class ExtractionParameters {
/**
* Returns the value of the specified extraction flag, if the flag is undefined
- * it will be retrieved by the default {@link org.deri.any23.configuration.Configuration}.
+ * it will be retrieved by the default {@link org.apache.any23.configuration.Configuration}.
*
* @param flagName name of flag.
* @return flag value.
@@ -176,7 +176,7 @@ public class ExtractionParameters {
/**
* Returns the value of the specified extraction property, if the property is undefined
- * it will be retrieved by the default {@link org.deri.any23.configuration.Configuration}.
+ * it will be retrieved by the default {@link org.apache.any23.configuration.Configuration}.
*
* @param propertyName the property name.
* @return the property value.
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionParameters.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResult.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionResult.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResult.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResult.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionResult.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionResult.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResult.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResultImpl.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionResultImpl.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResultImpl.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResultImpl.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionResultImpl.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractionResultImpl.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractionResultImpl.java Sat Jan 14 18:47:58 2012
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.extractor.html.MicroformatExtractor;
-import org.deri.any23.rdf.Prefixes;
-import org.deri.any23.writer.TripleHandler;
-import org.deri.any23.writer.TripleHandlerException;
+import org.apache.any23.extractor.html.MicroformatExtractor;
+import org.apache.any23.rdf.Prefixes;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.TripleHandlerException;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
@@ -49,8 +49,8 @@ import java.util.Set;
* of the ExtractionWriter interface.
* <p/>
*
- * @see org.deri.any23.writer.TripleHandler
- * @see org.deri.any23.extractor.ExtractionContext
+ * @see org.apache.any23.writer.TripleHandler
+ * @see ExtractionContext
* @author Richard Cyganiak (richard@cyganiak.de)
* @author Michele Mostarda (michele.mostarda@gmail.com)
*/
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/Extractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/Extractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/Extractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/Extractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/Extractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/Extractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/Extractor.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
import org.openrdf.model.URI;
import org.w3c.dom.Document;
@@ -31,14 +31,14 @@ import java.io.InputStream;
public interface Extractor<Input> {
/**
- * This interface specializes an {@link org.deri.any23.extractor.Extractor} able to handle
+ * This interface specializes an {@link Extractor} able to handle
* {@link java.net.URI} as input format. Use it if you need to fetch a document before the extraction
*/
public interface BlindExtractor extends Extractor<URI> {
}
/**
- * This interface specializes an {@link org.deri.any23.extractor.Extractor} able to handle
+ * This interface specializes an {@link Extractor} able to handle
* {@link java.io.InputStream} as input format.
*/
public interface ContentExtractor extends Extractor<InputStream> {
@@ -54,7 +54,7 @@ public interface Extractor<Input> {
}
/**
- * This interface specializes an {@link org.deri.any23.extractor.Extractor} able to handle
+ * This interface specializes an {@link Extractor} able to handle
* {@link org.w3c.dom.Document} as input format.
*/
public interface TagSoupDOMExtractor extends Extractor<Document> {
@@ -75,7 +75,7 @@ public interface Extractor<Input> {
throws IOException, ExtractionException;
/**
- * Returns a {@link org.deri.any23.extractor.ExtractorDescription} of this extractor.
+ * Returns a {@link ExtractorDescription} of this extractor.
*
* @return the object representing the extractor description.
*/
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorDescription.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorDescription.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorDescription.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorDescription.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorDescription.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorDescription.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorDescription.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.rdf.Prefixes;
+import org.apache.any23.rdf.Prefixes;
/**
*
* It defines a minimal signature for an
- * {@link org.deri.any23.extractor.Extractor} description.
+ * {@link Extractor} description.
*
*/
public interface ExtractorDescription {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorFactory.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorFactory.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorFactory.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorFactory.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorFactory.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorFactory.java Sat Jan 14 18:47:58 2012
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.mime.MIMEType;
+import org.apache.any23.mime.MIMEType;
import java.util.Collection;
/**
- * Interface defining a factory for {@link org.deri.any23.extractor.Extractor}.
+ * Interface defining a factory for {@link Extractor}.
*
- * @param <T> the type of the {@link org.deri.any23.extractor.Extractor} to be created by this factory.
+ * @param <T> the type of the {@link Extractor} to be created by this factory.
*/
public interface ExtractorFactory<T extends Extractor<?>> extends ExtractorDescription {
@@ -49,7 +49,7 @@ public interface ExtractorFactory<T exte
/**
* An example input file for the extractor, to be used in auto-generated
- * documentation. For the {@link org.deri.any23.extractor.Extractor.BlindExtractor},
+ * documentation. For the {@link Extractor.BlindExtractor},
* this is an arbitrary URI.
* For extractors that require content, it is the name of a file, relative
* to the factory's class file's location, it will be opened using
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorGroup.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorGroup.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorGroup.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorGroup.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorGroup.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorGroup.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorGroup.java Sat Jan 14 18:47:58 2012
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.mime.MIMEType;
+import org.apache.any23.mime.MIMEType;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
/**
- * It simple models a group of {@link org.deri.any23.extractor.ExtractorFactory} providing
+ * It simple models a group of {@link ExtractorFactory} providing
* simple accessing methods.
*/
public class ExtractorGroup implements Iterable<ExtractorFactory<?>> {
@@ -44,11 +44,11 @@ public class ExtractorGroup implements I
}
/**
- * Returns a {@link ExtractorGroup} with a set of {@link org.deri.any23.extractor.Extractor} able to
+ * Returns a {@link ExtractorGroup} with a set of {@link Extractor} able to
* process the provided mime type.
*
* @param mimeType to perform the selection.
- * @return an {@link org.deri.any23.extractor.ExtractorGroup} able to process the provided mime type.
+ * @return an {@link ExtractorGroup} able to process the provided mime type.
*/
public ExtractorGroup filterByMIMEType(MIMEType mimeType) {
// @@@ wildcards, q values
@@ -66,7 +66,7 @@ public class ExtractorGroup implements I
}
/**
- * @return <code>true</code> if all the {@link org.deri.any23.extractor.Extractor} contained in the group
+ * @return <code>true</code> if all the {@link Extractor} contained in the group
* supports all the content types.
*/
public boolean allExtractorsSupportAllContentTypes() {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorRegistry.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorRegistry.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorRegistry.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorRegistry.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/ExtractorRegistry.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/ExtractorRegistry.java Sat Jan 14 18:47:58 2012
@@ -15,34 +15,34 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.configuration.DefaultConfiguration;
-import org.deri.any23.extractor.csv.CSVExtractor;
-import org.deri.any23.extractor.html.AdrExtractor;
-import org.deri.any23.extractor.html.GeoExtractor;
-import org.deri.any23.extractor.html.HCalendarExtractor;
-import org.deri.any23.extractor.html.HCardExtractor;
-import org.deri.any23.extractor.html.HListingExtractor;
-import org.deri.any23.extractor.html.HRecipeExtractor;
-import org.deri.any23.extractor.html.HResumeExtractor;
-import org.deri.any23.extractor.html.HReviewExtractor;
-import org.deri.any23.extractor.html.HTMLMetaExtractor;
-import org.deri.any23.extractor.html.HeadLinkExtractor;
-import org.deri.any23.extractor.html.ICBMExtractor;
-import org.deri.any23.extractor.html.LicenseExtractor;
-import org.deri.any23.extractor.html.SpeciesExtractor;
-import org.deri.any23.extractor.html.TitleExtractor;
-import org.deri.any23.extractor.html.TurtleHTMLExtractor;
-import org.deri.any23.extractor.html.XFNExtractor;
-import org.deri.any23.extractor.microdata.MicrodataExtractor;
-import org.deri.any23.extractor.rdf.NQuadsExtractor;
-import org.deri.any23.extractor.rdf.NTriplesExtractor;
-import org.deri.any23.extractor.rdf.RDFXMLExtractor;
-import org.deri.any23.extractor.rdf.TriXExtractor;
-import org.deri.any23.extractor.rdf.TurtleExtractor;
-import org.deri.any23.extractor.rdfa.RDFa11Extractor;
-import org.deri.any23.extractor.rdfa.RDFaExtractor;
+import org.apache.any23.configuration.DefaultConfiguration;
+import org.apache.any23.extractor.csv.CSVExtractor;
+import org.apache.any23.extractor.html.AdrExtractor;
+import org.apache.any23.extractor.html.GeoExtractor;
+import org.apache.any23.extractor.html.HCalendarExtractor;
+import org.apache.any23.extractor.html.HCardExtractor;
+import org.apache.any23.extractor.html.HListingExtractor;
+import org.apache.any23.extractor.html.HRecipeExtractor;
+import org.apache.any23.extractor.html.HResumeExtractor;
+import org.apache.any23.extractor.html.HReviewExtractor;
+import org.apache.any23.extractor.html.HTMLMetaExtractor;
+import org.apache.any23.extractor.html.HeadLinkExtractor;
+import org.apache.any23.extractor.html.ICBMExtractor;
+import org.apache.any23.extractor.html.LicenseExtractor;
+import org.apache.any23.extractor.html.SpeciesExtractor;
+import org.apache.any23.extractor.html.TitleExtractor;
+import org.apache.any23.extractor.html.TurtleHTMLExtractor;
+import org.apache.any23.extractor.html.XFNExtractor;
+import org.apache.any23.extractor.microdata.MicrodataExtractor;
+import org.apache.any23.extractor.rdf.NQuadsExtractor;
+import org.apache.any23.extractor.rdf.NTriplesExtractor;
+import org.apache.any23.extractor.rdf.RDFXMLExtractor;
+import org.apache.any23.extractor.rdf.TriXExtractor;
+import org.apache.any23.extractor.rdf.TurtleExtractor;
+import org.apache.any23.extractor.rdfa.RDFa11Extractor;
+import org.apache.any23.extractor.rdfa.RDFaExtractor;
import java.util.ArrayList;
import java.util.Collections;
@@ -52,7 +52,7 @@ import java.util.Map;
/**
* Singleton class acting as a register for all the various
- * {@link org.deri.any23.extractor.Extractor}.
+ * {@link Extractor}.
*/
public class ExtractorRegistry {
@@ -62,13 +62,13 @@ public class ExtractorRegistry {
private static ExtractorRegistry instance = null;
/**
- * maps containing the related {@link org.deri.any23.extractor.ExtractorFactory} for each
- * registered {@link org.deri.any23.extractor.Extractor}.
+ * maps containing the related {@link ExtractorFactory} for each
+ * registered {@link Extractor}.
*/
private Map<String, ExtractorFactory<?>> factories = new HashMap<String, ExtractorFactory<?>>();
/**
- * @return returns the {@link org.deri.any23.extractor.ExtractorRegistry} instance.
+ * @return returns the {@link ExtractorRegistry} instance.
*/
public static ExtractorRegistry getInstance() {
// Thread-safe
@@ -112,10 +112,10 @@ public class ExtractorRegistry {
}
/**
- * Registers an {@link org.deri.any23.extractor.ExtractorFactory}.
+ * Registers an {@link ExtractorFactory}.
*
* @param factory
- * @throws IllegalArgumentException if trying to register a {@link org.deri.any23.extractor.ExtractorFactory}
+ * @throws IllegalArgumentException if trying to register a {@link ExtractorFactory}
* with a that already exists in the registry.
*/
public void register(ExtractorFactory<?> factory) {
@@ -128,12 +128,12 @@ public class ExtractorRegistry {
/**
*
- * Retrieves a {@link org.deri.any23.extractor.ExtractorFactory} given its name
+ * Retrieves a {@link ExtractorFactory} given its name
*
* @param name of the desired factory
- * @return the {@link org.deri.any23.extractor.ExtractorFactory} associated to the provided name
+ * @return the {@link ExtractorFactory} associated to the provided name
* @throws IllegalArgumentException if there is not a
- * {@link org.deri.any23.extractor.ExtractorFactory} associated to the provided name.
+ * {@link ExtractorFactory} associated to the provided name.
*/
public ExtractorFactory<?> getFactory(String name) {
if (!factories.containsKey(name)) {
@@ -143,16 +143,16 @@ public class ExtractorRegistry {
}
/**
- * @return an {@link org.deri.any23.extractor.ExtractorGroup} with all the registered
- * {@link org.deri.any23.extractor.Extractor}.
+ * @return an {@link ExtractorGroup} with all the registered
+ * {@link Extractor}.
*/
public ExtractorGroup getExtractorGroup() {
return getExtractorGroup(getAllNames());
}
/**
- * Returns an {@link org.deri.any23.extractor.ExtractorGroup} containing the
- * {@link org.deri.any23.extractor.ExtractorFactory} mathing the names provided as input.
+ * Returns an {@link ExtractorGroup} containing the
+ * {@link ExtractorFactory} mathing the names provided as input.
* @param names a {@link java.util.List} containing the names of the desired {@link ExtractorFactory}.
* @return the extraction group.
*/
@@ -166,8 +166,8 @@ public class ExtractorRegistry {
/**
*
- * @param name of the {@link org.deri.any23.extractor.ExtractorFactory}
- * @return <code>true</code> if is there a {@link org.deri.any23.extractor.ExtractorFactory}
+ * @param name of the {@link ExtractorFactory}
+ * @return <code>true</code> if is there a {@link ExtractorFactory}
* associated to the provided name.
*/
public boolean isRegisteredName(String name) {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SimpleExtractorFactory.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SimpleExtractorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SimpleExtractorFactory.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SimpleExtractorFactory.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SimpleExtractorFactory.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SimpleExtractorFactory.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SimpleExtractorFactory.java Sat Jan 14 18:47:58 2012
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.mime.MIMEType;
-import org.deri.any23.rdf.Prefixes;
+import org.apache.any23.mime.MIMEType;
+import org.apache.any23.rdf.Prefixes;
import java.util.ArrayList;
import java.util.Collection;
/**
- * This class is a simple and default-like implementation of {@link org.deri.any23.extractor.ExtractorFactory}.
+ * This class is a simple and default-like implementation of {@link ExtractorFactory}.
*
- * @param <T> the type of the {@link org.deri.any23.extractor.Extractor} served by this factory.
+ * @param <T> the type of the {@link Extractor} served by this factory.
*/
public class SimpleExtractorFactory<T extends Extractor<?>> implements ExtractorFactory<T> {
@@ -41,16 +41,16 @@ public class SimpleExtractorFactory<T ex
private final Class<T> extractorClass;
/**
- * Creates an instance of a {@link org.deri.any23.extractor.ExtractorFactory} serving concrete implementation
- * instances of {@link org.deri.any23.extractor.Extractor}.
+ * Creates an instance of a {@link ExtractorFactory} serving concrete implementation
+ * instances of {@link Extractor}.
*
- * @param name of the {@link org.deri.any23.extractor.Extractor}.
- * @param prefixes handled {@link org.deri.any23.rdf.Prefixes}.
+ * @param name of the {@link Extractor}.
+ * @param prefixes handled {@link org.apache.any23.rdf.Prefixes}.
* @param supportedMIMETypes collection of supported MIME Types.
* @param exampleInput a string acting as a input example.
- * @param extractorClass concrete implementation class of the {@link org.deri.any23.extractor.Extractor}.
- * @param <S> the concrete type of the {@link org.deri.any23.extractor.Extractor}.
- * @return an {@link org.deri.any23.extractor.ExtractorFactory}.
+ * @param extractorClass concrete implementation class of the {@link Extractor}.
+ * @param <S> the concrete type of the {@link Extractor}.
+ * @return an {@link ExtractorFactory}.
*/
public static <S extends Extractor<?>> ExtractorFactory<S> create(
String name,
@@ -63,21 +63,21 @@ public class SimpleExtractorFactory<T ex
}
/**
- * @return the name of the {@link org.deri.any23.extractor.Extractor}
+ * @return the name of the {@link Extractor}
*/
public String getExtractorName() {
return name;
}
/**
- * @return the handled {@link org.deri.any23.rdf.Prefixes}
+ * @return the handled {@link org.apache.any23.rdf.Prefixes}
*/
public Prefixes getPrefixes() {
return prefixes;
}
/**
- * @return the supported {@link org.deri.any23.mime.MIMEType}
+ * @return the supported {@link org.apache.any23.mime.MIMEType}
*/
public Collection<MIMEType> getSupportedMIMETypes() {
return supportedMIMETypes;
@@ -89,7 +89,7 @@ public class SimpleExtractorFactory<T ex
}
/**
- * @return an instance of type T concrete implementation of {@link org.deri.any23.extractor.Extractor}
+ * @return an instance of type T concrete implementation of {@link Extractor}
*/
@Override
public T createExtractor() {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SingleDocumentExtraction.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SingleDocumentExtraction.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SingleDocumentExtraction.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java Sat Jan 14 18:47:58 2012
@@ -15,33 +15,33 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.configuration.Configuration;
-import org.deri.any23.configuration.DefaultConfiguration;
-import org.deri.any23.encoding.EncodingDetector;
-import org.deri.any23.encoding.TikaEncodingDetector;
-import org.deri.any23.extractor.Extractor.BlindExtractor;
-import org.deri.any23.extractor.Extractor.ContentExtractor;
-import org.deri.any23.extractor.Extractor.TagSoupDOMExtractor;
-import org.deri.any23.extractor.html.DocumentReport;
-import org.deri.any23.extractor.html.HTMLDocument;
-import org.deri.any23.extractor.html.MicroformatExtractor;
-import org.deri.any23.extractor.html.TagSoupParser;
-import org.deri.any23.mime.MIMEType;
-import org.deri.any23.mime.MIMETypeDetector;
-import org.deri.any23.rdf.Any23ValueFactoryWrapper;
-import org.deri.any23.rdf.RDFUtils;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.source.LocalCopyFactory;
-import org.deri.any23.source.MemCopyFactory;
-import org.deri.any23.validator.EmptyValidationReport;
-import org.deri.any23.validator.ValidatorException;
-import org.deri.any23.vocab.SINDICE;
-import org.deri.any23.writer.CompositeTripleHandler;
-import org.deri.any23.writer.CountingTripleHandler;
-import org.deri.any23.writer.TripleHandler;
-import org.deri.any23.writer.TripleHandlerException;
+import org.apache.any23.configuration.Configuration;
+import org.apache.any23.configuration.DefaultConfiguration;
+import org.apache.any23.encoding.EncodingDetector;
+import org.apache.any23.encoding.TikaEncodingDetector;
+import org.apache.any23.extractor.html.DocumentReport;
+import org.apache.any23.extractor.html.HTMLDocument;
+import org.apache.any23.extractor.html.MicroformatExtractor;
+import org.apache.any23.extractor.html.TagSoupParser;
+import org.apache.any23.mime.MIMEType;
+import org.apache.any23.mime.MIMETypeDetector;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.source.LocalCopyFactory;
+import org.apache.any23.source.MemCopyFactory;
+import org.apache.any23.validator.EmptyValidationReport;
+import org.apache.any23.validator.ValidatorException;
+import org.apache.any23.vocab.SINDICE;
+import org.apache.any23.writer.CompositeTripleHandler;
+import org.apache.any23.writer.CountingTripleHandler;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.TripleHandlerException;
+import org.apache.any23.extractor.Extractor.BlindExtractor;
+import org.apache.any23.extractor.Extractor.ContentExtractor;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
import org.openrdf.model.BNode;
import org.openrdf.model.URI;
import org.openrdf.model.impl.URIImpl;
@@ -64,8 +64,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import static org.deri.any23.extractor.TagSoupExtractionResult.PropertyPath;
-import static org.deri.any23.extractor.TagSoupExtractionResult.ResourceRoot;
+import static org.apache.any23.extractor.TagSoupExtractionResult.PropertyPath;
+import static org.apache.any23.extractor.TagSoupExtractionResult.ResourceRoot;
/**
* This class acts as facade where all the extractors were called on a single document.
@@ -159,7 +159,7 @@ public class SingleDocumentExtraction {
/**
* Builds an extractor by the specification of document source,
* extractors factory and output triple handler, using the
- * {@link org.deri.any23.configuration.DefaultConfiguration}.
+ * {@link org.apache.any23.configuration.DefaultConfiguration}.
*
* @param in input document source.
* @param factory the extractors factory.
@@ -179,10 +179,10 @@ public class SingleDocumentExtraction {
/**
* Sets the internal factory for generating the document local copy,
- * if <code>null</code> the {@link MemCopyFactory} will be used.
+ * if <code>null</code> the {@link org.apache.any23.source.MemCopyFactory} will be used.
*
* @param copyFactory local copy factory.
- * @see DocumentSource
+ * @see org.apache.any23.source.DocumentSource
*/
public void setLocalCopyFactory(LocalCopyFactory copyFactory) {
this.copyFactory = copyFactory;
@@ -200,7 +200,7 @@ public class SingleDocumentExtraction {
}
/**
- * Triggers the execution of all the {@link org.deri.any23.extractor.Extractor}
+ * Triggers the execution of all the {@link Extractor}
* registered to this class using the specified extraction parameters.
*
* @param extractionParameters the parameters applied to the run execution.
@@ -312,7 +312,7 @@ public class SingleDocumentExtraction {
}
/**
- * Triggers the execution of all the {@link org.deri.any23.extractor.Extractor}
+ * Triggers the execution of all the {@link Extractor}
* registered to this class using the <i>default</i> extraction parameters.
*
* @throws IOException
@@ -324,7 +324,7 @@ public class SingleDocumentExtraction {
}
/**
- * Returns the detected mimetype for the given {@link DocumentSource}.
+ * Returns the detected mimetype for the given {@link org.apache.any23.source.DocumentSource}.
*
* @return string containing the detected mimetype.
* @throws IOException if an error occurred while accessing the data.
@@ -335,7 +335,7 @@ public class SingleDocumentExtraction {
}
/**
- * Check whether the given {@link DocumentSource} content activates of not at least an extractor.
+ * Check whether the given {@link org.apache.any23.source.DocumentSource} content activates of not at least an extractor.
*
* @return <code>true</code> if at least an extractor is activated, <code>false</code> otherwise.
* @throws IOException
@@ -346,7 +346,7 @@ public class SingleDocumentExtraction {
}
/**
- * @return the list of all the activated extractors for the given {@link DocumentSource}.
+ * @return the list of all the activated extractors for the given {@link org.apache.any23.source.DocumentSource}.
*/
public List<Extractor> getMatchingExtractors() {
final List<Extractor> extractorsList = new ArrayList<Extractor>();
@@ -377,7 +377,7 @@ public class SingleDocumentExtraction {
}
/**
- * Chech whether the given {@link DocumentSource} is an <b>HTML</b> document.
+ * Chech whether the given {@link org.apache.any23.source.DocumentSource} is an <b>HTML</b> document.
*
* @return <code>true</code> if the document source is an HTML document.
* @throws IOException if an error occurs while accessing data.
@@ -393,7 +393,7 @@ public class SingleDocumentExtraction {
* @param extractionParameters extraction parameters to be applied to determine the document language.
* @return the document language if any, <code>null</code> otherwise.
* @throws java.io.IOException if an error occurs during the document analysis.
- * @throws org.deri.any23.validator.ValidatorException
+ * @throws org.apache.any23.validator.ValidatorException
*/
private String extractDocumentLanguage(ExtractionParameters extractionParameters)
throws IOException, ValidatorException {
@@ -434,14 +434,14 @@ public class SingleDocumentExtraction {
}
/**
- * Triggers the execution of a specific {@link org.deri.any23.extractor.Extractor}.
+ * Triggers the execution of a specific {@link Extractor}.
*
* @param extractionParameters the parameters used for the extraction.
- * @param extractor the {@link org.deri.any23.extractor.Extractor} to be executed.
+ * @param extractor the {@link Extractor} to be executed.
* @throws ExtractionException if an error specific to an extractor happens.
* @throws IOException if an IO error occurs during the extraction.
* @return the roots of the resources that have been extracted.
- * @throws org.deri.any23.validator.ValidatorException if an error occurs during validation.
+ * @throws org.apache.any23.validator.ValidatorException if an error occurs during validation.
*/
private SingleExtractionReport runExtractor(
final ExtractionParameters extractionParameters,
@@ -828,7 +828,7 @@ public class SingleDocumentExtraction {
* @param to the root to the nested microformat.
* @param th the triple handler.
* @param ec the extraction context used to add such information.
- * @throws org.deri.any23.writer.TripleHandlerException
+ * @throws org.apache.any23.writer.TripleHandlerException
*/
private void createNestingRelationship(
PropertyPath from,
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtractionReport.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SingleDocumentExtractionReport.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtractionReport.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtractionReport.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SingleDocumentExtractionReport.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/SingleDocumentExtractionReport.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtractionReport.java Sat Jan 14 18:47:58 2012
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.validator.ValidationReport;
+import org.apache.any23.validator.ValidationReport;
import java.util.Collection;
import java.util.Map;
/**
- * This class provides the report for a {@link org.deri.any23.extractor.SingleDocumentExtraction} run.
+ * This class provides the report for a {@link SingleDocumentExtraction} run.
*
- * @see org.deri.any23.extractor.SingleDocumentExtraction
+ * @see SingleDocumentExtraction
* @author Michele Mostarda (mostarda@fbk.eu)
*/
public class SingleDocumentExtractionReport {
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtractionReport.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/TagSoupExtractionResult.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/TagSoupExtractionResult.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/TagSoupExtractionResult.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/TagSoupExtractionResult.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/TagSoupExtractionResult.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/TagSoupExtractionResult.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/TagSoupExtractionResult.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.deri.any23.extractor;
+package org.apache.any23.extractor;
-import org.deri.any23.extractor.html.MicroformatExtractor;
+import org.apache.any23.extractor.html.MicroformatExtractor;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
@@ -25,7 +25,7 @@ import java.util.Arrays;
import java.util.List;
/**
- * This interface models a specific {@link org.deri.any23.extractor.ExtractionResult}
+ * This interface models a specific {@link ExtractionResult}
* able to collect property roots generated by <i>HTML Microformat</i> extractions.
*
* @author Michele Mostarda (mostarda@fbk.eu)
@@ -47,7 +47,7 @@ public interface TagSoupExtractionResult
* Returns all the collected property roots.
*
* @return an <b>unmodifiable</b> list of
- * {@link org.deri.any23.extractor.TagSoupExtractionResult.ResourceRoot}s.
+ * {@link TagSoupExtractionResult.ResourceRoot}s.
*/
List<ResourceRoot> getResourceRoots();
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/TagSoupExtractionResult.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/csv/CSVExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/csv/CSVExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/csv/CSVExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.csv;
+package org.apache.any23.extractor.csv;
+import org.apache.any23.extractor.ExtractionContext;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.Extractor;
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.vocab.CSV;
import org.apache.commons.csv.CSVParser;
-import org.deri.any23.extractor.ExtractionContext;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.ExtractionParameters;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.extractor.Extractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.RDFUtils;
-import org.deri.any23.vocab.CSV;
import org.openrdf.model.URI;
import org.openrdf.model.Value;
import org.openrdf.model.impl.LiteralImpl;
@@ -185,7 +185,7 @@ public class CSVExtractor implements Ext
/**
* It process the first row of the file, returning a list of {@link URI}s representing
* the properties for each column. If a value of the header is an absolute <i>URI</i>
- * then it leave it as is. Otherwise the {@link CSV} vocabulary is used.
+ * then it leave it as is. Otherwise the {@link org.apache.any23.vocab.CSV} vocabulary is used.
*
* @param header
* @return an array of {@link URI}s identifying the column names.
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVReaderBuilder.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/csv/CSVReaderBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVReaderBuilder.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVReaderBuilder.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/csv/CSVReaderBuilder.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/csv/CSVReaderBuilder.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/csv/CSVReaderBuilder.java Sat Jan 14 18:47:58 2012
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.csv;
+package org.apache.any23.extractor.csv;
+import org.apache.any23.configuration.DefaultConfiguration;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVStrategy;
-import org.deri.any23.configuration.DefaultConfiguration;
import java.io.IOException;
import java.io.InputStream;
@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
/**
* This class is responsible to build a reader first guessing the configuration
- * from the file it self and then, if not successful, from the {@link DefaultConfiguration}.
+ * from the file it self and then, if not successful, from the {@link org.apache.any23.configuration.DefaultConfiguration}.
*
* @author Davide Palmisano ( dpalmisano@gmail.com )
* @author Michele Mostarda ( michele.mostarda@gmail.com )
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/AdrExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/AdrExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/AdrExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.extractor.TagSoupExtractionResult;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.VCARD;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.extractor.TagSoupExtractionResult;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.VCARD;
import org.openrdf.model.BNode;
import org.openrdf.model.vocabulary.RDF;
import org.w3c.dom.Node;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DocumentReport.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/DocumentReport.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DocumentReport.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DocumentReport.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/DocumentReport.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/DocumentReport.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DocumentReport.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
-import org.deri.any23.validator.ValidationReport;
+import org.apache.any23.validator.ValidationReport;
import org.w3c.dom.Document;
/**
* Represents the validationReportBuilder generated by a
- * the {@link org.deri.any23.extractor.html.TagSoupParser} when a document
+ * the {@link TagSoupParser} when a document
* is retrieved and validated.
*
* @author Michele Mostarda (mostarda@fbk.eu)
Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DocumentReport.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DomUtils.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/DomUtils.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DomUtils.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DomUtils.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/DomUtils.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/DomUtils.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/DomUtils.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/EntityBasedMicroformatExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/EntityBasedMicroformatExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/EntityBasedMicroformatExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/EntityBasedMicroformatExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/EntityBasedMicroformatExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/EntityBasedMicroformatExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/EntityBasedMicroformatExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.rdf.RDFUtils;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.rdf.RDFUtils;
import org.openrdf.model.BNode;
import org.w3c.dom.Node;
@@ -76,7 +76,7 @@ public abstract class EntityBasedMicrofo
* blank node ID like "MD5 of http://doc-uri/#xpath/to/node"
*/
protected BNode getBlankNodeFor(Node node) {
- return RDFUtils.getBNode( getDocumentURI() + "#" + DomUtils.getXPathForNode(node));
+ return RDFUtils.getBNode(getDocumentURI() + "#" + DomUtils.getXPathForNode(node));
}
}
\ No newline at end of file
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/GeoExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/GeoExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/GeoExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,23 +15,21 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.extractor.TagSoupExtractionResult;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.VCARD;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.extractor.TagSoupExtractionResult;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.VCARD;
import org.openrdf.model.BNode;
import org.openrdf.model.vocabulary.RDF;
import org.w3c.dom.Node;
import java.util.Arrays;
-import static org.deri.any23.extractor.html.HTMLDocument.TextField;
-
/**
* Extractor for the <a href="http://microformats.org/wiki/geo">Geo</a>
@@ -45,11 +43,11 @@ public class GeoExtractor extends Entity
public static final ExtractorFactory<GeoExtractor> factory =
SimpleExtractorFactory.create(
- "html-mf-geo",
- PopularPrefixes.createSubset("rdf", "vcard"),
- Arrays.asList("text/html;q=0.1", "application/xhtml+xml;q=0.1"),
- "example-mf-geo.html",
- GeoExtractor.class
+ "html-mf-geo",
+ PopularPrefixes.createSubset("rdf", "vcard"),
+ Arrays.asList("text/html;q=0.1", "application/xhtml+xml;q=0.1"),
+ "example-mf-geo.html",
+ GeoExtractor.class
);
public ExtractorDescription getDescription() {
@@ -70,7 +68,7 @@ public class GeoExtractor extends Entity
//try lat & lon
final HTMLDocument document = new HTMLDocument(node);
HTMLDocument.TextField latNode = document.getSingularTextField("latitude" );
- TextField lonNode = document.getSingularTextField("longitude");
+ HTMLDocument.TextField lonNode = document.getSingularTextField("longitude");
String lat = latNode.value();
String lon = lonNode.value();
if ("".equals(lat) || "".equals(lon)) {
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCalendarExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCalendarExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCalendarExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCalendarExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCalendarExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCalendarExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCalendarExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.extractor.TagSoupExtractionResult;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.rdf.RDFUtils;
-import org.deri.any23.vocab.ICAL;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.extractor.TagSoupExtractionResult;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.vocab.ICAL;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
@@ -36,7 +36,7 @@ import java.text.ParseException;
import java.util.Arrays;
import java.util.List;
-import static org.deri.any23.extractor.html.HTMLDocument.TextField;
+import static org.apache.any23.extractor.html.HTMLDocument.TextField;
/**
Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCardExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCardExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCardExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.extractor.TagSoupExtractionResult;
+import org.apache.any23.extractor.html.annotations.Includes;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.VCARD;
import org.apache.commons.lang.StringUtils;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.extractor.TagSoupExtractionResult;
-import org.deri.any23.extractor.html.annotations.Includes;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.VCARD;
+import org.apache.any23.extractor.ExtractorFactory;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
@@ -39,7 +39,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import static org.deri.any23.extractor.html.HTMLDocument.TextField;
+import static org.apache.any23.extractor.html.HTMLDocument.TextField;
/**