jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject jena git commit: Change string references 'com.hp.hpl.jena' to 'org.apache.jena'
Date Thu, 23 Apr 2015 20:23:21 GMT
Repository: jena
Updated Branches:
  refs/heads/jena3 56534eac6 -> b27bfcacb


Change string references 'com.hp.hpl.jena' to 'org.apache.jena'


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b27bfcac
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b27bfcac
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b27bfcac

Branch: refs/heads/jena3
Commit: b27bfcacb505d1eacae7b815e4e04e43f83b11fb
Parents: 56534ea
Author: Andy Seaborne <andy@apache.org>
Authored: Thu Apr 23 21:23:00 2015 +0100
Committer: Andy Seaborne <andy@apache.org>
Committed: Thu Apr 23 21:23:00 2015 +0100

----------------------------------------------------------------------
 jena-core/src/main/java/jena/schemagen.java     |  8 +++---
 .../src/main/java/org/apache/jena/Jena.java     |  2 +-
 .../java/org/apache/jena/datatypes/package.html |  2 +-
 .../apache/jena/datatypes/xsd/impl/package.html |  2 +-
 .../org/apache/jena/datatypes/xsd/package.html  |  2 +-
 .../org/apache/jena/mem/NodeToTriplesMap.java   |  2 +-
 .../org/apache/jena/n3/JenaURIException.java    |  8 ++----
 .../java/org/apache/jena/n3/N3JenaWriter.java   |  4 +--
 .../java/org/apache/jena/ontology/OntTools.java |  2 +-
 .../apache/jena/ontology/impl/OntModelImpl.java |  2 +-
 .../org/apache/jena/ontology/impl/package.html  |  2 +-
 .../java/org/apache/jena/ontology/package.html  |  2 +-
 .../org/apache/jena/rdf/model/RDFReaderF.java   |  2 +-
 .../org/apache/jena/rdf/model/RDFWriter.java    |  3 +--
 .../org/apache/jena/rdf/model/RDFWriterF.java   |  2 +-
 .../jena/rdf/model/impl/RDFReaderFImpl.java     |  2 +-
 .../jena/rdfxml/xmlinput/ParseException.java    |  2 +-
 .../apache/jena/rdfxml/xmlinput/SAX2RDF.java    |  4 +--
 .../jena/rdfxml/xmlinput/impl/ARPResource.java  |  6 ++---
 .../jena/rdfxml/xmlinput/impl/URIReference.java |  6 ++---
 .../apache/jena/rdfxml/xmlinput/package.html    |  4 +--
 .../reasoner/rulesys/builtins/MakeInstance.java |  2 --
 .../jena/reasoner/rulesys/builtins/package.html |  2 +-
 .../apache/jena/reasoner/rulesys/package.html   |  2 +-
 .../apache/jena/util/cache/CacheManager.java    |  5 ++--
 .../main/java/org/apache/jena/util/package.html |  2 +-
 .../src/main/resources/jena-log4j.properties    |  8 +++---
 .../jena/assembler/test/TestAssemblerHelp.java  |  6 ++---
 .../org/apache/jena/enhanced/test/package.html  | 26 ------------------
 .../apache/jena/graph/compose/test/package.html | 26 ------------------
 .../org/apache/jena/graph/test/package.html     | 26 ------------------
 .../apache/jena/ontology/impl/TestOntTools.java |  2 +-
 .../jena/rdf/model/test/TestModelExtract.java   |  9 +------
 .../jena/rdf/model/test/TestSelectorUse.java    |  2 --
 .../rdf/model/test/TestStatementMethods.java    |  2 --
 .../apache/jena/rdfxml/xmlinput/ARPTests.java   |  4 +--
 .../jena/rdfxml/xmlinput/NTripleTestSuite.java  |  2 +-
 .../jena/rdfxml/xmlinput/SAX2RDFTest.java       |  6 ++---
 .../jena/rdfxml/xmlinput/WGTestSuite.java       |  4 +--
 .../jena/reasoner/rulesys/test/DebugOWL.java    |  4 ---
 .../jena/reasoner/rulesys/test/OWLWGTester.java |  3 +--
 .../jena/reasoner/rulesys/test/package.html     | 28 --------------------
 .../jena/reasoner/test/TestRDFSReasoners.java   |  1 -
 .../org/apache/jena/util/junit/Manifest.java    |  3 ---
 .../test/resources/jena-test-log4j.properties   | 16 +++++------
 45 files changed, 63 insertions(+), 197 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/jena/schemagen.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/schemagen.java b/jena-core/src/main/java/jena/schemagen.java
index 75207fa..63aed08 100644
--- a/jena-core/src/main/java/jena/schemagen.java
+++ b/jena-core/src/main/java/jena/schemagen.java
@@ -320,9 +320,9 @@ public class schemagen {
         }
         else {
             // we have to do the imports at least
-            writeln( 0, "import com.hp.hpl.jena.rdf.model.*;" );
+            writeln( 0, "import org.apache.jena.rdf.model.*;" );
             if (m_options.hasOntologyOption()) {
-                writeln( 0, "import com.hp.hpl.jena.ontology.*;" );
+                writeln( 0, "import org.apache.jena.ontology.*;" );
             }
             if (m_options.hasIncludeSourceOption()) {
                 writeln( 0, "import java.io.ByteArrayInputStream;" );
@@ -458,11 +458,11 @@ public class schemagen {
     /** Determine the list of imports to include in the file */
     protected String getImports() {
         StringBuffer buf = new StringBuffer();
-        buf.append( "import com.hp.hpl.jena.rdf.model.*;" );
+        buf.append( "import org.apache.jena.rdf.model.*;" );
         buf.append( m_nl );
 
         if (useOntology()) {
-            buf.append( "import com.hp.hpl.jena.ontology.*;" );
+            buf.append( "import org.apache.jena.ontology.*;" );
             buf.append( m_nl );
         }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/Jena.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/Jena.java b/jena-core/src/main/java/org/apache/jena/Jena.java
index 101ab95..56cf970 100644
--- a/jena-core/src/main/java/org/apache/jena/Jena.java
+++ b/jena-core/src/main/java/org/apache/jena/Jena.java
@@ -26,7 +26,7 @@ package org.apache.jena;
 public interface Jena
 {
 	/** The root package name for Jena */    
-    public static final String PATH = "com.hp.hpl.jena";
+    public static final String PATH = "org.apache.jena";
     
     /** The root name for metadata */
     

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/datatypes/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/package.html b/jena-core/src/main/java/org/apache/jena/datatypes/package.html
index e138839..0c9ceda 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/package.html
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.datatypes</title>
+		<title>Package documentation for org.apache.jena.datatypes</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/package.html b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/package.html
index e84ecf7..4de86f5 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/package.html
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.datatypes.xsd.impl</title>
+		<title>Package documentation for org.apache.jena.datatypes.xsd.impl</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/datatypes/xsd/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/package.html b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/package.html
index 45d1c7b..4c6ac8b 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/package.html
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.datatypes.xsd</title>
+		<title>Package documentation for org.apache.jena.datatypes.xsd</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
index 6515bc4..a31a186 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
@@ -134,7 +134,7 @@ public class NodeToTriplesMap extends NodeToTriplesMapBase
         { return get( y ).iterator();  }
     
     /** 
-        @see com.hp.hpl.jena.mem.Temp#get(java.lang.Object)
+        @see org.apache.jena.mem.Temp#get(java.lang.Object)
     */
     private TripleBunch get( Object y )
         { return bunchMap.get( y ); }

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/n3/JenaURIException.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/JenaURIException.java b/jena-core/src/main/java/org/apache/jena/n3/JenaURIException.java
index 34ebac0..6087bc9 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/JenaURIException.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/JenaURIException.java
@@ -21,12 +21,8 @@ package org.apache.jena.n3;
 import org.apache.jena.shared.JenaException ;
 
 
-/** com.hp.hpl.jena.query.util.RelativeURIException
- */
-
 public class JenaURIException extends JenaException
 {
-    public JenaURIException(Exception e) { super(e) ; }
-	
-    public JenaURIException(String msg) { super(msg) ; }
+    public JenaURIException(Exception e)    { super(e) ; }
+    public JenaURIException(String msg)     { super(msg) ; }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriter.java b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriter.java
index f95d581..21fa0cb 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriter.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriter.java
@@ -30,7 +30,7 @@ import org.apache.jena.rdf.model.* ;
 
 /** Entry point for N3 writers.  This writer will choose the actual writer
  *  to use by looking at the system property
- *  <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code> to get the
+ *  <code>org.apache.jena.n3.N3JenaWriter.writer</code> to get the
  *  writer name.
  *  <p>
  *  The following N3 writers are provided:
@@ -59,7 +59,7 @@ public class N3JenaWriter implements RDFWriter
      * General name for the N3 writer.  Will make a decision on exactly which
      * writer to use (pretty writer, plain writer or simple writer) when created.
      * Default is the pretty writer but can be overridden with system property
-     * <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.  
+     * <code>org.apache.jena.n3.N3JenaWriter.writer</code>.  
      */
      
     static public final String n3Writer              = "N3" ;

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
index 47d8362..594321a 100755
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
@@ -35,7 +35,7 @@ import org.apache.jena.util.iterator.Filter ;
  * Some general utilities and algorithms to support developers working with the
  * general classes in the Jena ontology API. <strong>Warning</strong> these
  * utilities are <strong>experimental</strong>. Extensive testing has not yet
- * occurred (see <tt>com.hp.hpl.jena.ontology.impl.TestOntTools</tt> in the
+ * occurred (see {@link org.apache.jena.ontology.impl.TestOntTools} in the
  * test area for basic unit tests), 
  * and in particular performance testing has not been carried out yet. 
  * Users are advised to exercise caution before relying on these utilities in 

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
index 43b8fa6..5496823 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
@@ -68,7 +68,7 @@ public class OntModelImpl extends ModelCom implements OntModel
      * This variable is how the OntModel knows how to construct
      * a syntax checker. This part of the design may change.
      */
-    static public String owlSyntaxCheckerClassName = "com.hp.hpl.jena.ontology.tidy.JenaChecker";
+    static public String owlSyntaxCheckerClassName = "org.apache.jena.ontology.tidy.JenaChecker";
 
 
     // Static variables

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/ontology/impl/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/package.html b/jena-core/src/main/java/org/apache/jena/ontology/impl/package.html
index 8e3b30b..949ae43 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/package.html
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.ontology</title>
+		<title>Package documentation for org.apache.jena.ontology</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/ontology/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/package.html b/jena-core/src/main/java/org/apache/jena/ontology/package.html
index 6ae6699..733319d 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/package.html
+++ b/jena-core/src/main/java/org/apache/jena/ontology/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.ontology</title>
+		<title>Package documentation for org.apache.jena.ontology</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderF.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderF.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderF.java
index 4be3a55..dfe8733 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderF.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderF.java
@@ -35,7 +35,7 @@ package org.apache.jena.rdf.model;
  * </ul>
  *<p>System wide defaults for classes to use as readers for these languages
  *are defined.  These defaults may be overwridden by setting a system property
- *with a name of the form com.hp.hpl.jena.readers.<lang> to the class
+ *with a name of the form org.apache.jena.readers.<lang> to the class
  *name.</p>
  * <p><b>NOTE:</b> All settings are global in nature</p>
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriter.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriter.java
index 0da8932..595d739 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriter.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriter.java
@@ -27,8 +27,7 @@ import java.io.OutputStream;
  */
 public interface RDFWriter {
 
-	public static final String NSPREFIXPROPBASE
-	  = "com.hp.hpl.jena.nsprefix.";
+	public static final String NSPREFIXPROPBASE = "org.apache.jena.nsprefix.";
 	/** Caution: Serialize Model <code>model</code> to Writer <code>out</code>.
 	 * It is often better to use an OutputStream and permit Jena
 	 * to choose the character encoding. The charset restrictions

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriterF.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriterF.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriterF.java
index f189c14..b9541f8 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriterF.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFWriterF.java
@@ -30,7 +30,7 @@ package org.apache.jena.rdf.model;
  * </ul>
  *<p>System wide defaults for classes to use as readers for these languages
  *are defined.  These defaults may be overwridden by setting a system property
- *with a name of the form com.hp.hpl.jena.readers.<lang> to the class
+ *with a name of the form org.apache.jena.readers.<lang> to the class
  *name.</p>
  *<p><b>NOTE:</b> All settings are global in nature</p>
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
index 27a4a67..a0413e6 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
@@ -29,7 +29,7 @@ import org.apache.jena.shared.* ;
  */
 public class RDFReaderFImpl extends Object implements RDFReaderF {
     // ** The setting in this class are overrided by RIOT **
-    private static final String GRDDLREADER = "com.hp.hpl.jena.grddl.GRDDLReader";
+    private static final String GRDDLREADER = "org.apache.jena.grddl.GRDDLReader";
     private static final String TURTLEREADER = org.apache.jena.n3.turtle.TurtleReader.class.getName() ;
     
 	protected static Properties langToClassName = null;

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ParseException.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ParseException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ParseException.java
index e9e1b35..b968010 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ParseException.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ParseException.java
@@ -26,7 +26,7 @@ import java.lang.reflect.Field;
 /**
  * An exception during the RDF processing of ARP. Note: it is distinguished from
  * an XML related exception from Xerces because while both are
- * SAXParseException's, the latter are not com.hp.hpl.jena.arp.ParseException's.
+ * SAXParseException's, the latter are not {@link ParseException}'s.
  */
 public class ParseException extends SAXParseException implements
         ARPErrorNumbers {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/SAX2RDF.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/SAX2RDF.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/SAX2RDF.java
index 5236067..d9ffcbb 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/SAX2RDF.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/SAX2RDF.java
@@ -144,14 +144,14 @@ implements ARPConfig {
         super.setHandlersWith(handlers);
     }
     /* (non-Javadoc)
-     * @see com.hp.hpl.jena.rdf.arp.ARPConfig#getOptions()
+     * @see org.apache.jena.rdf.arp.ARPConfig#getOptions()
      */
     @Override
     public ARPOptions getOptions() {
         return super.getOptions();
     }
     /* (non-Javadoc)
-     * @see com.hp.hpl.jena.rdf.arp.ARPConfig#setOptions(com.hp.hpl.jena.rdf.arp.ARPOptions)
+     * @see org.apache.jena.rdf.arp.ARPConfig#setOptions(org.apache.jena.rdf.arp.ARPOptions)
      */
     @Override
     public void setOptionsWith(ARPOptions opts) {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPResource.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPResource.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPResource.java
index 1da4b9b..acd8576 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPResource.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPResource.java
@@ -118,7 +118,7 @@ public class ARPResource extends TaintImpl implements  AResourceInternal {
     }
 
 	/* (non-Javadoc)
-	 * @see com.hp.hpl.jena.rdf.arp.AResource#hasNodeID()
+	 * @see org.apache.jena.rdf.arp.AResource#hasNodeID()
 	 */
 	@Override
     public boolean hasNodeID() {
@@ -127,7 +127,7 @@ public class ARPResource extends TaintImpl implements  AResourceInternal {
   private boolean used = false;
 
 	/* (non-Javadoc)
-	 * @see com.hp.hpl.jena.rdf.arp.AResourceInternal#setHasBeenUsed()
+	 * @see org.apache.jena.rdf.arp.AResourceInternal#setHasBeenUsed()
 	 */
 	@Override
     public void setHasBeenUsed() {
@@ -136,7 +136,7 @@ public class ARPResource extends TaintImpl implements  AResourceInternal {
 
 
 	/* (non-Javadoc)
-	 * @see com.hp.hpl.jena.rdf.arp.AResourceInternal#getHasBeenUsed()
+	 * @see org.apache.jena.rdf.arp.AResourceInternal#getHasBeenUsed()
 	 */
 	@Override
     public boolean getHasBeenUsed() {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/URIReference.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/URIReference.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/URIReference.java
index b021b28..4baa911 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/URIReference.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/URIReference.java
@@ -102,7 +102,7 @@ public class URIReference extends TaintImpl implements AResourceInternal, ARPErr
     /*
      * (non-Javadoc)
      * 
-     * @see com.hp.hpl.jena.rdf.arp.AResource#hasNodeID()
+     * @see org.apache.jena.rdf.arp.AResource#hasNodeID()
      */
     @Override
     public boolean hasNodeID() {
@@ -112,7 +112,7 @@ public class URIReference extends TaintImpl implements AResourceInternal, ARPErr
     /*
      * (non-Javadoc)
      * 
-     * @see com.hp.hpl.jena.rdf.arp.AResourceInternal#setHasBeenUsed()
+     * @see org.apache.jena.rdf.arp.AResourceInternal#setHasBeenUsed()
      */
     @Override
     public void setHasBeenUsed() {
@@ -121,7 +121,7 @@ public class URIReference extends TaintImpl implements AResourceInternal, ARPErr
     /*
      * (non-Javadoc)
      * 
-     * @see com.hp.hpl.jena.rdf.arp.AResourceInternal#getHasBeenUsed()
+     * @see org.apache.jena.rdf.arp.AResourceInternal#getHasBeenUsed()
      */
     @Override
     public boolean getHasBeenUsed() {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/package.html b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/package.html
index 9ebd9fd..65e9595 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/package.html
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/package.html
@@ -43,8 +43,8 @@ form an open set in RDF/XML, unlike most XML applications.
 </p>
 <p>
 A potential work around is to use a SAX parser other than Xerces and then
-use {@link com.hp.hpl.jena.rdf.arp.SAX2Model SAX2Model} or
-{@link com.hp.hpl.jena.rdf.arp.SAX2RDF SAX2RDF} to parse the SAX event stream as RDF.
+use {@link org.apache.jena.rdf.arp.SAX2Model SAX2Model} or
+{@link org.apache.jena.rdf.arp.SAX2RDF SAX2RDF} to parse the SAX event stream as RDF.
 </p>
 <p>
 The size of the leak is presumably highly dependent on the actual

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeInstance.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeInstance.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeInstance.java
index e26ad98..59cdce5 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeInstance.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeInstance.java
@@ -22,8 +22,6 @@ import org.apache.jena.graph.* ;
 import org.apache.jena.reasoner.rulesys.* ;
 import org.apache.jena.reasoner.rulesys.impl.BBRuleContext ;
 
-//import com.hp.hpl.jena.util.PrintUtil;
-
 /**
  * Create or lookup an anonymous instance of a property value. Syntax of the call is:
  * <pre>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/package.html b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/package.html
index 20600e0..96268a8 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/package.html
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.reasoner.rulesys.impl</title>
+		<title>Package documentation for org.apache.jena.reasoner.rulesys.impl</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/package.html b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/package.html
index 0ccc3bf..a525599 100755
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/package.html
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.reasoner.rulesys</title>
+		<title>Package documentation for org.apache.jena.reasoner.rulesys</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/util/cache/CacheManager.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/cache/CacheManager.java b/jena-core/src/main/java/org/apache/jena/util/cache/CacheManager.java
index 531c3a6..c63431b 100644
--- a/jena-core/src/main/java/org/apache/jena/util/cache/CacheManager.java
+++ b/jena-core/src/main/java/org/apache/jena/util/cache/CacheManager.java
@@ -38,9 +38,8 @@ public class CacheManager {
      * may be used to identify the cache in logging and
      * other operations.  To ensure uniqueness it is
      * suggested that cache's be given names similar to
-     * full java names such as
-     * com.hp.hpl.jena.graph.Node.NodeCache.
-     * @param size Teh size of the cache in terms of the number of
+     * full java names such as org.apache.jena.graph.Node.NodeCache.
+     * @param size The size of the cache in terms of the number of
      * objects it can store.
      * @return a newly created cache object
      *

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/java/org/apache/jena/util/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/package.html b/jena-core/src/main/java/org/apache/jena/util/package.html
index 910df08..9c1fa57 100755
--- a/jena-core/src/main/java/org/apache/jena/util/package.html
+++ b/jena-core/src/main/java/org/apache/jena/util/package.html
@@ -18,7 +18,7 @@
 
 <html>
 	<head>
-		<title>Package documentation for com.hp.hpl.jena.util</title>
+		<title>Package documentation for org.apache.jena.util</title>
 	</head>
 	<body>
 		<p>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/main/resources/jena-log4j.properties
----------------------------------------------------------------------
diff --git a/jena-core/src/main/resources/jena-log4j.properties b/jena-core/src/main/resources/jena-log4j.properties
index de56a2b..09e02c8 100644
--- a/jena-core/src/main/resources/jena-log4j.properties
+++ b/jena-core/src/main/resources/jena-log4j.properties
@@ -22,12 +22,12 @@ log4j.rootLogger=INFO, stderr
 # log4j.rootLogger=INFO, stderr, R
 
 # Base of all Jena classes
-log4j.logger.com.hp.hpl.jena=INFO
+log4j.logger.org.apache.jena=INFO
 
 # Example of switching on debug level logging for part of tree
-# log4j.logger.com.hp.hpl.jena.graph.test=debug
-# log4j.logger.com.hp.hpl.jena.reasoner=debug
-# log4j.logger.com.hp.hpl.jena.reasoner.test=debug
+# log4j.logger.org.apache.jena.graph.test=debug
+# log4j.logger.org.apache.jena.reasoner=debug
+# log4j.logger.org.apache.jena.reasoner.test=debug
 
 # Log format to standard out
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
index b37d3c4..bcdc473 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
@@ -176,7 +176,7 @@ public class TestAssemblerHelp extends AssemblerTestBase
             { return null; }
         }
     
-    static Model gremlinModel = modelWithStatements( "eh:Wossname ja:assembler 'com.hp.hpl.jena.assembler.test.TestAssemblerHelp$Gremlin'" );
+    static Model gremlinModel = modelWithStatements( "eh:Wossname ja:assembler 'org.apache.jena.assembler.test.TestAssemblerHelp$Gremlin'" );
     
     static boolean gremlinInvoked = false;
     
@@ -199,7 +199,7 @@ public class TestAssemblerHelp extends AssemblerTestBase
     
     public void testClassAssociation()
         {
-        String className = "com.hp.hpl.jena.assembler.test.TestAssemblerHelp$Imp";
+        String className = "org.apache.jena.assembler.test.TestAssemblerHelp$Imp";
         AssemblerGroup group = AssemblerGroup.create();
         Model m = model( "eh:Wossname ja:assembler '" + className + "'" );
         assertEquals( false, impIsLoaded );
@@ -212,7 +212,7 @@ public class TestAssemblerHelp extends AssemblerTestBase
     public void testClassResourceConstructor()
         {
         AssemblerGroup group = AssemblerGroup.create();
-        Model m = model( "eh:Wossname ja:assembler 'com.hp.hpl.jena.assembler.test.TestAssemblerHelp$Gremlin'" );
+        Model m = model( "eh:Wossname ja:assembler 'org.apache.jena.assembler.test.TestAssemblerHelp$Gremlin'" );
         assertEquals( false, gremlinInvoked );
         AssemblerHelp.loadAssemblerClasses( group, m );
         assertEquals( true, gremlinInvoked );

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/enhanced/test/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/package.html b/jena-core/src/test/java/org/apache/jena/enhanced/test/package.html
deleted file mode 100644
index f7bfc42..0000000
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<html>
-<head>
-<title>enhanced.test</title>
-</head>
-<body>
-Defines the tests for the enhanced node/graph package.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/graph/compose/test/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/package.html b/jena-core/src/test/java/org/apache/jena/graph/compose/test/package.html
deleted file mode 100644
index 7fc932a..0000000
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<html>
-<head>
-<title>graph.compose.test</title>
-</head>
-<body>
-This package defines tests for the composed-graph package.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/graph/test/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/package.html b/jena-core/src/test/java/org/apache/jena/graph/test/package.html
deleted file mode 100644
index 5372e80..0000000
--- a/jena-core/src/test/java/org/apache/jena/graph/test/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<html>
-<head>
-<title>graph.test</title>
-</head>
-<body>
-This package contains the tests for the Graph and Node family of classes.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
index 379e426..7bef377 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
@@ -92,7 +92,7 @@ public class TestOntTools
     }
 
     /**
-     * Test method for <code>com.hp.hpl.jena.ontology.OntTools#indexLCA</code>
+     * Test method for <code>org.apache.jena.ontology.OntTools#indexLCA</code>
      */
     public void testIndexLCA0() {
         m_a.addSubClass( m_b );

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelExtract.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelExtract.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelExtract.java
index 123b410..83ebe66 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelExtract.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelExtract.java
@@ -88,7 +88,7 @@ public class TestModelExtract extends AbstractModelTestBase
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.hp.hpl.jena.rdf.model.StatementBoundary#asTripleBoundary(com.hp.hpl
+	 * org.apache.jena.rdf.model.StatementBoundary#asTripleBoundary(com.hp.hpl
 	 * .jena.rdf.model.Model)
 	 */
 	public TripleBoundary asTripleBoundary( final Model m )
@@ -97,13 +97,6 @@ public class TestModelExtract extends AbstractModelTestBase
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.hp.hpl.jena.rdf.model.StatementBoundary#stopAt(com.hp.hpl.jena.rdf
-	 * .model.Statement)
-	 */
 	public boolean stopAt( final Statement s )
 	{
 		// TODO Auto-generated method stub

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
index ece265f..9767379 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
@@ -25,8 +25,6 @@ import org.apache.jena.rdf.model.* ;
 import org.apache.jena.rdf.model.test.helpers.TestingModelFactory ;
 import org.junit.Assert;
 
-// import com.hp.hpl.jena.regression.Regression.*;
-
 public class TestSelectorUse extends AbstractModelTestBase
 {
 

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java
index 166ee70..9a7c142 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java
@@ -24,8 +24,6 @@ import org.apache.jena.test.JenaTestBase ;
 import org.apache.jena.vocabulary.RDF ;
 import org.junit.Assert;
 
-// import com.hp.hpl.jena.regression.Regression.*;
-
 public class TestStatementMethods extends AbstractModelTestBase
 {
 

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/ARPTests.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/ARPTests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/ARPTests.java
index 541619e..c2475db 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/ARPTests.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/ARPTests.java
@@ -118,10 +118,10 @@ public class ARPTests extends java.lang.Object {
 		pw.println(" * limitations under the License.") ;
 		pw.println(" */") ;
 		pw.println() ;
-        pw.println("package com.hp.hpl.jena.rdfxml.xmlinput.test;");
+        pw.println("package org.apache.jena.rdfxml.xmlinput.test;");
         pw.println("import junit.framework.TestSuite;");
         pw.println("import junit.framework.Test;");
-        pw.println("import com.hp.hpl.jena.shared.wg.*;");
+        pw.println("import org.apache.jena.shared.wg.*;");
         pw.println("public class TestPackage{");
         pw.println("static public Test suite() {");
         String tsname = toJava(ts, pw, "xx");

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
index b9134c7..f5ae838 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
@@ -236,7 +236,7 @@ class NTripleTestSuite extends WGTestSuite {
 			return -countDown;
 		}
 		/* (non-Javadoc)
-		 * @see com.hp.hpl.jena.rdf.arp.ExtendedHandler#discardNodesWithNodeID()
+		 * @see org.apache.jena.rdf.arp.ExtendedHandler#discardNodesWithNodeID()
 		 */
 		@Override
         public boolean discardNodesWithNodeID() {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/SAX2RDFTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/SAX2RDFTest.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/SAX2RDFTest.java
index a5287c5..437be8a 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/SAX2RDFTest.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/SAX2RDFTest.java
@@ -1124,7 +1124,7 @@ public class SAX2RDFTest extends TestCase {
 		/*
 		 * (non-Javadoc)
 		 * 
-		 * @see com.hp.hpl.jena.rdf.model.RDFErrorHandler#warning(java.lang.Exception)
+		 * @see org.apache.jena.rdf.model.RDFErrorHandler#warning(java.lang.Exception)
 		 */
 		@Override
         public void warning(Exception e) {
@@ -1134,7 +1134,7 @@ public class SAX2RDFTest extends TestCase {
 		/*
 		 * (non-Javadoc)
 		 * 
-		 * @see com.hp.hpl.jena.rdf.model.RDFErrorHandler#error(java.lang.Exception)
+		 * @see org.apache.jena.rdf.model.RDFErrorHandler#error(java.lang.Exception)
 		 */
 		@Override
         public void error(Exception e) {
@@ -1144,7 +1144,7 @@ public class SAX2RDFTest extends TestCase {
 		/*
 		 * (non-Javadoc)
 		 * 
-		 * @see com.hp.hpl.jena.rdf.model.RDFErrorHandler.errorError(java.lang.Exception)
+		 * @see org.apache.jena.rdf.model.RDFErrorHandler.errorError(java.lang.Exception)
 		 */
 		@Override
         public void fatalError(Exception e) {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
index 4ffc735..7984a32 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
@@ -395,14 +395,14 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
 			// assertTrue(rslt>=0);
 	}
 	/* (non-Javadoc)
-         * @see com.hp.hpl.jena.rdf.arp.test.WGTestSuite.Test#createMe()
+         * @see org.apache.jena.rdf.arp.test.WGTestSuite.Test#createMe()
 	 */
 	@Override
     String createMe() {
 		throw new UnsupportedOperationException();
 	}
 	/* (non-Javadoc)
-	 * @see com.hp.hpl.jena.rdf.arp.test.WGTestSuite.Test#reallyRunTest()
+	 * @see org.apache.jena.rdf.arp.test.WGTestSuite.Test#reallyRunTest()
 	 */
 	@Override
     void reallyRunTest() {

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
index e5943dd..a5f267c 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
@@ -18,10 +18,6 @@
 
 package org.apache.jena.reasoner.rulesys.test;
 
-//import com.hp.hpl.jena.rdf.model.*;
-//import com.hp.hpl.jena.reasoner.transitiveReasoner.TransitiveReasonerFactory;
-
-
 import org.apache.jena.graph.* ;
 import org.apache.jena.graph.compose.Union ;
 import org.apache.jena.reasoner.* ;

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
index 5f2efe8..bf168e0 100755
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
@@ -38,7 +38,6 @@ import junit.framework.TestCase ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
-
 /**
  * A test harness for running the OWL working group tests. This
  * differs from the RDF one in several ways (separate manifest files,
@@ -217,7 +216,7 @@ public class OWLWGTester {
 //                System.out.println("Error: deductions graph was ...");
 //                FBRuleInfGraph fbGraph = (FBRuleInfGraph)graph;
 //                Graph deductions = fbGraph.getDeductionsGraph();
-//                com.hp.hpl.jena.util.PrintUtil.printOut(deductions.find(null,null,null));
+//                org.apache.jena.PrintUtil.printOut(deductions.find(null,null,null));
 //            }
         }
         

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/package.html
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/package.html b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/package.html
deleted file mode 100755
index 8abab61..0000000
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<html>
-	<head>
-		<title>Package documentation for com.hp.hpl.jena.datatypes</title>
-	</head>
-	<body>
-		<p>
-			Provides testing support for the rule engines.
-		</p>
-	</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java
index e3ddd41..56bd1d2 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java
@@ -18,7 +18,6 @@
 
 package org.apache.jena.reasoner.test;
 
-//import com.hp.hpl.jena.reasoner.rdfsReasoner1.*;
 import java.io.*;
 import java.util.Iterator;
 

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java b/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
index 1cd5359..e76d3f5 100644
--- a/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
+++ b/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
@@ -31,9 +31,6 @@ import org.apache.jena.vocabulary.TestManifestX ;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-//import com.hp.hpl.jena.sparql.vocabulary.TestManifest;
-//import com.hp.hpl.jena.sparql.vocabulary.TestManifestX;
-
 /**
  * A test manifest for a single manifest file.
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/b27bfcac/jena-core/src/test/resources/jena-test-log4j.properties
----------------------------------------------------------------------
diff --git a/jena-core/src/test/resources/jena-test-log4j.properties b/jena-core/src/test/resources/jena-test-log4j.properties
index f3e0cd6..cda86e6 100644
--- a/jena-core/src/test/resources/jena-test-log4j.properties
+++ b/jena-core/src/test/resources/jena-test-log4j.properties
@@ -6,16 +6,16 @@ log4j.rootLogger=INFO, stderr
 # log4j.rootLogger=INFO, stderr, R
 
 # Base of all Jena classes
-log4j.logger.com.hp.hpl.jena=INFO
-log4j.logger.com.hp.hpl.jena.graph.impl.LiteralLabelImpl=ERROR
-log4j.logger.com.hp.hpl.jena.rdf.arp.MoreTests=FATAL
-log4j.logger.com.hp.hpl.jena.regression.testReaderInterface=FATAL
-log4j.logger.com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler=FATAL
+log4j.logger.org.apache.jena=INFO
+log4j.logger.org.apache.jena.graph.impl.LiteralLabelImpl=ERROR
+log4j.logger.org.apache.jena.rdf.arp.MoreTests=FATAL
+log4j.logger.org.apache.jena.regression.testReaderInterface=FATAL
+log4j.logger.org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler=FATAL
 
 # Example of switching on debug level logging for part of tree
-# log4j.logger.com.hp.hpl.jena.graph.test=debug
-# log4j.logger.com.hp.hpl.jena.reasoner=debug
-# log4j.logger.com.hp.hpl.jena.reasoner.test=debug
+# log4j.logger.org.apache.jena.graph.test=debug
+# log4j.logger.org.apache.jena.reasoner=debug
+# log4j.logger.org.apache.jena.reasoner.test=debug
 
 # Log format to standard out
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender


Mime
View raw message