Attachment 220066 Details for Bug 387614 – Proposed Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed Patch

0001-Bug-387614.patch (text/plain), 22.40 KB, created by Doug Clarke

on 2012-08-20 14:05:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Clarke

Created: 2012-08-20 14:05:23 EDT

Size: 22.40 KB

patch

obsolete

>From 0c83e1015dce701c267bfa2339cbfe13c7a073a8 Mon Sep 17 00:00:00 2001
>From: dclarke <douglas.clarke@oracle.com>
>Date: Mon, 20 Aug 2012 14:03:43 -0400
>Subject: [PATCH] Bug 387614 - handle jpa_metamodel and ejb_or_metadata
> logging categories for backwards compatibility - deprecate
> SessionLog.EJB_OR_METADATA replacing with
> MetadataLogger.java - Fix JavaDocs and usage of deprecated
> level
>
>---
> .../config/PersistenceUnitProperties.java          |    2 +-
> .../persistence/descriptors/CachePolicy.java       |    2 +-
> .../eclipse/persistence/logging/SessionLog.java    |   96 +++++++++++---------
> .../mappings/AggregateObjectMapping.java           |    2 +-
> .../mappings/ForeignReferenceMapping.java          |    2 +-
> .../schemaframework/DefaultTableGenerator.java     |    2 +-
> .../internal/jpa/EntityManagerFactoryProvider.java |    4 +-
> .../internal/jpa/EntityManagerSetupImpl.java       |    2 +-
> .../internal/jpa/metadata/MetadataLogger.java      |    2 +-
> .../internal/jpa/metadata/MetadataProcessor.java   |   12 +--
> .../jpa/metadata/XMLMetadataSource.java            |    2 +-
> 11 files changed, 68 insertions(+), 60 deletions(-)
>
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java
>index bc98b37..1d2ffd3 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java
>@@ -1061,7 +1061,7 @@ public class PersistenceUnitProperties {
>      * @see SessionLog#CACHE
>      * @see SessionLog#PROPAGATION
>      * @see SessionLog#SEQUENCING
>-     * @see SessionLog#EJB_OR_METADATA
>+     * @see SessionLog#METADATA
>      * @see SessionLog#METAMODEL
>      * @see SessionLog#WEAVER
>      * @see SessionLog#PROPERTIES
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/descriptors/CachePolicy.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/descriptors/CachePolicy.java
>index b639483..537f7a3 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/descriptors/CachePolicy.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/descriptors/CachePolicy.java
>@@ -141,7 +141,7 @@ public class CachePolicy implements Cloneable, Serializable {
>         // If the parent is isolated, then the child must also be isolated.
>         if (!parentPolicy.isSharedIsolation()) {
>             if (!isIsolated() && (getCacheIsolation() != parentPolicy.getCacheIsolation())) {
>-                session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, "overriding_cache_isolation",
>+                session.log(SessionLog.WARNING, SessionLog.METADATA, "overriding_cache_isolation",
>                         new Object[]{descriptorDescriptor.getAlias(),
>                                 parentPolicy.getCacheIsolation(), descriptor.getAlias(),
>                                 getCacheIsolation()});
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/logging/SessionLog.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/logging/SessionLog.java
>index 9fa02f9..f37c941 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/logging/SessionLog.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/logging/SessionLog.java
>@@ -40,22 +40,23 @@ import org.eclipse.persistence.sessions.Session;
>  * <p>
>  * In addition, EclipseLink categories used for logging name space are defined with the following String values:
>  * <table>
>- * <tr><td>&nbsp;</td><td>SQL</td>           <td>&nbsp;</td><td>= "sql"</td></tr>
>- * <tr><td>&nbsp;</td><td>TRANSACTION</td>   <td>&nbsp;</td><td>= "transaction"</td></tr>
>- * <tr><td>&nbsp;</td><td>EVENT</td>         <td>&nbsp;</td><td>= "event"</td></tr>
>- * <tr><td>&nbsp;</td><td>CONNECTION</td>         <td>&nbsp;</td><td>= "connection"</td></tr> 
>- * <tr><td>&nbsp;</td><td>QUERY</td>         <td>&nbsp;</td><td>= "query"</td></tr>
>- * <tr><td>&nbsp;</td><td>CACHE</td>         <td>&nbsp;</td><td>= "cache"</td></tr>
>- * <tr><td>&nbsp;</td><td>PROPAGATION</td>   <td>&nbsp;</td><td>= "propagation"</td></tr>
>- * <tr><td>&nbsp;</td><td>SEQUENCING</td>    <td>&nbsp;</td><td>= "sequencing"</td></tr>
>- * <tr><td>&nbsp;</td><td>EJB</td>           <td>&nbsp;</td><td>= "ejb"</td></tr>
>- * <tr><td>&nbsp;</td><td>DMS</td>           <td>&nbsp;</td><td>= "dms"</td></tr>
>- * <tr><td>&nbsp;</td><td>EJB_OR_METADATA</td><td>&nbsp;</td><td>= "ejb_or_metadata"</td></tr>
>- * <tr><td>&nbsp;</td><td>METAMODEL</td><td>&nbsp;</td><td>= "metamodel"</td></tr>
>- * <tr><td>&nbsp;</td><td>WEAVER</td>        <td>&nbsp;</td><td>= "weaver"</td></tr>
>- * <tr><td>&nbsp;</td><td>PROPERTIES</td>        <td>&nbsp;</td><td>= "properties"</td></tr>
>- * <tr><td>&nbsp;</td><td>SERVER</td>        <td>&nbsp;</td><td>= "server"</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #SQL}</td>           <td>&nbsp;</td><td>= {@value #SQL}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #TRANSACTION}</td>   <td>&nbsp;</td><td>= {@value #TRANSACTION}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #EVENT}</td>         <td>&nbsp;</td><td>= {@value #EVENT}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #CONNECTION}</td>         <td>&nbsp;</td><td>= {@value #CONNECTION}</td></tr> 
>+ * <tr><td>&nbsp;</td><td>{@link #QUERY}</td>         <td>&nbsp;</td><td>= {@value #QUERY}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #CACHE}</td>         <td>&nbsp;</td><td>= {@value #CACHE}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #PROPAGATION}</td>   <td>&nbsp;</td><td>= {@value #PROPAGATION}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #SEQUENCING}</td>    <td>&nbsp;</td><td>= {@value #SEQUENCING}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #EJB}</td>           <td>&nbsp;</td><td>= {@value #EJB}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #DMS}</td>           <td>&nbsp;</td><td>= {@value #DMS}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #METADATA}</td><td>&nbsp;</td><td>= {@value #METADATA} </td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #METAMODEL}</td><td>&nbsp;</td><td>= {@value #METAMODEL}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #WEAVER}</td>        <td>&nbsp;</td><td>= {@value #WEAVER}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #PROPERTIES}</td>        <td>&nbsp;</td><td>= {@value #PROPERTIES}</td></tr>
>+ * <tr><td>&nbsp;</td><td>{@link #SERVER}</td>        <td>&nbsp;</td><td>= {@value #SERVER}</td></tr>
>  * </table>
>+ * 
>  * @see AbstractSessionLog
>  * @see SessionLogEntry
>  * @see Session
>@@ -109,7 +110,12 @@ public interface SessionLog extends Cloneable {
>     public static final String JPA = "jpa";
>     public static final String EJB = "ejb";
>     public static final String DMS = "dms";
>-    public static final String EJB_OR_METADATA = "metadata";
>+    public static final String METADATA = "metadata";
>+    /**
>+     * @deprecated use {@link #METADATA}
>+     */
>+    @Deprecated 
>+    public static final String EJB_OR_METADATA = METADATA;
>     public static final String METAMODEL = "metamodel";
>     public static final String WEAVER = "weaver";
>     public static final String PROPERTIES = "properties";
>@@ -117,7 +123,7 @@ public interface SessionLog extends Cloneable {
>     public static final String DDL = "ddl";
>     public static final String JPARS = "jpars";
>     
>-    public final String[] loggerCatagories = new String[] { SQL ,TRANSACTION ,EVENT ,CONNECTION ,QUERY ,CACHE ,PROPAGATION ,SEQUENCING ,EJB ,DMS ,EJB_OR_METADATA, METAMODEL, WEAVER ,PROPERTIES ,SERVER, JPARS};
>+    public final String[] loggerCatagories = new String[] { SQL ,TRANSACTION ,EVENT ,CONNECTION ,QUERY ,CACHE ,PROPAGATION ,SEQUENCING ,EJB ,DMS ,METADATA, METAMODEL, WEAVER ,PROPERTIES ,SERVER, JPARS};
> 
>     /**
>      * PUBLIC:
>@@ -214,15 +220,15 @@ public interface SessionLog extends Cloneable {
>      * <p>
>      * The EclipseLink logging levels returned correspond to:<br>
>      * <table>
>-     * <tr><td>ALL</td>    <td>&nbsp;</td><td>= 0</td></tr>
>-     * <tr><td>FINEST</td> <td>&nbsp;</td><td>= 1</td></tr>
>-     * <tr><td>FINER</td>  <td>&nbsp;</td><td>= 2</td></tr>
>-     * <tr><td>FINE</td>   <td>&nbsp;</td><td>= 3</td></tr>
>-     * <tr><td>CONFIG</td> <td>&nbsp;</td><td>= 4</td></tr>
>-     * <tr><td>INFO</td>   <td>&nbsp;</td><td>= 5</td></tr>
>-     * <tr><td>WARNING</td><td>&nbsp;</td><td>= 6</td></tr>
>-     * <tr><td>SEVERE</td> <td>&nbsp;</td><td>= 7</td></tr>
>-     * <tr><td>OFF</td>    <td>&nbsp;</td><td>= 8</td></tr>
>+     * <tr><td>{@link #ALL}</td>    <td>&nbsp;</td><td>= {@value #ALL}</td>
>+     * <tr><td>{@link #FINEST}</td> <td>&nbsp;</td><td>= {@value #FINEST}</td>
>+     * <tr><td>{@link #FINER}</td>  <td>&nbsp;</td><td>= {@value #FINER}</td>
>+     * <tr><td>{@link #FINE}</td>   <td>&nbsp;</td><td>= {@value #FINE}</td>
>+     * <tr><td>{@link #CONFIG}</td> <td>&nbsp;</td><td>= {@value #CONFIG}</td>
>+     * <tr><td>{@link #INFO}</td>   <td>&nbsp;</td><td>= {@value #INFO}</td>
>+     * <tr><td>{@link #WARNING}</td><td>&nbsp;</td><td>= {@value #WARNING}</td>
>+     * <tr><td>{@link #SEVERE}</td> <td>&nbsp;</td><td>= {@value #SEVERE}</td> 
>+     * <tr><td>{@link #OFF}</td>    <td>&nbsp;</td><td>= {@value #OFF}</td>
>      * </table>
>      */
>     public int getLevel();
>@@ -699,19 +705,19 @@ public interface SessionLog extends Cloneable {
> 
>     /**
>      * PUBLIC:
>-     * Log a throwable with level.
>+     * Log a {@link Throwable} with level.
>      * <p>
>      * The EclipseLink logging levels available are:<br>
>      * <table>
>-     * <tr><td>ALL</td>    <td>&nbsp;</td><td>= 0</td>
>-     * <tr><td>FINEST</td> <td>&nbsp;</td><td>= 1</td>
>-     * <tr><td>FINER</td>  <td>&nbsp;</td><td>= 2</td>
>-     * <tr><td>FINE</td>   <td>&nbsp;</td><td>= 3</td>
>-     * <tr><td>CONFIG</td> <td>&nbsp;</td><td>= 4</td>
>-     * <tr><td>INFO</td>   <td>&nbsp;</td><td>= 5</td>
>-     * <tr><td>WARNING</td><td>&nbsp;</td><td>= 6</td>
>-     * <tr><td>SEVERE</td> <td>&nbsp;</td><td>= 7</td> 
>-     * <tr><td>OFF</td>    <td>&nbsp;</td><td>= 8</td>
>+     * <tr><td>{@link #ALL}</td>    <td>&nbsp;</td><td>= {@value #ALL}</td>
>+     * <tr><td>{@link #FINEST}</td> <td>&nbsp;</td><td>= {@value #FINEST}</td>
>+     * <tr><td>{@link #FINER}</td>  <td>&nbsp;</td><td>= {@value #FINER}</td>
>+     * <tr><td>{@link #FINE}</td>   <td>&nbsp;</td><td>= {@value #FINE}</td>
>+     * <tr><td>{@link #CONFIG}</td> <td>&nbsp;</td><td>= {@value #CONFIG}</td>
>+     * <tr><td>{@link #INFO}</td>   <td>&nbsp;</td><td>= {@value #INFO}</td>
>+     * <tr><td>{@link #WARNING}</td><td>&nbsp;</td><td>= {@value #WARNING}</td>
>+     * <tr><td>{@link #SEVERE}</td> <td>&nbsp;</td><td>= {@value #SEVERE}</td> 
>+     * <tr><td>{@link #OFF}</td>    <td>&nbsp;</td><td>= {@value #OFF}</td>
>      * </table>
>      */
>     public void logThrowable(int level, Throwable throwable);
>@@ -722,15 +728,15 @@ public interface SessionLog extends Cloneable {
>      * <p>
>      * The EclipseLink logging levels available are:<br>
>      * <table>
>-     * <tr><td>ALL</td>    <td>&nbsp;</td><td>= 0</td>
>-     * <tr><td>FINEST</td> <td>&nbsp;</td><td>= 1</td>
>-     * <tr><td>FINER</td>  <td>&nbsp;</td><td>= 2</td>
>-     * <tr><td>FINE</td>   <td>&nbsp;</td><td>= 3</td>
>-     * <tr><td>CONFIG</td> <td>&nbsp;</td><td>= 4</td>
>-     * <tr><td>INFO</td>   <td>&nbsp;</td><td>= 5</td>
>-     * <tr><td>WARNING</td><td>&nbsp;</td><td>= 6</td>
>-     * <tr><td>SEVERE</td> <td>&nbsp;</td><td>= 7</td> 
>-     * <tr><td>OFF</td>    <td>&nbsp;</td><td>= 8</td>
>+     * <tr><td>{@link #ALL}</td>    <td>&nbsp;</td><td>= {@value #ALL}</td>
>+     * <tr><td>{@link #FINEST}</td> <td>&nbsp;</td><td>= {@value #FINEST}</td>
>+     * <tr><td>{@link #FINER}</td>  <td>&nbsp;</td><td>= {@value #FINER}</td>
>+     * <tr><td>{@link #FINE}</td>   <td>&nbsp;</td><td>= {@value #FINE}</td>
>+     * <tr><td>{@link #CONFIG}</td> <td>&nbsp;</td><td>= {@value #CONFIG}</td>
>+     * <tr><td>{@link #INFO}</td>   <td>&nbsp;</td><td>= {@value #INFO}</td>
>+     * <tr><td>{@link #WARNING}</td><td>&nbsp;</td><td>= {@value #WARNING}</td>
>+     * <tr><td>{@link #SEVERE}</td> <td>&nbsp;</td><td>= {@value #SEVERE}</td> 
>+     * <tr><td>{@link #OFF}</td>    <td>&nbsp;</td><td>= {@value #OFF}</td>
>      * </table>
>      */
>     public void logThrowable(int level, String category, Throwable throwable);
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/AggregateObjectMapping.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/AggregateObjectMapping.java
>index 0083e28..106e4c3 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/AggregateObjectMapping.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/AggregateObjectMapping.java
>@@ -1273,7 +1273,7 @@ public class AggregateObjectMapping extends AggregateMapping implements Relation
>         if (isNullAllowed) {
>             if (getReferenceDescriptor().hasTargetForeignKeyMapping(session)) {
>                 isNullAllowed = false;
>-                session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, "metadata_warning_ignore_is_null_allowed", new Object[]{this});
>+                session.log(SessionLog.WARNING, SessionLog.METADATA, "metadata_warning_ignore_is_null_allowed", new Object[]{this});
>             }
>         }
>         
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ForeignReferenceMapping.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ForeignReferenceMapping.java
>index 184ba78..e8e9b41 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ForeignReferenceMapping.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ForeignReferenceMapping.java
>@@ -1979,7 +1979,7 @@ public abstract class ForeignReferenceMapping extends DatabaseMapping {
>             Object[] args = new Object[2];
>             args[0] = getAttributeName();
>             args[1] = getDescriptor().getJavaClass();
>-            session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, "metadata_warning_ignore_lazy", args);
>+            session.log(SessionLog.WARNING, SessionLog.METADATA, "metadata_warning_ignore_lazy", args);
>             setIndirectionPolicy(new NoIndirectionPolicy());
>         }
>         
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/DefaultTableGenerator.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/DefaultTableGenerator.java
>index b7e2a35..3938af0 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/DefaultTableGenerator.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/DefaultTableGenerator.java
>@@ -797,7 +797,7 @@ public class DefaultTableGenerator {
> 
>                 if ((fieldType == null) || (!fieldType.isPrimitive() && (fieldTypeDef  == null))) {
>                     //TODO: log a warning for inaccessible type or not convertable type.
>-                    AbstractSessionLog.getLog().log(SessionLog.CONFIG, SessionLog.EJB_OR_METADATA, "field_type_set_to_java_lang_string", dbField.getQualifiedName(), fieldType);
>+                    AbstractSessionLog.getLog().log(SessionLog.CONFIG, SessionLog.METADATA, "field_type_set_to_java_lang_string", dbField.getQualifiedName(), fieldType);
> 
>                     //set the default type (lang.String) to all un-resolved java type, like null, Number, util.Date, NChar/NType, Calendar
>                     //sql.Blob/Clob, Object, or unknown type). Please refer to bug 4352820.
>diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
>index 6853680..dc9a56e 100644
>--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
>+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
>@@ -61,7 +61,9 @@ public class EntityManagerFactoryProvider {
>         {PersistenceUnitProperties.JDBC_DRIVER ,"eclipselink.jdbc.driver"},
>         {PersistenceUnitProperties.JDBC_URL , "eclipselink.jdbc.url"},
>         {PersistenceUnitProperties.JDBC_PASSWORD , "eclipselink.jdbc.password"},
>-        {PersistenceUnitProperties.WEAVING , "persistence.tools.weaving"}
>+        {PersistenceUnitProperties.WEAVING , "persistence.tools.weaving"},
>+        {PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METAMODEL, PersistenceUnitProperties.LOGGING_LEVEL + ".jpa_" + SessionLog.METAMODEL},
>+        {PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METADATA, PersistenceUnitProperties.LOGGING_LEVEL + ".ejb_or_" + SessionLog.METADATA}
>     };
> 
>     /**
>diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
>index f2663cd..956fc93 100644
>--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
>+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
>@@ -653,7 +653,7 @@ public class EntityManagerSetupImpl implements MetadataRefreshListener {
>                 try {
>                     customizer.customize(descriptor);
>                 } catch (Exception e) {
>-                    session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.EJB_OR_METADATA, e);
>+                    session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, e);
>                 }
>             }
>         }
>diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java
>index 631c83d..6c42dfb 100644
>--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java
>+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java
>@@ -385,7 +385,7 @@ public class MetadataLogger {
>      * Logging utility method.
>      */
>     public void log(int level, String ctx, Object[] params) {
>-        m_session.log(level, SessionLog.EJB_OR_METADATA, getLoggingContextString(ctx), params);
>+        m_session.log(level, SessionLog.METADATA, getLoggingContextString(ctx), params);
>     }
>     
>     /**
>diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataProcessor.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataProcessor.java
>index e427553..f8c2fbf 100644
>--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataProcessor.java
>+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataProcessor.java
>@@ -266,10 +266,10 @@ public class MetadataProcessor {
>             // to properly handle the exception. As a result we log an error. 
>             // The same code will be called later in the bootstrapping code 
>             // and the error will be handled then.
>-            AbstractSessionLog.getLog().log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
>+            AbstractSessionLog.getLog().log(SessionLog.WARNING, SessionLog.METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
>         } else if (!throwException) {
>             // fail quietly
>-            m_session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
>+            m_session.log(SessionLog.WARNING, SessionLog.METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
>         } else {
>             // fail loudly
>             m_session.handleException(e);
>@@ -486,9 +486,9 @@ public class MetadataProcessor {
>      */
>     protected void logMessage(String message) {
>         if (m_session == null) {
>-            AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.EJB_OR_METADATA, message, null, false);
>+            AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.METADATA, message, null, false);
>         } else {
>-            m_session.log(SessionLog.FINER, SessionLog.EJB_OR_METADATA, message, false);
>+            m_session.log(SessionLog.FINER, SessionLog.METADATA, message, false);
>         }
>     }
>     
>@@ -499,9 +499,9 @@ public class MetadataProcessor {
>      */
>     protected void logThrowable(Throwable exception) {
>         if (m_session == null) {
>-            AbstractSessionLog.getLog().logThrowable(SessionLog.FINER, SessionLog.EJB_OR_METADATA, exception);
>+            AbstractSessionLog.getLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, exception);
>         } else {
>-            m_session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.EJB_OR_METADATA, exception);
>+            m_session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, exception);
>         }
>     }
>     
>diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java
>index 474dbcc..b748a4c 100644
>--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java
>+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/jpa/metadata/XMLMetadataSource.java
>@@ -185,7 +185,7 @@ public class XMLMetadataSource extends MetadataSourceAdapter {
>             if (fileURLs.hasMoreElements()) {
>                 // Switched to warning, same file can be on the classpath twice in some deployments,
>                 // should not be an error.
>-                log.logThrowable(SessionLog.FINER, SessionLog.EJB_OR_METADATA, ValidationException.nonUniqueRepositoryFileName(fileName));
>+                log.logThrowable(SessionLog.FINER, SessionLog.METADATA, ValidationException.nonUniqueRepositoryFileName(fileName));
>             }
>             return nextURL;
>         } else {
>-- 
>1.7.10.msysgit.1
>

Actions: View | Diff

Attachments on bug 387614: 220063 | 220064 | 220066 | 220356 | 220357