Attachment #220357 for bug #387614

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

Lines 1061-1067 public class PersistenceUnitProperties { Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java (-1 / +1 lines)
1061	* @see SessionLog#CACHE	1061	* @see SessionLog#CACHE
1062	* @see SessionLog#PROPAGATION	1062	* @see SessionLog#PROPAGATION
1063	* @see SessionLog#SEQUENCING	1063	* @see SessionLog#SEQUENCING
1064	* @see SessionLog#EJB_OR_METADATA	1064	* @see SessionLog#METADATA
1065	* @see SessionLog#METAMODEL	1065	* @see SessionLog#METAMODEL
1066	* @see SessionLog#WEAVER	1066	* @see SessionLog#WEAVER
1067	* @see SessionLog#PROPERTIES	1067	* @see SessionLog#PROPERTIES

Lines 141-147 public class CachePolicy implements Cloneable, Serializable { Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/descriptors/CachePolicy.java (-1 / +1 lines)
141	// If the parent is isolated, then the child must also be isolated.	141	// If the parent is isolated, then the child must also be isolated.
142	if (!parentPolicy.isSharedIsolation()) {	142	if (!parentPolicy.isSharedIsolation()) {
143	if (!isIsolated() && (getCacheIsolation() != parentPolicy.getCacheIsolation())) {	143	if (!isIsolated() && (getCacheIsolation() != parentPolicy.getCacheIsolation())) {
144	session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, "overriding_cache_isolation",	144	session.log(SessionLog.WARNING, SessionLog.METADATA, "overriding_cache_isolation",
145	new Object[]{descriptorDescriptor.getAlias(),	145	new Object[]{descriptorDescriptor.getAlias(),
146	parentPolicy.getCacheIsolation(), descriptor.getAlias(),	146	parentPolicy.getCacheIsolation(), descriptor.getAlias(),
147	getCacheIsolation()});	147	getCacheIsolation()});

Lines 40-61 import org.eclipse.persistence.sessions.Session; Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/logging/SessionLog.java (-45 / +51 lines)
40	* <p>	40	* <p>
41	* In addition, EclipseLink categories used for logging name space are defined with the following String values:	41	* In addition, EclipseLink categories used for logging name space are defined with the following String values:
42	* <table>	42	* <table>
43	* <tr><td> </td><td>SQL</td> <td> </td><td>= "sql"</td></tr>	43	* <tr><td> </td><td>{@link #SQL}</td> <td> </td><td>= {@value #SQL}</td></tr>
44	* <tr><td> </td><td>TRANSACTION</td> <td> </td><td>= "transaction"</td></tr>	44	* <tr><td> </td><td>{@link #TRANSACTION}</td> <td> </td><td>= {@value #TRANSACTION}</td></tr>
45	* <tr><td> </td><td>EVENT</td> <td> </td><td>= "event"</td></tr>	45	* <tr><td> </td><td>{@link #EVENT}</td> <td> </td><td>= {@value #EVENT}</td></tr>
46	* <tr><td> </td><td>CONNECTION</td> <td> </td><td>= "connection"</td></tr>	46	* <tr><td> </td><td>{@link #CONNECTION}</td> <td> </td><td>= {@value #CONNECTION}</td></tr>
47	* <tr><td> </td><td>QUERY</td> <td> </td><td>= "query"</td></tr>	47	* <tr><td> </td><td>{@link #QUERY}</td> <td> </td><td>= {@value #QUERY}</td></tr>
48	* <tr><td> </td><td>CACHE</td> <td> </td><td>= "cache"</td></tr>	48	* <tr><td> </td><td>{@link #CACHE}</td> <td> </td><td>= {@value #CACHE}</td></tr>
49	* <tr><td> </td><td>PROPAGATION</td> <td> </td><td>= "propagation"</td></tr>	49	* <tr><td> </td><td>{@link #PROPAGATION}</td> <td> </td><td>= {@value #PROPAGATION}</td></tr>
50	* <tr><td> </td><td>SEQUENCING</td> <td> </td><td>= "sequencing"</td></tr>	50	* <tr><td> </td><td>{@link #SEQUENCING}</td> <td> </td><td>= {@value #SEQUENCING}</td></tr>
51	* <tr><td> </td><td>EJB</td> <td> </td><td>= "ejb"</td></tr>	51	* <tr><td> </td><td>{@link #EJB}</td> <td> </td><td>= {@value #EJB}</td></tr>
52	* <tr><td> </td><td>DMS</td> <td> </td><td>= "dms"</td></tr>	52	* <tr><td> </td><td>{@link #DMS}</td> <td> </td><td>= {@value #DMS}</td></tr>
53	* <tr><td> </td><td>EJB_OR_METADATA</td><td> </td><td>= "ejb_or_metadata"</td></tr>	53	* <tr><td> </td><td>{@link #METADATA}</td><td> </td><td>= {@value #METADATA} </td></tr>
54	* <tr><td> </td><td>METAMODEL</td><td> </td><td>= "metamodel"</td></tr>	54	* <tr><td> </td><td>{@link #METAMODEL}</td><td> </td><td>= {@value #METAMODEL}</td></tr>
55	* <tr><td> </td><td>WEAVER</td> <td> </td><td>= "weaver"</td></tr>	55	* <tr><td> </td><td>{@link #WEAVER}</td> <td> </td><td>= {@value #WEAVER}</td></tr>
56	* <tr><td> </td><td>PROPERTIES</td> <td> </td><td>= "properties"</td></tr>	56	* <tr><td> </td><td>{@link #PROPERTIES}</td> <td> </td><td>= {@value #PROPERTIES}</td></tr>
57	* <tr><td> </td><td>SERVER</td> <td> </td><td>= "server"</td></tr>	57	* <tr><td> </td><td>{@link #SERVER}</td> <td> </td><td>= {@value #SERVER}</td></tr>
58	* </table>	58	* </table>
		59	*
59	* @see AbstractSessionLog	60	* @see AbstractSessionLog
60	* @see SessionLogEntry	61	* @see SessionLogEntry
61	* @see Session	62	* @see Session
Lines 109-115 public interface SessionLog extends Cloneable { Link Here
109	public static final String JPA = "jpa";	110	public static final String JPA = "jpa";
110	public static final String EJB = "ejb";	111	public static final String EJB = "ejb";
111	public static final String DMS = "dms";	112	public static final String DMS = "dms";
112	public static final String EJB_OR_METADATA = "metadata";	113	public static final String METADATA = "metadata";
		114	/**
		115	* @deprecated use {@link #METADATA}
		116	*/
		117	@Deprecated
		118	public static final String EJB_OR_METADATA = METADATA;
113	public static final String METAMODEL = "metamodel";	119	public static final String METAMODEL = "metamodel";
114	public static final String WEAVER = "weaver";	120	public static final String WEAVER = "weaver";
115	public static final String PROPERTIES = "properties";	121	public static final String PROPERTIES = "properties";
Lines 117-123 public interface SessionLog extends Cloneable { Link Here
117	public static final String DDL = "ddl";	123	public static final String DDL = "ddl";
118	public static final String JPARS = "jpars";	124	public static final String JPARS = "jpars";
119		125
120	public final String[] loggerCatagories = new String[] { SQL ,TRANSACTION ,EVENT ,CONNECTION ,QUERY ,CACHE ,PROPAGATION ,SEQUENCING ,EJB ,DMS ,EJB_OR_METADATA, METAMODEL, WEAVER ,PROPERTIES ,SERVER, JPARS};	126	public final String[] loggerCatagories = new String[] { SQL ,TRANSACTION ,EVENT ,CONNECTION ,QUERY ,CACHE ,PROPAGATION ,SEQUENCING ,EJB ,DMS ,METADATA, METAMODEL, WEAVER ,PROPERTIES ,SERVER, JPARS};
121		127
122	/**	128	/**
123	* PUBLIC:	129	* PUBLIC:
Lines 214-228 public interface SessionLog extends Cloneable { Link Here
214	* <p>	220	* <p>
215	* The EclipseLink logging levels returned correspond to:<br>	221	* The EclipseLink logging levels returned correspond to:<br>
216	* <table>	222	* <table>
217	* <tr><td>ALL</td> <td> </td><td>= 0</td></tr>	223	* <tr><td>{@link #ALL}</td> <td> </td><td>= {@value #ALL}</td>
218	* <tr><td>FINEST</td> <td> </td><td>= 1</td></tr>	224	* <tr><td>{@link #FINEST}</td> <td> </td><td>= {@value #FINEST}</td>
219	* <tr><td>FINER</td> <td> </td><td>= 2</td></tr>	225	* <tr><td>{@link #FINER}</td> <td> </td><td>= {@value #FINER}</td>
220	* <tr><td>FINE</td> <td> </td><td>= 3</td></tr>	226	* <tr><td>{@link #FINE}</td> <td> </td><td>= {@value #FINE}</td>
221	* <tr><td>CONFIG</td> <td> </td><td>= 4</td></tr>	227	* <tr><td>{@link #CONFIG}</td> <td> </td><td>= {@value #CONFIG}</td>
222	* <tr><td>INFO</td> <td> </td><td>= 5</td></tr>	228	* <tr><td>{@link #INFO}</td> <td> </td><td>= {@value #INFO}</td>
223	* <tr><td>WARNING</td><td> </td><td>= 6</td></tr>	229	* <tr><td>{@link #WARNING}</td><td> </td><td>= {@value #WARNING}</td>
224	* <tr><td>SEVERE</td> <td> </td><td>= 7</td></tr>	230	* <tr><td>{@link #SEVERE}</td> <td> </td><td>= {@value #SEVERE}</td>
225	* <tr><td>OFF</td> <td> </td><td>= 8</td></tr>	231	* <tr><td>{@link #OFF}</td> <td> </td><td>= {@value #OFF}</td>
226	* </table>	232	* </table>
227	*/	233	*/
228	public int getLevel();	234	public int getLevel();
Lines 699-717 public interface SessionLog extends Cloneable { Link Here
699		705
700	/**	706	/**
701	* PUBLIC:	707	* PUBLIC:
702	* Log a throwable with level.	708	* Log a {@link Throwable} with level.
703	* <p>	709	* <p>
704	* The EclipseLink logging levels available are:<br>	710	* The EclipseLink logging levels available are:<br>
705	* <table>	711	* <table>
706	* <tr><td>ALL</td> <td> </td><td>= 0</td>	712	* <tr><td>{@link #ALL}</td> <td> </td><td>= {@value #ALL}</td>
707	* <tr><td>FINEST</td> <td> </td><td>= 1</td>	713	* <tr><td>{@link #FINEST}</td> <td> </td><td>= {@value #FINEST}</td>
708	* <tr><td>FINER</td> <td> </td><td>= 2</td>	714	* <tr><td>{@link #FINER}</td> <td> </td><td>= {@value #FINER}</td>
709	* <tr><td>FINE</td> <td> </td><td>= 3</td>	715	* <tr><td>{@link #FINE}</td> <td> </td><td>= {@value #FINE}</td>
710	* <tr><td>CONFIG</td> <td> </td><td>= 4</td>	716	* <tr><td>{@link #CONFIG}</td> <td> </td><td>= {@value #CONFIG}</td>
711	* <tr><td>INFO</td> <td> </td><td>= 5</td>	717	* <tr><td>{@link #INFO}</td> <td> </td><td>= {@value #INFO}</td>
712	* <tr><td>WARNING</td><td> </td><td>= 6</td>	718	* <tr><td>{@link #WARNING}</td><td> </td><td>= {@value #WARNING}</td>
713	* <tr><td>SEVERE</td> <td> </td><td>= 7</td>	719	* <tr><td>{@link #SEVERE}</td> <td> </td><td>= {@value #SEVERE}</td>
714	* <tr><td>OFF</td> <td> </td><td>= 8</td>	720	* <tr><td>{@link #OFF}</td> <td> </td><td>= {@value #OFF}</td>
715	* </table>	721	* </table>
716	*/	722	*/
717	public void logThrowable(int level, Throwable throwable);	723	public void logThrowable(int level, Throwable throwable);
Lines 722-736 public interface SessionLog extends Cloneable { Link Here
722	* <p>	728	* <p>
723	* The EclipseLink logging levels available are:<br>	729	* The EclipseLink logging levels available are:<br>
724	* <table>	730	* <table>
725	* <tr><td>ALL</td> <td> </td><td>= 0</td>	731	* <tr><td>{@link #ALL}</td> <td> </td><td>= {@value #ALL}</td>
726	* <tr><td>FINEST</td> <td> </td><td>= 1</td>	732	* <tr><td>{@link #FINEST}</td> <td> </td><td>= {@value #FINEST}</td>
727	* <tr><td>FINER</td> <td> </td><td>= 2</td>	733	* <tr><td>{@link #FINER}</td> <td> </td><td>= {@value #FINER}</td>
728	* <tr><td>FINE</td> <td> </td><td>= 3</td>	734	* <tr><td>{@link #FINE}</td> <td> </td><td>= {@value #FINE}</td>
729	* <tr><td>CONFIG</td> <td> </td><td>= 4</td>	735	* <tr><td>{@link #CONFIG}</td> <td> </td><td>= {@value #CONFIG}</td>
730	* <tr><td>INFO</td> <td> </td><td>= 5</td>	736	* <tr><td>{@link #INFO}</td> <td> </td><td>= {@value #INFO}</td>
731	* <tr><td>WARNING</td><td> </td><td>= 6</td>	737	* <tr><td>{@link #WARNING}</td><td> </td><td>= {@value #WARNING}</td>
732	* <tr><td>SEVERE</td> <td> </td><td>= 7</td>	738	* <tr><td>{@link #SEVERE}</td> <td> </td><td>= {@value #SEVERE}</td>
733	* <tr><td>OFF</td> <td> </td><td>= 8</td>	739	* <tr><td>{@link #OFF}</td> <td> </td><td>= {@value #OFF}</td>
734	* </table>	740	* </table>
735	*/	741	*/
736	public void logThrowable(int level, String category, Throwable throwable);	742	public void logThrowable(int level, String category, Throwable throwable);

Lines 1268-1274 public class AggregateObjectMapping extends AggregateMapping implements Relation Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/AggregateObjectMapping.java (-1 / +1 lines)
1268	if (isNullAllowed) {	1268	if (isNullAllowed) {
1269	if (getReferenceDescriptor().hasTargetForeignKeyMapping(session)) {	1269	if (getReferenceDescriptor().hasTargetForeignKeyMapping(session)) {
1270	isNullAllowed = false;	1270	isNullAllowed = false;
1271	session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, "metadata_warning_ignore_is_null_allowed", new Object[]{this});	1271	session.log(SessionLog.WARNING, SessionLog.METADATA, "metadata_warning_ignore_is_null_allowed", new Object[]{this});
1272	}	1272	}
1273	}	1273	}
1274		1274

Lines 1965-1971 public abstract class ForeignReferenceMapping extends DatabaseMapping { Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ForeignReferenceMapping.java (-1 / +1 lines)
1965	Object[] args = new Object[2];	1965	Object[] args = new Object[2];
1966	args[0] = getAttributeName();	1966	args[0] = getAttributeName();
1967	args[1] = getDescriptor().getJavaClass();	1967	args[1] = getDescriptor().getJavaClass();
1968	session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, "metadata_warning_ignore_lazy", args);	1968	session.log(SessionLog.WARNING, SessionLog.METADATA, "metadata_warning_ignore_lazy", args);
1969	setIndirectionPolicy(new NoIndirectionPolicy());	1969	setIndirectionPolicy(new NoIndirectionPolicy());
1970	}	1970	}
1971		1971

Lines 797-803 public class DefaultTableGenerator { Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/DefaultTableGenerator.java (-1 / +1 lines)
797		797
798	if ((fieldType == null) \|\| (!fieldType.isPrimitive() && (fieldTypeDef == null))) {	798	if ((fieldType == null) \|\| (!fieldType.isPrimitive() && (fieldTypeDef == null))) {
799	//TODO: log a warning for inaccessible type or not convertable type.	799	//TODO: log a warning for inaccessible type or not convertable type.
800	AbstractSessionLog.getLog().log(SessionLog.CONFIG, SessionLog.EJB_OR_METADATA, "field_type_set_to_java_lang_string", dbField.getQualifiedName(), fieldType);	800	AbstractSessionLog.getLog().log(SessionLog.CONFIG, SessionLog.METADATA, "field_type_set_to_java_lang_string", dbField.getQualifiedName(), fieldType);
801		801
802	//set the default type (lang.String) to all un-resolved java type, like null, Number, util.Date, NChar/NType, Calendar	802	//set the default type (lang.String) to all un-resolved java type, like null, Number, util.Date, NChar/NType, Calendar
803	//sql.Blob/Clob, Object, or unknown type). Please refer to bug 4352820.	803	//sql.Blob/Clob, Object, or unknown type). Please refer to bug 4352820.

Lines 61-67 public class EntityManagerFactoryProvider { Link Here

(-)a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java (-1 / +3 lines)
61	{PersistenceUnitProperties.JDBC_DRIVER ,"eclipselink.jdbc.driver"},	61	{PersistenceUnitProperties.JDBC_DRIVER ,"eclipselink.jdbc.driver"},
62	{PersistenceUnitProperties.JDBC_URL , "eclipselink.jdbc.url"},	62	{PersistenceUnitProperties.JDBC_URL , "eclipselink.jdbc.url"},
63	{PersistenceUnitProperties.JDBC_PASSWORD , "eclipselink.jdbc.password"},	63	{PersistenceUnitProperties.JDBC_PASSWORD , "eclipselink.jdbc.password"},
64	{PersistenceUnitProperties.WEAVING , "persistence.tools.weaving"}	64	{PersistenceUnitProperties.WEAVING , "persistence.tools.weaving"},
		65	{PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METAMODEL, PersistenceUnitProperties.LOGGING_LEVEL + ".jpa_" + SessionLog.METAMODEL},
		66	{PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METADATA, PersistenceUnitProperties.LOGGING_LEVEL + ".ejb_or_" + SessionLog.METADATA}
65	};	67	};
66		68
67	/**	69	/**

Lines 385-391 public class MetadataLogger { Link Here

(-)a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataLogger.java (-1 / +1 lines)
385	* Logging utility method.	385	* Logging utility method.
386	*/	386	*/
387	public void log(int level, String ctx, Object[] params) {	387	public void log(int level, String ctx, Object[] params) {
388	m_session.log(level, SessionLog.EJB_OR_METADATA, getLoggingContextString(ctx), params);	388	m_session.log(level, SessionLog.METADATA, getLoggingContextString(ctx), params);
389	}	389	}
390		390
391	/**	391	/**




            // 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.METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
        } else if (!throwException) {
            // fail quietly
            m_session.log(SessionLog.WARNING, SessionLog.METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
        } else {
            // fail loudly
            m_session.handleException(e);

     */
    protected void logMessage(String message) {
        if (m_session == null) {
            AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.METADATA, message, null, false);
        } else {
            m_session.log(SessionLog.FINER, SessionLog.METADATA, message, false);
        }
    }
    

     */
    protected void logThrowable(Throwable exception) {
        if (m_session == null) {
            AbstractSessionLog.getLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, exception);
        } else {
            m_session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, exception);
        }
    }
    
- 

Return to bug 387614

Lines 226-235 public class MetadataProcessor { Link Here

(-)a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataProcessor.java (-7 / +6 lines)
226	// to properly handle the exception. As a result we log an error.	226	// to properly handle the exception. As a result we log an error.
227	// The same code will be called later in the bootstrapping code	227	// The same code will be called later in the bootstrapping code
228	// and the error will be handled then.	228	// and the error will be handled then.
229	AbstractSessionLog.getLog().log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});	229	AbstractSessionLog.getLog().log(SessionLog.WARNING, SessionLog.METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
230	} else if (!throwException) {	230	} else if (!throwException) {
231	// fail quietly	231	// fail quietly
232	m_session.log(SessionLog.WARNING, SessionLog.EJB_OR_METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});	232	m_session.log(SessionLog.WARNING, SessionLog.METADATA, EntityManagerSetupImpl.ERROR_LOADING_XML_FILE, new Object[] {mappingFile, e});
233	} else {	233	} else {
234	// fail loudly	234	// fail loudly
235	m_session.handleException(e);	235	m_session.handleException(e);
Lines 446-454 public class MetadataProcessor { Link Here
446	*/	446	*/
447	protected void logMessage(String message) {	447	protected void logMessage(String message) {
448	if (m_session == null) {	448	if (m_session == null) {
449	AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.EJB_OR_METADATA, message, null, false);	449	AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.METADATA, message, null, false);
450	} else {	450	} else {
451	m_session.log(SessionLog.FINER, SessionLog.EJB_OR_METADATA, message, false);	451	m_session.log(SessionLog.FINER, SessionLog.METADATA, message, false);
452	}	452	}
453	}	453	}
454		454
Lines 459-467 public class MetadataProcessor { Link Here
459	*/	459	*/
460	protected void logThrowable(Throwable exception) {	460	protected void logThrowable(Throwable exception) {
461	if (m_session == null) {	461	if (m_session == null) {
462	AbstractSessionLog.getLog().logThrowable(SessionLog.FINER, SessionLog.EJB_OR_METADATA, exception);	462	AbstractSessionLog.getLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, exception);
463	} else {	463	} else {
464	m_session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.EJB_OR_METADATA, exception);	464	m_session.getSessionLog().logThrowable(SessionLog.FINER, SessionLog.METADATA, exception);
465	}	465	}
466	}	466	}
467		467
468	-