<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" /> <base href="https://hibernate.atlassian.net" />
<title>Message Title</title>
</head>
<body class="jira" style="color: #333; font-family: Arial, sans-serif; font-size: 14px; line-height: 1.429">
<table id="background-table" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f5f5f5; border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<!-- header here -->
<tr>
<td id="header-pattern-container" style="padding: 0px; border-collapse: collapse; padding: 10px 20px">
<table id="header-pattern" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="header-avatar-image-container" valign="top" style="padding: 0px; border-collapse: collapse; vertical-align: top; width: 32px; padding-right: 8px"> <img id="header-avatar-image" class="image_fix" src="https://secure.gravatar.com/avatar/d169263c0567ba465a7a1c4db71a9032?d=mm&s=48" height="32" width="32" border="0" style="border-radius: 3px; vertical-align: top" />
</td>
<td id="header-text-container" valign="middle" style="padding: 0px; border-collapse: collapse; vertical-align: middle; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px"> <a class="user-hover" rel="bogdan.vasile" id="email_bogdan.vasile" href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?name=bogdan.vasile" style="color:#6c797f;; color: #3b73af; text-decoration: none">Bogdan Vasile</a> <strong>commented</strong> on <a href="https://hibernate.atlassian.net/browse/HHH-4193" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-avatar-eff2d8aa-aee5-4609-9154-1ef6f3d0b2e9" height="16" width="16" border="0" align="absmiddle" alt="New Feature" /> HHH-4193</a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="email-content-container" style="padding: 0px; border-collapse: collapse; padding: 0 20px">
<table id="email-content-table" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-spacing: 0; border-collapse: separate">
<tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<td class="email-content-rounded-top mobile-expand" style="padding: 0px; border-collapse: collapse; color: #fff; padding: 0 15px 0 16px; height: 15px; background-color: #fff; border-left: 1px solid #ccc; border-top: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 0; border-top-right-radius: 5px; border-top-left-radius: 5px; height: 10px; line-height: 10px; padding: 0 15px 0 16px; mso-line-height-rule: exactly">
</td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff">
<table class="page-title-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td style="vertical-align: top;; padding: 0px; border-collapse: collapse; padding-right: 5px; font-size: 20px; line-height: 30px; mso-line-height-rule: exactly" class="page-title-pattern-header-container"> <span class="page-title-pattern-header" style="font-family: Arial, sans-serif; padding: 0; font-size: 20px; line-height: 30px; mso-text-raise: 2px; mso-line-height-rule: exactly; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-4193" style="color: #3b73af; text-decoration: none">Re: Allow to configure entity manager with specific persistence.xml</a> </span>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="text-paragraph-pattern-top" class="email-content-main mobile-expand comment-top-pattern" style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff; border-bottom: none; padding-bottom: 0">
<table class="text-paragraph-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 2px">
<tr>
<td class="text-paragraph-pattern-container mobile-resize-text " style="padding: 0px; border-collapse: collapse; padding: 0 0 10px 0">
<p style="margin: 10px 0 0 0">Hi,</p>
<p style="margin: 10px 0 0 0">I think I solved this issue on my local PC, using Hibernate 4.3.11.Final as base code. The idea was to do something similar with what EclipseLink implemented with <a href="https://www.eclipse.org/eclipselink/api/2.4/org/eclipse/persistence/config/PersistenceUnitProperties.html#ECLIPSELINK_PERSISTENCE_XML" class="external-link" rel="nofollow" style="color: #3b73af; text-decoration: none">https://www.eclipse.org/eclipselink/api/2.4/org/eclipse/persistence/config/PersistenceUnitProperties.html#ECLIPSELINK_PERSISTENCE_XML</a></p>
<p style="margin: 10px 0 0 0">I added two extra properties in AvailableSettings:</p>
<p style="margin: 10px 0 0 0">String HIBERNATE_PERSISTENCE_XML = "org.hibernate.persistencexml";<br /> String HIBERNATE_PERSISTENCE_XML_DEFAULT = "META-INF/persistence.xml";</p>
<p style="margin: 10px 0 0 0">With this and some minimal modifications in PersistenceXmlParser, I was able to load multiple persistence.xml, or override the default location.<br /> If the custom property is not specified, all will work as before, with the entity manager trying to find persistence.xml in META-INF/persistence.xml </p>
<p style="margin: 10px 0 0 0">The problem is that I don't have the time to follow all the standard procedures required for implementing something new with GIT , Atlassian, so I would really appreciate it if I could send the 3 modified files to someone who already has an account. Also, I was not able to run the build tests for Hibernate, but I did use the modified version in my projects and it works as expected.</p>
<p style="margin: 10px 0 0 0">PS: Here is the modified code in PersistenceXmlParser:</p>
<p style="margin: 10px 0 0 0">.......</p>
<p style="margin: 10px 0 0 0"> public List<ParsedPersistenceXmlDescriptor> doResolve(Map integration) {<br /> final List<ParsedPersistenceXmlDescriptor> persistenceUnits = new ArrayList<ParsedPersistenceXmlDescriptor>();</p>
<p style="margin: 10px 0 0 0"> String resource = getResourceXmlLocation(integration);<br /> final List<URL> xmlUrls = classLoaderService.locateResources( resource );</p>
<p style="margin: 10px 0 0 0"> if ( xmlUrls.isEmpty() ) </p> { LOG.unableToFindPersistenceXmlInClasspath(resource); }
<p style="margin: 10px 0 0 0"> else {<br /> for ( URL xmlUrl : xmlUrls ) </p> { persistenceUnits.addAll( parsePersistenceXml( xmlUrl, integration ) ); }
<p style="margin: 10px 0 0 0"> }</p>
<p style="margin: 10px 0 0 0"> return persistenceUnits;<br /> }</p>
<p style="margin: 10px 0 0 0"> private String getResourceXmlLocation(Map integration){<br /> String resource = null;<br /> String key = AvailableSettings.HIBERNATE_PERSISTENCE_XML;</p>
<p style="margin: 10px 0 0 0"> if((integration != null) && integration.containsKey(key))</p> { resource = (String)integration.get(key); LOG.infof( "Using custom persistence.xml file : %s", resource ); }
<p style="margin: 10px 0 0 0"> if(resource == null)</p> { resource = AvailableSettings.HIBERNATE_PERSISTENCE_XML_DEFAULT; LOG.infof( "Using default persistence.xml file : %s", resource ); }
<p style="margin: 10px 0 0 0"> return resource;<br /> }</p>
<p style="margin: 10px 0 0 0"> private List<ParsedPersistenceXmlDescriptor> parsePersistenceXml(URL xmlUrl, Map integration) {<br /> LOG.tracef( "Attempting to parse persistence.xml file : %s", xmlUrl.toExternalForm() );</p>
<p style="margin: 10px 0 0 0"> final Document doc = loadUrl( xmlUrl );<br /> final Element top = doc.getDocumentElement();</p>
<p style="margin: 10px 0 0 0"> final List<ParsedPersistenceXmlDescriptor> persistenceUnits = new ArrayList<ParsedPersistenceXmlDescriptor>();</p>
<p style="margin: 10px 0 0 0"> final NodeList children = top.getChildNodes();<br /> for ( int i = 0; i < children.getLength() ; i++ ) {<br /> if ( children.item( i ).getNodeType() == Node.ELEMENT_NODE ) {<br /> final Element element = (Element) children.item( i );<br /> final String tag = element.getTagName();<br /> if ( tag.equals( "persistence-unit" ) ) {</p>
<p style="margin: 10px 0 0 0"> String resource = getResourceXmlLocation(integration);</p>
<p style="margin: 10px 0 0 0"> final URL puRootUrl = ArchiveHelper.getJarURLFromURLEntry( xmlUrl, resource );<br /> .....</p>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff">
<table id="actions-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px">
<tr>
<td id="actions-pattern-container" valign="middle" style="padding: 0px; border-collapse: collapse; padding: 10px 0 10px 24px; vertical-align: middle; padding-left: 0">
<table align="left" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td class="actions-pattern-action-icon-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 0px; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-4193#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none"> <img class="actions-pattern-action-icon-image" src="cid:jira-generated-image-static-comment-icon-424a478b-76de-4f9b-bae6-807870ab5c03" alt="Add Comment" title="Add Comment" height="16" width="16" border="0" style="vertical-align: middle" /> </a>
</td>
<td class="actions-pattern-action-text-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 4px; padding-left: 5px"> <a href="https://hibernate.atlassian.net/browse/HHH-4193#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none">Add Comment</a>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<tr>
<td class="email-content-rounded-bottom mobile-expand" style="padding: 0px; border-collapse: collapse; color: #fff; padding: 0 15px 0 16px; height: 5px; line-height: 5px; background-color: #fff; border-top: 0; border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; mso-line-height-rule: exactly">
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="footer-pattern" style="padding: 0px; border-collapse: collapse; padding: 12px 20px">
<table id="footer-pattern-container" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="footer-pattern-text" class="mobile-resize-text" width="100%" style="padding: 0px; border-collapse: collapse; color: #999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px">
This message was sent by Atlassian JIRA <span id="footer-build-information">(v7.0.0-OD-08-001#70107-<span title="255411850f5e4834156651adeabfcb6c2a6e4778" data-commit-id="255411850f5e4834156651adeabfcb6c2a6e4778}">sha1:2554118</span>)</span>
</td>
<td id="footer-pattern-logo-desktop-container" valign="top" style="padding: 0px; border-collapse: collapse; padding-left: 20px; vertical-align: top">
<table style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="footer-pattern-logo-desktop-padding" style="padding: 0px; border-collapse: collapse; padding-top: 3px"> <img id="footer-pattern-logo-desktop" src="cid:jira-generated-image-static-footer-desktop-logo-2cdeea15-0f10-4733-88d0-ddd60f5d1070" alt="Atlassian logo" title="Atlassian logo" width="169" height="36" class="image_fix" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>