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 [3/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/extractor/html/HCardName.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCardName.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardName.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardName.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCardName.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HCardName.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardName.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.Node;
 
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.deri.any23.extractor.html.HTMLDocument.TextField;
+import static org.apache.any23.extractor.html.HTMLDocument.TextField;
 
 /**
  * An HCard name, consisting of various parts. Handles computation

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HListingExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HListingExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HListingExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,17 +15,17 @@
  * 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.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.FOAF;
-import org.deri.any23.vocab.HLISTING;
+import org.apache.any23.extractor.ExtractionException;
+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.FOAF;
+import org.apache.any23.vocab.HLISTING;
 import org.openrdf.model.BNode;
 import org.openrdf.model.Resource;
 import org.openrdf.model.URI;
@@ -38,7 +38,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static org.deri.any23.extractor.html.HTMLDocument.TextField;
+import static org.apache.any23.extractor.html.HTMLDocument.TextField;
 
 /**
  * Extractor for the <a href="http://microformats.org/wiki/hlisting">hListing</a>
@@ -49,7 +49,7 @@ import static org.deri.any23.extractor.h
 public class HListingExtractor extends EntityBasedMicroformatExtractor {
 
     private static final HLISTING hLISTING = HLISTING.getInstance();
-    private static final FOAF     foaf     = FOAF.getInstance();
+    private static final FOAF foaf     = FOAF.getInstance();
 
     private static final Set<String> ActionClasses = new HashSet<String>() {
         {

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HRecipeExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HRecipeExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HRecipeExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.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.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.rdf.PopularPrefixes;
-import org.deri.any23.vocab.HRECIPE;
+import org.apache.any23.extractor.ExtractionException;
+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.rdf.PopularPrefixes;
+import org.apache.any23.vocab.HRECIPE;
 import org.openrdf.model.BNode;
 import org.openrdf.model.URI;
 import org.openrdf.model.vocabulary.RDF;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HResumeExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HResumeExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HResumeExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HResumeExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HResumeExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HResumeExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HResumeExtractor.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.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.DOAC;
-import org.deri.any23.vocab.FOAF;
+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.DOAC;
+import org.apache.any23.vocab.FOAF;
 import org.openrdf.model.BNode;
 import org.openrdf.model.Resource;
 import org.openrdf.model.vocabulary.RDF;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HReviewExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HReviewExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HReviewExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.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.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.rdf.PopularPrefixes;
-import org.deri.any23.vocab.DCTERMS;
-import org.deri.any23.vocab.REVIEW;
-import org.deri.any23.vocab.VCARD;
+import org.apache.any23.extractor.ExtractionException;
+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.DCTERMS;
+import org.apache.any23.vocab.REVIEW;
+import org.apache.any23.vocab.VCARD;
 import org.openrdf.model.BNode;
 import org.openrdf.model.Resource;
 import org.openrdf.model.vocabulary.RDF;
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 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;
 
 /**
  * Extractor for the <a href="http://microformats.org/wiki/hreview">hReview</a>

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLDocument.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HTMLDocument.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLDocument.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLDocument.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HTMLDocument.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HTMLDocument.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLDocument.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.rdf.Any23ValueFactoryWrapper;
-import org.deri.any23.rdf.RDFUtils;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.rdf.RDFUtils;
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.ValueFactoryImpl;
 import org.slf4j.Logger;
@@ -179,7 +179,7 @@ public class HTMLDocument {
 
     /**
      * @return An absolute URI, or null if the URI is not fixable
-     * @throws ExtractionException If the base URI is invalid
+     * @throws org.apache.any23.extractor.ExtractionException If the base URI is invalid
      */
     public URI resolveURI(String uri) throws ExtractionException {
         return valueFactory.resolveURI(uri, getBaseURI());
@@ -276,7 +276,7 @@ public class HTMLDocument {
      * Returns the list of URLs associated to the fields marked with class <i>className</i>.
      *
      * @param className name of node class containing the URL field.
-     * @return the list of {@link org.deri.any23.extractor.html.HTMLDocument.TextField} found.
+     * @return the list of {@link HTMLDocument.TextField} found.
      */
     public TextField[] getPluralUrlField(String className) {
         List<TextField> res = new ArrayList<TextField>();

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HTMLMetaExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HTMLMetaExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HTMLMetaExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
 
-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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.rdf.RDFUtils;
-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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.vocab.SINDICE;
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.LiteralImpl;
 import org.openrdf.model.impl.URIImpl;
@@ -49,7 +49,7 @@ import java.util.Set;
  *
  * @author Davide Palmisano ( dpalmisano@gmail.com )
  */
-public class HTMLMetaExtractor implements TagSoupDOMExtractor {
+public class HTMLMetaExtractor implements Extractor.TagSoupDOMExtractor {
 
     public static final String NAME = "html-head-meta";
 

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HeadLinkExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HeadLinkExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HeadLinkExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HeadLinkExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HeadLinkExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/HeadLinkExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HeadLinkExtractor.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.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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.XHTML;
+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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.XHTML;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.model.URI;
 import org.openrdf.model.ValueFactory;
 import org.openrdf.model.impl.ValueFactoryImpl;
@@ -38,7 +38,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This {@link org.deri.any23.extractor.Extractor.TagSoupDOMExtractor} implementation
+ * This {@link org.apache.any23.extractor.Extractor.TagSoupDOMExtractor} implementation
  * retrieves the <code>LINK</code>s declared within the <code>HTML/HEAD</code> page header.
  */
 public class HeadLinkExtractor implements TagSoupDOMExtractor {

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/ICBMExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/ICBMExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/ICBMExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/ICBMExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/ICBMExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/ICBMExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/ICBMExtractor.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.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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.Any23ValueFactoryWrapper;
-import org.deri.any23.rdf.PopularPrefixes;
+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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.model.BNode;
 import org.openrdf.model.URI;
 import org.openrdf.model.ValueFactory;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/LicenseExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/LicenseExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/LicenseExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/LicenseExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/LicenseExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/LicenseExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/LicenseExtractor.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.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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.XHTML;
+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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.XHTML;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.model.URI;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/MicroformatExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/MicroformatExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/MicroformatExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/MicroformatExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/MicroformatExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/MicroformatExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/MicroformatExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
 
-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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.TagSoupExtractionResult;
-import org.deri.any23.extractor.html.annotations.Includes;
-import org.deri.any23.rdf.Any23ValueFactoryWrapper;
+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.ExtractorDescription;
+import org.apache.any23.extractor.TagSoupExtractionResult;
+import org.apache.any23.extractor.html.annotations.Includes;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.model.BNode;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Resource;
@@ -103,7 +103,7 @@ public abstract class MicroformatExtract
     }
 
     /**
-     * Returns the {@link org.deri.any23.extractor.ExtractionResult} associated
+     * Returns the {@link org.apache.any23.extractor.ExtractionResult} associated
      * to the extraction session.
      *
      * @return a valid extraction result.
@@ -242,7 +242,7 @@ public abstract class MicroformatExtract
      * This method checks if there is a native nesting relationship between two
      * {@link MicroformatExtractor}.
      *
-     * @see {@link Includes}
+     * @see {@link org.apache.any23.extractor.html.annotations.Includes}
      * @param including the including {@link MicroformatExtractor}
      * @param included the included {@link MicroformatExtractor}
      * @return <code>true</code> if there is a declared nesting relationship

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpanCloserInputStream.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/SpanCloserInputStream.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpanCloserInputStream.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpanCloserInputStream.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/SpanCloserInputStream.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/SpanCloserInputStream.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpanCloserInputStream.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 java.io.IOException;
 import java.io.InputStream;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/SpeciesExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/SpeciesExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/SpeciesExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.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.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.WO;
+import org.apache.any23.extractor.ExtractionException;
+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.WO;
 import org.openrdf.model.BNode;
 import org.openrdf.model.Resource;
 import org.openrdf.model.URI;
@@ -38,7 +38,7 @@ import java.util.Arrays;
  * The data are represented using the
  * <a href="http://www.bbc.co.uk/ontologies/wildlife/2010-02-22.shtml">BBC Wildlife Ontology</a>.
  *
- * @see org.deri.any23.vocab.WO
+ * @see org.apache.any23.vocab.WO
  * @author Davide Palmisano (dpalmisano@gmail.com)
  */
 public class SpeciesExtractor extends EntityBasedMicroformatExtractor {
@@ -99,7 +99,7 @@ public class SpeciesExtractor extends En
      * @param node the DOM node.
      * @param out  the extraction result collector.
      * @return <code>true</code> if the extraction has produces something, <code>false</code> otherwise.
-     * @throws org.deri.any23.extractor.ExtractionException
+     * @throws org.apache.any23.extractor.ExtractionException
      *
      */
     @Override

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/SpeciesExtractor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TagSoupParser.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TagSoupParser.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TagSoupParser.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TagSoupParser.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TagSoupParser.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TagSoupParser.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TagSoupParser.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.apache.any23.validator.DefaultValidator;
+import org.apache.any23.validator.Validator;
+import org.apache.any23.validator.ValidatorException;
 import org.apache.xerces.xni.Augmentations;
 import org.apache.xerces.xni.QName;
 import org.apache.xerces.xni.XMLAttributes;
 import org.apache.xerces.xni.XNIException;
 import org.cyberneko.html.parsers.DOMParser;
-import org.deri.any23.validator.DefaultValidator;
-import org.deri.any23.validator.Validator;
-import org.deri.any23.validator.ValidatorException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -128,7 +128,7 @@ public class TagSoupParser {
      *         if <code>true</code>. The reports contains also information about the activated rules and the
      *         the detected issues.
      * @throws IOException
-     * @throws ValidatorException
+     * @throws org.apache.any23.validator.ValidatorException
      */
     public DocumentReport getValidatedDOM(boolean applyFix) throws IOException, ValidatorException {
         final URI dURI;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TitleExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TitleExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TitleExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
 
-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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.Any23ValueFactoryWrapper;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.DCTERMS;
+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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.model.impl.ValueFactoryImpl;
 import org.w3c.dom.Document;
 

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TurtleHTMLExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TurtleHTMLExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TurtleHTMLExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TurtleHTMLExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TurtleHTMLExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/TurtleHTMLExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TurtleHTMLExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
 
-import org.deri.any23.extractor.ErrorReporter;
-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.extractor.rdf.RDFParserFactory;
-import org.deri.any23.rdf.PopularPrefixes;
+import org.apache.any23.extractor.ErrorReporter;
+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.extractor.rdf.RDFParserFactory;
+import org.apache.any23.rdf.PopularPrefixes;
 import org.openrdf.model.URI;
 import org.openrdf.rio.RDFParseException;
 import org.openrdf.rio.turtle.TurtleParser;

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TurtleHTMLExtractor.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/XFNExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/XFNExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/XFNExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/XFNExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/XFNExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/XFNExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/XFNExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.html;
+package org.apache.any23.extractor.html;
 
-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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.rdf.Any23ValueFactoryWrapper;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.vocab.FOAF;
-import org.deri.any23.vocab.XFN;
+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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.vocab.FOAF;
+import org.apache.any23.vocab.XFN;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.model.BNode;
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.ValueFactoryImpl;
@@ -48,7 +48,7 @@ import java.util.Arrays;
 public class XFNExtractor implements TagSoupDOMExtractor {
 
     private static final FOAF vFOAF = FOAF.getInstance();
-    private static final XFN  vXFN  = XFN.getInstance();
+    private static final XFN vXFN  = XFN.getInstance();
 
     private final static Any23ValueFactoryWrapper factoryWrapper =
             new Any23ValueFactoryWrapper(ValueFactoryImpl.getInstance());

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/annotations/Includes.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/annotations/Includes.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/annotations/Includes.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/annotations/Includes.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/annotations/Includes.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/html/annotations/Includes.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/annotations/Includes.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.html.annotations;
+package org.apache.any23.extractor.html.annotations;
 
-import org.deri.any23.extractor.html.MicroformatExtractor;
+import org.apache.any23.extractor.html.MicroformatExtractor;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/Item.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/Item.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/Item.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/Item.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/Item.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/Item.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/Item.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
 /**
  * Base class for <b>Microdata</b> items.

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemProp.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemProp.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemProp.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemProp.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemProp.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemProp.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemProp.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
 /**
  * Describes a <b>Microdata item property</b>.

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemPropValue.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemPropValue.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemPropValue.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
-import org.deri.any23.util.StringUtils;
+import org.apache.any23.util.StringUtils;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -219,7 +219,7 @@ public class ItemPropValue {
     public String toJSON() {
         String contentStr;
         if(content instanceof String) {
-            contentStr = "\"" + StringUtils.escapeAsJSONString( (String) content) + "\"";
+            contentStr = "\"" + StringUtils.escapeAsJSONString((String) content) + "\"";
         } else if(content instanceof Date) {
             contentStr = "\"" + sdf.format((Date) content) + "\"";
         } else {

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemScope.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemScope.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/ItemScope.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
 import java.net.MalformedURLException;
 import java.net.URL;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
-import org.deri.any23.extractor.ErrorReporter;
-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.extractor.html.DomUtils;
-import org.deri.any23.rdf.PopularPrefixes;
-import org.deri.any23.rdf.RDFUtils;
-import org.deri.any23.vocab.DCTERMS;
-import org.deri.any23.vocab.XHTML;
+import org.apache.any23.extractor.ErrorReporter;
+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.extractor.html.DomUtils;
+import org.apache.any23.rdf.PopularPrefixes;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.XHTML;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Resource;
 import org.openrdf.model.URI;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParser.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParser.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParser.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java Sat Jan 14 18:47:58 2012
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
-import org.deri.any23.extractor.html.DomUtils;
-import org.deri.any23.util.StringUtils;
+import org.apache.any23.extractor.html.DomUtils;
+import org.apache.any23.util.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserException.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParserException.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserException.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserException.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParserException.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParserException.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserException.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
-import org.deri.any23.extractor.html.DomUtils;
+import org.apache.any23.extractor.html.DomUtils;
 import org.w3c.dom.Node;
 
 /**

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserReport.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParserReport.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserReport.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserReport.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParserReport.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/microdata/MicrodataParserReport.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParserReport.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.microdata;
+package org.apache.any23.extractor.microdata;
 
 /**
  * This class describes the report of the {@link MicrodataParser}.

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/BaseRDFExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/BaseRDFExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/BaseRDFExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-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.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.openrdf.rio.RDFHandlerException;
 import org.openrdf.rio.RDFParseException;
 import org.openrdf.rio.RDFParser;
@@ -33,7 +33,7 @@ import java.io.InputStream;
 
 /**
  * Base class for a generic <i>RDF</i>
- * {@link org.deri.any23.extractor.Extractor.ContentExtractor}.
+ * {@link org.apache.any23.extractor.Extractor.ContentExtractor}.
  *
  * @author Michele Mostarda (mostarda@fbk.eu)
  */

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/NQuadsExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/NQuadsExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/NQuadsExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-import org.deri.any23.extractor.ExtractionContext;
-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.apache.any23.extractor.ExtractionContext;
+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.openrdf.rio.helpers.RDFParserBase;
 
 import java.util.Arrays;
 
 /**
- * Concrete implementation of {@link org.deri.any23.extractor.Extractor.ContentExtractor}
+ * Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
  * handling <a href="http://sw.deri.org/2008/07/n-quads/">N-Quads</a> format.
  *
  * @author Michele Mostarda (mostarda@fbk.eu)

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/NTriplesExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/NTriplesExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/NTriplesExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,27 +15,19 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-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.ContentExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
+import org.apache.any23.extractor.ExtractionContext;
+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.openrdf.rio.helpers.RDFParserBase;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Arrays;
 
 /**
- * Concrete implementation of {@link org.deri.any23.extractor.Extractor.ContentExtractor}
+ * Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
  * handling NTriples <a href="http://www.w3.org/2001/sw/RDFCore/ntriples/">NTriples</a> format.
  */
 public class NTriplesExtractor extends BaseRDFExtractor {

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFHandlerAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFHandlerAdapter.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFHandlerAdapter.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-import org.deri.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.ExtractionResult;
 import org.openrdf.model.Resource;
 import org.openrdf.model.Statement;
 import org.openrdf.model.URI;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFParserFactory.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFParserFactory.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFParserFactory.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java Sat Jan 14 18:47:58 2012
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-import org.deri.any23.extractor.ErrorReporter;
-import org.deri.any23.extractor.ExtractionContext;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.io.nquads.NQuadsParser;
-import org.deri.any23.rdf.Any23ValueFactoryWrapper;
+import org.apache.any23.extractor.ErrorReporter;
+import org.apache.any23.extractor.ExtractionContext;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.io.nquads.NQuadsParser;
+import org.apache.any23.rdf.Any23ValueFactoryWrapper;
 import org.openrdf.model.impl.ValueFactoryImpl;
 import org.openrdf.rio.ParseErrorListener;
 import org.openrdf.rio.RDFHandlerException;
@@ -121,7 +121,7 @@ public class RDFParserFactory {
     }
 
     /**
-     * Returns a new instance of a configured {@link org.deri.any23.io.nquads.NQuadsParser}.
+     * Returns a new instance of a configured {@link org.apache.any23.io.nquads.NQuadsParser}.
      *
      * @param verifyDataType data verification enable if <code>true</code>.
      * @param stopAtFirstError the parser stops at first error if <code>true</code>.

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFXMLExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFXMLExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/RDFXMLExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,26 +15,19 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-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.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
+import org.apache.any23.extractor.ExtractionContext;
+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.openrdf.rio.helpers.RDFParserBase;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Arrays;
 
 /**
- * Concrete implementation of {@link org.deri.any23.extractor.Extractor.ContentExtractor}
+ * Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
  * able to perform the extraction on <a href="http://www.w3.org/TR/REC-rdf-syntax/">RDF/XML</a>
  * documents.
  */

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/TriXExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/TriXExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/TriXExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-import org.deri.any23.extractor.ExtractionContext;
-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.apache.any23.extractor.ExtractionContext;
+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.openrdf.rio.helpers.RDFParserBase;
 
 import java.util.Arrays;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/TurtleExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/TurtleExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdf/TurtleExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdf;
+package org.apache.any23.extractor.rdf;
 
-import org.deri.any23.extractor.ExtractionContext;
-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.apache.any23.extractor.ExtractionContext;
+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.openrdf.rio.helpers.RDFParserBase;
 
 import java.util.Arrays;
 
 /**
  *
- * Concrete implementation of {@link org.deri.any23.extractor.Extractor.ContentExtractor} able to perform the
+ * Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor} able to perform the
  * extraction on <a href="http://www.w3.org/TeamSubmission/turtle/">Turtle</a> documents.
  *
  */

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11Extractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11Extractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11Extractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java Sat Jan 14 18:47:58 2012
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdfa;
+package org.apache.any23.extractor.rdfa;
 
-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.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.w3c.dom.Document;
 
 import java.io.IOException;
@@ -32,7 +32,7 @@ import java.net.URL;
 import java.util.Arrays;
 
 /**
- * {@link org.deri.any23.extractor.Extractor} implementation for
+ * {@link org.apache.any23.extractor.Extractor} implementation for
  * <a href="http://www.w3.org/TR/rdfa-syntax/">RDFa 1.1</a> specification.
  *
  * @author Michele Mostarda (mostarda@fbk.eu)
@@ -107,7 +107,7 @@ public class RDFa11Extractor implements 
      }
 
      /**
-      * @return the {@link org.deri.any23.extractor.ExtractorDescription} of this extractor
+      * @return the {@link org.apache.any23.extractor.ExtractorDescription} of this extractor
       */
      public ExtractorDescription getDescription() {
          return factory;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11Parser.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11Parser.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11Parser.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java Sat Jan 14 18:47:58 2012
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdfa;
+package org.apache.any23.extractor.rdfa;
 
-import org.deri.any23.extractor.ErrorReporter;
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.extractor.html.DomUtils;
-import org.deri.any23.rdf.RDFUtils;
+import org.apache.any23.extractor.ErrorReporter;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.html.DomUtils;
+import org.apache.any23.rdf.RDFUtils;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Resource;
 import org.openrdf.model.URI;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11ParserException.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11ParserException.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11ParserException.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11ParserException.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11ParserException.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFa11ParserException.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11ParserException.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdfa;
+package org.apache.any23.extractor.rdfa;
 
 /**
  * Exception class raised by {@link RDFa11Parser}.

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFaExtractor.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFaExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFaExtractor.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFaExtractor.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFaExtractor.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/RDFaExtractor.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/RDFaExtractor.java Sat Jan 14 18:47:58 2012
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdfa;
+package org.apache.any23.extractor.rdfa;
 
-import org.deri.any23.configuration.DefaultConfiguration;
-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.TagSoupDOMExtractor;
-import org.deri.any23.extractor.ExtractorDescription;
-import org.deri.any23.extractor.ExtractorFactory;
-import org.deri.any23.extractor.SimpleExtractorFactory;
-import org.deri.any23.extractor.rdf.RDFParserFactory;
+import org.apache.any23.configuration.DefaultConfiguration;
+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.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.extractor.rdf.RDFParserFactory;
+import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
 import org.openrdf.rio.RDFHandlerException;
 import org.openrdf.rio.RDFParseException;
 import org.openrdf.rio.RDFParser;
@@ -66,7 +66,7 @@ public class RDFaExtractor implements Ta
         );
 
     /**
-     * Returns a {@link org.deri.any23.extractor.rdfa.XSLTStylesheet} able to distill RDFa from
+     * Returns a {@link XSLTStylesheet} able to distill RDFa from
      * HTML pages.
      *
      * @return returns a not <code>null</code> XSLT instance.
@@ -164,7 +164,7 @@ public class RDFaExtractor implements Ta
     }
 
     /**
-     * @return the {@link org.deri.any23.extractor.ExtractorDescription} of this extractor
+     * @return the {@link org.apache.any23.extractor.ExtractorDescription} of this extractor
      */
     public ExtractorDescription getDescription() {
         return factory;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheet.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/XSLTStylesheet.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheet.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheet.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/XSLTStylesheet.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/XSLTStylesheet.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheet.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdfa;
+package org.apache.any23.extractor.rdfa;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheetException.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/XSLTStylesheetException.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheetException.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheetException.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/XSLTStylesheetException.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/rdfa/XSLTStylesheetException.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheetException.java Sat Jan 14 18:47:58 2012
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.rdfa;
+package org.apache.any23.extractor.rdfa;
 
 /**
  * Defines an exception raised by the
- * {@link org.deri.any23.extractor.rdfa.XSLTStylesheet} class.
+ * {@link XSLTStylesheet} class.
  *
- * @see org.deri.any23.extractor.rdfa.XSLTStylesheet
+ * @see XSLTStylesheet
  * @author Michele Mostarda (mostarda@fbk.eu)
  */
 public class XSLTStylesheetException extends Exception {

Propchange: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/rdfa/XSLTStylesheetException.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/QuadTemplate.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/QuadTemplate.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/QuadTemplate.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/QuadTemplate.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/QuadTemplate.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/QuadTemplate.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/QuadTemplate.java Sat Jan 14 18:47:58 2012
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
-import org.deri.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.ExtractionResult;
 import org.openrdf.model.Resource;
 import org.openrdf.model.URI;
 import org.openrdf.model.Value;
@@ -108,7 +108,7 @@ public class QuadTemplate {
     }
 
     /**
-     * Prints out this quad template in the given {@link ExtractionResult}, using
+     * Prints out this quad template in the given {@link org.apache.any23.extractor.ExtractionResult}, using
      * the passed <i>variableAssignment</i> to expand variables.
      *
      * @param er extraction result instance on which write the quad produced by this template.

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateGraph.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateGraph.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateGraph.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateGraph.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateGraph.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateGraph.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateGraph.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.URIImpl;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateObject.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateObject.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateObject.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateObject.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateObject.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateObject.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateObject.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 import org.openrdf.model.Value;
 import org.openrdf.model.impl.BNodeImpl;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplatePredicate.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplatePredicate.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplatePredicate.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplatePredicate.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplatePredicate.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplatePredicate.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplatePredicate.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.ValueFactoryImpl;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateSubject.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateSubject.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateSubject.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateSubject.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateSubject.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateSubject.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateSubject.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 import org.openrdf.model.Resource;
 import org.openrdf.model.impl.BNodeImpl;

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRule.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateXPathExtractionRule.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRule.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRule.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateXPathExtractionRule.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateXPathExtractionRule.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRule.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 /**
  * Defines an {@link XPathExtractionRule} able

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/TemplateXPathExtractionRuleImpl.java Sat Jan 14 18:47:58 2012
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
-import org.deri.any23.extractor.ExtractionResult;
-import org.deri.any23.extractor.html.DomUtils;
+import org.apache.any23.extractor.ExtractionResult;
+import org.apache.any23.extractor.html.DomUtils;
 import org.openrdf.model.URI;
 import org.w3c.dom.Document;
 

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Term.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/Term.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Term.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Term.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/Term.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/Term.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Term.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 import org.openrdf.model.Value;
 

Copied: incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Variable.java (from r1231531, incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/Variable.java)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Variable.java?p2=incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Variable.java&p1=incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/Variable.java&r1=1231531&r2=1231556&rev=1231556&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/deri/any23/extractor/xpath/Variable.java (original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/extractor/xpath/Variable.java Sat Jan 14 18:47:58 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.deri.any23.extractor.xpath;
+package org.apache.any23.extractor.xpath;
 
 /**
  * Represents a variable in {@link TemplateXPathExtractionRule}.