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 [7/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/...
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/any23-xml-mimetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/any23-xml-mimetype.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/any23-xml-mimetype.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/plugin/target.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/meta-name-misuse.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/meta-name-misuse.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/meta-name-misuse.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/missing-og-namespace.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/missing-og-namespace.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/core/src/test/resources/org/apache/any23/validator/missing-og-namespace.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Copied: incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/cli/Crawler.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/cli/Crawler.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/cli/Crawler.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/cli/Crawler.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/cli/Crawler.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/cli/Crawler.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/cli/Crawler.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 edu.uci.ics.crawler4j.crawler.Page;
+import org.apache.any23.plugin.crawler.CrawlerListener;
+import org.apache.any23.plugin.crawler.SiteCrawler;
+import org.apache.any23.source.StringDocumentSource;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
-import org.deri.any23.plugin.crawler.CrawlerListener;
-import org.deri.any23.plugin.crawler.SiteCrawler;
-import org.deri.any23.source.StringDocumentSource;
import java.io.File;
import java.io.IOException;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/CrawlerListener.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/CrawlerListener.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/CrawlerListener.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/CrawlerListener.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/CrawlerListener.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/CrawlerListener.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/CrawlerListener.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.crawler;
+package org.apache.any23.plugin.crawler;
import edu.uci.ics.crawler4j.crawler.Page;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/DefaultWebCrawler.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/DefaultWebCrawler.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/DefaultWebCrawler.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/DefaultWebCrawler.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/DefaultWebCrawler.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/DefaultWebCrawler.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/DefaultWebCrawler.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.crawler;
+package org.apache.any23.plugin.crawler;
import edu.uci.ics.crawler4j.crawler.Page;
import edu.uci.ics.crawler4j.crawler.WebCrawler;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SharedData.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/SharedData.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SharedData.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SharedData.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/SharedData.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/SharedData.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SharedData.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.crawler;
+package org.apache.any23.plugin.crawler;
import edu.uci.ics.crawler4j.crawler.Page;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SiteCrawler.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/SiteCrawler.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SiteCrawler.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SiteCrawler.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/SiteCrawler.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/deri/any23/plugin/crawler/SiteCrawler.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/java/org/apache/any23/plugin/crawler/SiteCrawler.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.crawler;
+package org.apache.any23.plugin.crawler;
import edu.uci.ics.crawler4j.crawler.CrawlController;
import edu.uci.ics.crawler4j.crawler.WebCrawler;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/Any23OnlineTestBase.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/Any23OnlineTestBase.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/Any23OnlineTestBase.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/Any23OnlineTestBase.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/Any23OnlineTestBase.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/Any23OnlineTestBase.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/Any23OnlineTestBase.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23;
+package org.apache.any23;
import org.junit.Assume;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/cli/CrawlerTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/cli/CrawlerTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/cli/CrawlerTest.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java Sat Jan 14 18:47:58 2012
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.deri.any23.cli;
+package org.apache.any23.cli;
-import org.deri.any23.Any23OnlineTestBase;
-import org.deri.any23.rdf.RDFUtils;
-import org.deri.any23.util.FileUtils;
+import org.apache.any23.Any23OnlineTestBase;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.util.FileUtils;
import org.junit.Assert;
import org.junit.Test;
import org.openrdf.model.Statement;
Copied: incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/plugin/crawler/SiteCrawlerTest.java (from r1231531, incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/plugin/crawler/SiteCrawlerTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/plugin/crawler/SiteCrawlerTest.java?p2=incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/plugin/crawler/SiteCrawlerTest.java&p1=incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/plugin/crawler/SiteCrawlerTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/deri/any23/plugin/crawler/SiteCrawlerTest.java (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/plugin/crawler/SiteCrawlerTest.java Sat Jan 14 18:47:58 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.crawler;
+package org.apache.any23.plugin.crawler;
import edu.uci.ics.crawler4j.crawler.Page;
-import org.deri.any23.Any23OnlineTestBase;
+import org.apache.any23.Any23OnlineTestBase;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
Copied: incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractor.java (from r1231531, incubator/any23/trunk/plugins/html-scraper/src/main/java/org/deri/any23/plugin/htmlscraper/HTMLScraperExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractor.java?p2=incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractor.java&p1=incubator/any23/trunk/plugins/html-scraper/src/main/java/org/deri/any23/plugin/htmlscraper/HTMLScraperExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/src/main/java/org/deri/any23/plugin/htmlscraper/HTMLScraperExtractor.java (original)
+++ incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.htmlscraper;
+package org.apache.any23.plugin.htmlscraper;
import de.l3s.boilerpipe.BoilerpipeExtractor;
import de.l3s.boilerpipe.BoilerpipeProcessingException;
@@ -23,14 +23,14 @@ import de.l3s.boilerpipe.extractors.Arti
import de.l3s.boilerpipe.extractors.CanolaExtractor;
import de.l3s.boilerpipe.extractors.DefaultExtractor;
import de.l3s.boilerpipe.extractors.LargestContentExtractor;
-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.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.vocab.SINDICE;
+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.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.vocab.SINDICE;
import org.openrdf.model.URI;
import org.openrdf.model.impl.ValueFactoryImpl;
Propchange: incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractor.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPlugin.java (from r1231531, incubator/any23/trunk/plugins/html-scraper/src/main/java/org/deri/any23/plugin/htmlscraper/HTMLScraperPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPlugin.java?p2=incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPlugin.java&p1=incubator/any23/trunk/plugins/html-scraper/src/main/java/org/deri/any23/plugin/htmlscraper/HTMLScraperPlugin.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/src/main/java/org/deri/any23/plugin/htmlscraper/HTMLScraperPlugin.java (original)
+++ incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPlugin.java Sat Jan 14 18:47:58 2012
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.htmlscraper;
+package org.apache.any23.plugin.htmlscraper;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.plugin.Author;
-import org.deri.any23.plugin.ExtractorPlugin;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.plugin.Author;
+import org.apache.any23.plugin.ExtractorPlugin;
/**
* Implementation of {@link ExtractorPlugin} based on the
Propchange: incubator/any23/trunk/plugins/html-scraper/src/main/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPlugin.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java (from r1231531, incubator/any23/trunk/plugins/html-scraper/src/test/java/org/deri/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java?p2=incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java&p1=incubator/any23/trunk/plugins/html-scraper/src/test/java/org/deri/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/src/test/java/org/deri/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java (original)
+++ incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperExtractorTest.java Sat Jan 14 18:47:58 2012
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.htmlscraper;
+package org.apache.any23.plugin.htmlscraper;
-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.apache.any23.extractor.ExtractionContext;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.extractor.ExtractionResult;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
- * Test case for {@link org.deri.any23.plugin.htmlscraper.HTMLScraperExtractor}.
+ * Test case for {@link HTMLScraperExtractor}.
*
* @author Michele Mostarda (mostarda@fbk.eu)
*/
Copied: incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPluginTest.java (from r1231531, incubator/any23/trunk/plugins/html-scraper/src/test/java/org/deri/any23/plugin/htmlscraper/HTMLScraperPluginTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPluginTest.java?p2=incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPluginTest.java&p1=incubator/any23/trunk/plugins/html-scraper/src/test/java/org/deri/any23/plugin/htmlscraper/HTMLScraperPluginTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/src/test/java/org/deri/any23/plugin/htmlscraper/HTMLScraperPluginTest.java (original)
+++ incubator/any23/trunk/plugins/html-scraper/src/test/java/org/apache/any23/plugin/htmlscraper/HTMLScraperPluginTest.java Sat Jan 14 18:47:58 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.htmlscraper;
+package org.apache.any23.plugin.htmlscraper;
import org.junit.Assert;
import org.junit.Test;
/**
- * Test case for {@link org.deri.any23.plugin.htmlscraper.HTMLScraperPlugin}
+ * Test case for {@link HTMLScraperPlugin}
*
* @author Michele Mostarda (mostarda@fbk.eu)
*/
Copied: incubator/any23/trunk/plugins/integration-test/src/test/java/org/apache/any23/plugin/PluginIT.java (from r1231531, incubator/any23/trunk/plugins/integration-test/src/test/java/org/deri/any23/plugin/PluginIT.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/integration-test/src/test/java/org/apache/any23/plugin/PluginIT.java?p2=incubator/any23/trunk/plugins/integration-test/src/test/java/org/apache/any23/plugin/PluginIT.java&p1=incubator/any23/trunk/plugins/integration-test/src/test/java/org/deri/any23/plugin/PluginIT.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/integration-test/src/test/java/org/deri/any23/plugin/PluginIT.java (original)
+++ incubator/any23/trunk/plugins/integration-test/src/test/java/org/apache/any23/plugin/PluginIT.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.deri.any23.plugin;
+package org.apache.any23.plugin;
-import org.deri.any23.extractor.ExtractorGroup;
+import org.apache.any23.extractor.ExtractorGroup;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Propchange: incubator/any23/trunk/plugins/integration-test/src/test/java/org/apache/any23/plugin/PluginIT.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id
Copied: incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java (from r1231531, incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/plugin/officescraper/ExcelExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java?p2=incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java&p1=incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/plugin/officescraper/ExcelExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/plugin/officescraper/ExcelExtractor.java (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,24 +15,24 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.officescraper;
+package org.apache.any23.plugin.officescraper;
+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.Excel;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-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.Excel;
import org.openrdf.model.URI;
import org.openrdf.model.vocabulary.RDF;
Copied: incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelPlugin.java (from r1231531, incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/plugin/officescraper/ExcelPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelPlugin.java?p2=incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelPlugin.java&p1=incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/plugin/officescraper/ExcelPlugin.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/plugin/officescraper/ExcelPlugin.java (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelPlugin.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.officescraper;
+package org.apache.any23.plugin.officescraper;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.plugin.Author;
-import org.deri.any23.plugin.ExtractorPlugin;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.plugin.Author;
+import org.apache.any23.plugin.ExtractorPlugin;
/**
- * Implementation of {@link ExtractorPlugin} for {@link ExcelExtractor}.
+ * Implementation of {@link org.apache.any23.plugin.ExtractorPlugin} for {@link ExcelExtractor}.
*
* @see ExcelExtractor
* @author Michele Mostarda (mostarda@fbk.eu)
Copied: incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/vocab/Excel.java (from r1231531, incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/vocab/Excel.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/vocab/Excel.java?p2=incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/vocab/Excel.java&p1=incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/vocab/Excel.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/main/java/org/deri/any23/vocab/Excel.java (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/main/java/org/apache/any23/vocab/Excel.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.deri.any23.vocab;
+package org.apache.any23.vocab;
import org.openrdf.model.URI;
/**
* The <i>MS Excel</i> extractor vocabulary.
*
- * @see org.deri.any23.plugin.officescraper.ExcelExtractor
+ * @see org.apache.any23.plugin.officescraper.ExcelExtractor
* @author Michele Mostarda (mostarda@fbk.eu)
*/
public class Excel extends Vocabulary {
Copied: incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java (from r1231531, incubator/any23/trunk/plugins/office-scraper/src/test/java/org/deri/any23/plugin/officescraper/ExcelExtractorTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java?p2=incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java&p1=incubator/any23/trunk/plugins/office-scraper/src/test/java/org/deri/any23/plugin/officescraper/ExcelExtractorTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/test/java/org/deri/any23/plugin/officescraper/ExcelExtractorTest.java (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/ExcelExtractorTest.java Sat Jan 14 18:47:58 2012
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.officescraper;
+package org.apache.any23.plugin.officescraper;
-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.ExtractionResultImpl;
-import org.deri.any23.rdf.RDFUtils;
-import org.deri.any23.vocab.Excel;
-import org.deri.any23.writer.CompositeTripleHandler;
-import org.deri.any23.writer.CountingTripleHandler;
-import org.deri.any23.writer.NTriplesWriter;
-import org.deri.any23.writer.TripleHandler;
-import org.deri.any23.writer.TripleHandlerException;
+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.ExtractionResultImpl;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.vocab.Excel;
+import org.apache.any23.writer.CompositeTripleHandler;
+import org.apache.any23.writer.CountingTripleHandler;
+import org.apache.any23.writer.NTriplesWriter;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.TripleHandlerException;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Copied: incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/XSSFWorkbookTest.java (from r1231531, incubator/any23/trunk/plugins/office-scraper/src/test/java/org/deri/any23/plugin/officescraper/XSSFWorkbookTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/XSSFWorkbookTest.java?p2=incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/XSSFWorkbookTest.java&p1=incubator/any23/trunk/plugins/office-scraper/src/test/java/org/deri/any23/plugin/officescraper/XSSFWorkbookTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/test/java/org/deri/any23/plugin/officescraper/XSSFWorkbookTest.java (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/test/java/org/apache/any23/plugin/officescraper/XSSFWorkbookTest.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.plugin.officescraper;
+package org.apache.any23.plugin.officescraper;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
Propchange: incubator/any23/trunk/plugins/office-scraper/src/test/resources/org/apache/any23/plugin/officescraper/test1-workbook.xlsx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/any23/trunk/plugins/office-scraper/src/test/resources/org/apache/any23/plugin/officescraper/test2-workbook.xls
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied: incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/RedirectServlet.java (from r1231531, incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/RedirectServlet.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/RedirectServlet.java?p2=incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/RedirectServlet.java&p1=incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/RedirectServlet.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/RedirectServlet.java (original)
+++ incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/RedirectServlet.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.servlet;
+package org.apache.any23.servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
Copied: incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/Servlet.java (from r1231531, incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/Servlet.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/Servlet.java?p2=incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/Servlet.java&p1=incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/Servlet.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/Servlet.java (original)
+++ incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/Servlet.java Sat Jan 14 18:47:58 2012
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.deri.any23.servlet;
+package org.apache.any23.servlet;
-import org.deri.any23.configuration.DefaultConfiguration;
-import org.deri.any23.extractor.ExtractionParameters;
-import org.deri.any23.http.HTTPClient;
-import org.deri.any23.servlet.conneg.Any23Negotiator;
-import org.deri.any23.servlet.conneg.MediaRangeSpec;
-import org.deri.any23.source.ByteArrayDocumentSource;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.source.HTTPDocumentSource;
-import org.deri.any23.source.StringDocumentSource;
+import org.apache.any23.configuration.DefaultConfiguration;
+import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.http.HTTPClient;
+import org.apache.any23.servlet.conneg.Any23Negotiator;
+import org.apache.any23.servlet.conneg.MediaRangeSpec;
+import org.apache.any23.source.ByteArrayDocumentSource;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.source.HTTPDocumentSource;
+import org.apache.any23.source.StringDocumentSource;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -36,7 +36,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.regex.Pattern;
-import static org.deri.any23.extractor.ExtractionParameters.ValidationMode;
+import static org.apache.any23.extractor.ExtractionParameters.ValidationMode;
/**
* A <i>Servlet</i> that fetches a client-specified <i>URI</i>,
Copied: incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/WebResponder.java (from r1231531, incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/WebResponder.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/WebResponder.java?p2=incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/WebResponder.java&p1=incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/WebResponder.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/WebResponder.java (original)
+++ incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/WebResponder.java Sat Jan 14 18:47:58 2012
@@ -15,18 +15,23 @@
* limitations under the License.
*/
-package org.deri.any23.servlet;
+package org.apache.any23.servlet;
-import org.deri.any23.Any23;
-import org.deri.any23.ExtractionReport;
-import org.deri.any23.extractor.ExtractionException;
-import org.deri.any23.extractor.ExtractionParameters;
-import org.deri.any23.filter.IgnoreAccidentalRDFa;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.validator.SerializationException;
-import org.deri.any23.validator.ValidationReport;
-import org.deri.any23.validator.XMLValidationReportSerializer;
-import org.deri.any23.writer.*;
+import org.apache.any23.Any23;
+import org.apache.any23.ExtractionReport;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.filter.IgnoreAccidentalRDFa;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.validator.SerializationException;
+import org.apache.any23.validator.ValidationReport;
+import org.apache.any23.validator.XMLValidationReportSerializer;
+import org.apache.any23.writer.CompositeTripleHandler;
+import org.apache.any23.writer.CountingTripleHandler;
+import org.apache.any23.writer.FormatWriter;
+import org.apache.any23.writer.ReportingTripleHandler;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.WriterRegistry;
import sun.security.validator.ValidatorException;
import javax.servlet.ServletOutputStream;
@@ -39,7 +44,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * This class is responsible for building the {@link org.deri.any23.servlet.Servlet}
+ * This class is responsible for building the {@link Servlet}
* web response.
*/
class WebResponder {
Copied: incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/Any23Negotiator.java (from r1231531, incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/Any23Negotiator.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/Any23Negotiator.java?p2=incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/Any23Negotiator.java&p1=incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/Any23Negotiator.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/Any23Negotiator.java (original)
+++ incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/Any23Negotiator.java Sat Jan 14 18:47:58 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.deri.any23.servlet.conneg;
+package org.apache.any23.servlet.conneg;
/**
- * Defines a {@link org.deri.any23.servlet.conneg.ContentTypeNegotiator} for <i>Any23</i>.
+ * Defines a {@link ContentTypeNegotiator} for <i>Any23</i>.
*/
public class Any23Negotiator {
Copied: incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/ContentTypeNegotiator.java (from r1231531, incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/ContentTypeNegotiator.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/ContentTypeNegotiator.java?p2=incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/ContentTypeNegotiator.java&p1=incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/ContentTypeNegotiator.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/ContentTypeNegotiator.java (original)
+++ incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/ContentTypeNegotiator.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.servlet.conneg;
+package org.apache.any23.servlet.conneg;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,23 +38,23 @@ public class ContentTypeNegotiator {
protected ContentTypeNegotiator(){}
/**
- * Returns the {@link org.deri.any23.servlet.conneg.MediaRangeSpec}
+ * Returns the {@link MediaRangeSpec}
* associated to the given <i>accept</i> type.
*
* @param accept
- * @return a {@link org.deri.any23.servlet.conneg.MediaRangeSpec} associated to the accept parameter
+ * @return a {@link MediaRangeSpec} associated to the accept parameter
*/
public MediaRangeSpec getBestMatch(String accept) {
return getBestMatch(accept, null);
}
/**
- * Returns the {@link org.deri.any23.servlet.conneg.MediaRangeSpec}
+ * Returns the {@link MediaRangeSpec}
* associated to the given <i>accept</i> type and <i>userAgent</i>.
*
* @param accept
* @param userAgent
- * @return the {@link org.deri.any23.servlet.conneg.MediaRangeSpec}
+ * @return the {@link MediaRangeSpec}
* associated to the given <i>accept</i> type and <i>userAgent</i>.
*/
public MediaRangeSpec getBestMatch(String accept, String userAgent) {
Copied: incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/MediaRangeSpec.java (from r1231531, incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/MediaRangeSpec.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/MediaRangeSpec.java?p2=incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/MediaRangeSpec.java&p1=incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/MediaRangeSpec.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/java/org/deri/any23/servlet/conneg/MediaRangeSpec.java (original)
+++ incubator/any23/trunk/service/src/main/java/org/apache/any23/servlet/conneg/MediaRangeSpec.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.deri.any23.servlet.conneg;
+package org.apache.any23.servlet.conneg;
import java.util.ArrayList;
import java.util.Collections;
Modified: incubator/any23/trunk/service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/webapp/WEB-INF/web.xml?rev=1231556&r1=1231555&r2=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/any23/trunk/service/src/main/webapp/WEB-INF/web.xml Sat Jan 14 18:47:58 2012
@@ -24,11 +24,11 @@
<servlet>
<servlet-name>any23</servlet-name>
- <servlet-class>org.deri.any23.servlet.Servlet</servlet-class>
+ <servlet-class>org.apache.any23.servlet.Servlet</servlet-class>
</servlet>
<servlet>
<servlet-name>redirect</servlet-name>
- <servlet-class>org.deri.any23.servlet.RedirectServlet</servlet-class>
+ <servlet-class>org.apache.any23.servlet.RedirectServlet</servlet-class>
</servlet>
<servlet-mapping>
Copied: incubator/any23/trunk/service/src/test/java/org/apache/any23/servlet/ServletTest.java (from r1231531, incubator/any23/trunk/service/src/test/java/org/deri/any23/servlet/ServletTest.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/test/java/org/apache/any23/servlet/ServletTest.java?p2=incubator/any23/trunk/service/src/test/java/org/apache/any23/servlet/ServletTest.java&p1=incubator/any23/trunk/service/src/test/java/org/deri/any23/servlet/ServletTest.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/test/java/org/deri/any23/servlet/ServletTest.java (original)
+++ incubator/any23/trunk/service/src/test/java/org/apache/any23/servlet/ServletTest.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.deri.any23.servlet;
+package org.apache.any23.servlet;
import junit.framework.Assert;
-import org.deri.any23.http.HTTPClient;
-import org.deri.any23.source.DocumentSource;
-import org.deri.any23.source.FileDocumentSource;
-import org.deri.any23.source.StringDocumentSource;
-import org.deri.any23.util.StringUtils;
+import org.apache.any23.http.HTTPClient;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.source.FileDocumentSource;
+import org.apache.any23.source.StringDocumentSource;
+import org.apache.any23.util.StringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -36,7 +36,7 @@ import java.net.URISyntaxException;
import java.net.URLEncoder;
/**
- * Test case for {@link org.deri.any23.servlet.Servlet} class.
+ * Test case for {@link Servlet} class.
*/
// TODO: some test verifications are not strict enough.
// The assertContainsTag() doesn't verify the entire output content.
@@ -374,7 +374,7 @@ public class ServletTest {
@Test
public void testResponseWithReport() throws Exception {
content = new FileDocumentSource(
- new File("src/test/resources/org/deri/any23/servlet/missing-og-namespace.html")
+ new File("src/test/resources/org/apache/any23/servlet/missing-og-namespace.html")
).readStream();
acceptHeader = "text/plain";
HttpTester response = doGetRequest("/best/http://foo.com?fix=on&report=on");
Propchange: incubator/any23/trunk/service/src/test/resources/org/apache/any23/servlet/missing-og-namespace.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/any23/trunk/service/src/test/resources/org/apache/any23/servlet/missing-og-namespace.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/any23/trunk/service/src/test/resources/org/apache/any23/servlet/missing-og-namespace.html
------------------------------------------------------------------------------
svn:mime-type = text/html