Upgraded to Hibernate 3.2.1

The code changes were pulled from the fix branch and V1.4 (HIBERNATE_UPGRADE 5207 5293)
   The jars were manually dropped in again due to the new directory structure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracter.java

@@ -182,6 +182,14 @@ abstract public class AbstractMetadataExtracter implements MetadataExtracter
         }
     }
 
+    public final void extract(
+            ContentReader reader,
+            Map<QName, Serializable> destination,
+            Map<String, QName> propertyMapping) throws ContentIOException
+    {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Override to provide the necessary extraction logic.  Implementations must ensure that the reader
      * is closed before the method exits.

source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java

@@ -32,8 +32,10 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.namespace.QName;
 
 /**
+ * Interface for document property extracters.
  * 
  * @author Jesper Steen Møller
+ * @author Derek Hulley
  */
 public interface MetadataExtracter
 {
@@ -70,11 +72,32 @@ public interface MetadataExtracter
      * The source mimetype <b>must</b> be available on the
      * {@link org.alfresco.service.cmr.repository.ContentAccessor#getMimetype()} method
      * of the reader.
+     * <p>
+     * <b>Note:</b> Internally, the extracter may need to perform a mapping of document-specific
+     *              properties to <code>QName</code>.  This is an implementation detail that is
+     *              supported in the default abstract implementations.
      * 
-     * @param reader the source of the content
-     * @param destination the destination of the extraction
-     * @throws ContentIOException if an IO exception occurs
+     * @param reader                the source of the content
+     * @param destination           the map of properties to populate (essentially a return value)
+     * @throws ContentIOException   if a detectable error occurs
+     * 
+     * @see #extract(ContentReader, Map, Map)
      */
     public void extract(ContentReader reader, Map<QName, Serializable> destination) throws ContentIOException;
 
+    /**
+     * 
+     * 
+     * @param reader                the source of the content
+     * @param destination           the map of properties to populate (essentially a return value)
+     * @param propertyMapping       a mapping of internal (document-specific properties) to system
+     *                              properties.
+     * @throws ContentIOException   if a detectable error occurs
+     * 
+     * @see #extract(ContentReader, Map)
+     */
+    public void extract(
+            ContentReader reader,
+            Map<QName, Serializable> destination,
+            Map<String, QName> propertyMapping) throws ContentIOException;
 }