|
From: <hib...@li...> - 2006-04-27 15:15:51
|
Author: epbernard
Date: 2006-04-27 11:15:44 -0400 (Thu, 27 Apr 2006)
New Revision: 9814
Modified:
trunk/HibernateExt/ejb/changelog.txt
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
Log:
version b
Modified: trunk/HibernateExt/ejb/changelog.txt
===================================================================
--- trunk/HibernateExt/ejb/changelog.txt 2006-04-27 15:15:03 UTC (rev 9813)
+++ trunk/HibernateExt/ejb/changelog.txt 2006-04-27 15:15:44 UTC (rev 9814)
@@ -1,10 +1,11 @@
Hibernate EntityManager Changelog
==================================
-3.1.0.Beta8 (26-04-2006)
-------------------------
+3.1.0.Beta8b (27-04-2006)
+-------------------------
** Bug
+ * [EJB-121] - FileZippedJarVisitor can not handle URL with white spaces in windows XP professional.
* [EJB-155] - assumes Map.Entry where string is returned
* [EJB-156] - Setting a transaction factory raise an assertion failure
* [EJB-166] - StaleObjectStaleException not wrapped into an optimisticLockException when merge is used
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-04-27 15:15:03 UTC (rev 9813)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-04-27 15:15:44 UTC (rev 9814)
@@ -76,6 +76,7 @@
private SettingsFactory settingsFactory;
private EventListenerConfigurator listenerConfigurator;
private PersistenceUnitTransactionType transactionType;
+ private static final String META_INF_ORM_XML = "META-INF/orm.xml";
public Ejb3Configuration() {
settingsFactory = new InjectionSettingsFactory();
@@ -258,6 +259,7 @@
List<String> packages = new ArrayList<String>();
List<String> xmlFiles = new ArrayList<String>( 50 );
if ( info.getMappingFileNames() != null ) xmlFiles.addAll( info.getMappingFileNames() );
+ if ( ! xmlFiles.contains( META_INF_ORM_XML ) ) xmlFiles.add( META_INF_ORM_XML );
// Object overridenTxType = integration.get( HibernatePersistence.TRANSACTION_TYPE );
// if (overridenTxType != null) {
// defineTransactionType( overridenTxType, info.getPersistenceUnitName() );
@@ -395,14 +397,14 @@
if ( result[1] ) {
filters[size - 1] = new JarVisitor.FileFilter( true ) {
public boolean accept(String javaElementName) {
- return javaElementName.endsWith( "hbm.xml" ) || javaElementName.endsWith( "META-INF/orm.xml" );
+ return javaElementName.endsWith( "hbm.xml" ) || javaElementName.endsWith( META_INF_ORM_XML );
}
};
}
else {
filters[size - 1] = new JarVisitor.FileFilter( true ) {
public boolean accept(String javaElementName) {
- return javaElementName.endsWith( "META-INF/orm.xml" );
+ return javaElementName.endsWith( META_INF_ORM_XML );
}
};
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-04-27 15:15:03 UTC (rev 9813)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-04-27 15:15:44 UTC (rev 9814)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static String VERSION = "3.1.0.Beta8";
+ public static String VERSION = "3.1.0.Beta8b";
private static Log log = LogFactory.getLog( Version.class );
static {
|