diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java
index 38064090a3..90196372b0 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java
@@ -1,106 +1,105 @@
-/*
- * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
- */
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009-2011, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
 package org.hibernate.ejb.util;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import javax.persistence.FlushModeType;
-import javax.persistence.PersistenceException;
-import org.hibernate.AssertionFailure;
-import org.hibernate.CacheMode;
-import org.hibernate.FlushMode;
-
-/**
- * @author Emmanuel Bernard
- */
-public abstract class ConfigurationHelper {
-	public static void overrideProperties(Properties properties, Map overrides) {
-		for ( Map.Entry entry : (Set<Map.Entry>) overrides.entrySet() ) {
-			if ( entry.getKey() instanceof String && entry.getValue() instanceof String ) {
-				properties.setProperty( (String) entry.getKey(), (String) entry.getValue() );
-			}
-		}
-	}
-
-	public static FlushMode getFlushMode(Object value) {
-		FlushMode flushMode = null;
-		if (value instanceof FlushMode) {
-			flushMode = (FlushMode) value;
-		}
-		else if (value instanceof javax.persistence.FlushModeType) {
-			flushMode = ConfigurationHelper.getFlushMode( (javax.persistence.FlushModeType) value);
-		}
-		else if (value instanceof String) {
-			flushMode = ConfigurationHelper.getFlushMode( (String) value);
-		}
-		if (flushMode == null) {
-			throw new PersistenceException("Unable to parse org.hibernate.flushMode: " + value);
-		}
-		return flushMode;
-	}
-
-	private static FlushMode getFlushMode(String flushMode)  {
-		if (flushMode == null) {
-			return null;
-		}
-		flushMode = flushMode.toUpperCase();
-		return FlushMode.parse( flushMode );
-	}
-
-	private static FlushMode getFlushMode(FlushModeType flushMode)  {
-		switch(flushMode) {
-			case AUTO:
-				return FlushMode.AUTO;
-			case COMMIT:
-				return FlushMode.COMMIT;
-			default:
-				throw new AssertionFailure("Unknown FlushModeType: " + flushMode);
-		}
-	}
-
-	public static Integer getInteger(Object value) {
-		if ( value instanceof Integer ) {
-			return (Integer) value;
-		}
-		else {
-			return Integer.valueOf( (String) value );
-		}
-	}
-
-	public static Boolean getBoolean(Object value) {
-		if ( value instanceof Boolean ) {
-			return (Boolean) value;
-		}
-		else {
-			return Boolean.valueOf( (String) value );
-		}
-	}
-
-	public static CacheMode getCacheMode(Object value) {
-		if ( value instanceof CacheMode ) {
-			return (CacheMode) value;
-		}
-		else {
-			return CacheMode.parse( (String) value );
-		}
-	}
-}
+
+import javax.persistence.FlushModeType;
+import javax.persistence.PersistenceException;
+import java.util.Map;
+import java.util.Properties;
+
+import org.hibernate.AssertionFailure;
+import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public abstract class ConfigurationHelper {
+	public static void overrideProperties(Properties properties, Map overrides) {
+		properties.putAll( overrides );
+	}
+
+	public static FlushMode getFlushMode(Object value) {
+		FlushMode flushMode = null;
+		if (value instanceof FlushMode) {
+			flushMode = (FlushMode) value;
+		}
+		else if (value instanceof javax.persistence.FlushModeType) {
+			flushMode = ConfigurationHelper.getFlushMode( (javax.persistence.FlushModeType) value);
+		}
+		else if (value instanceof String) {
+			flushMode = ConfigurationHelper.getFlushMode( (String) value);
+		}
+		if (flushMode == null) {
+			throw new PersistenceException("Unable to parse org.hibernate.flushMode: " + value);
+		}
+		return flushMode;
+	}
+
+	private static FlushMode getFlushMode(String flushMode)  {
+		if (flushMode == null) {
+			return null;
+		}
+		flushMode = flushMode.toUpperCase();
+		return FlushMode.parse( flushMode );
+	}
+
+	private static FlushMode getFlushMode(FlushModeType flushMode)  {
+		switch(flushMode) {
+			case AUTO:
+				return FlushMode.AUTO;
+			case COMMIT:
+				return FlushMode.COMMIT;
+			default:
+				throw new AssertionFailure("Unknown FlushModeType: " + flushMode);
+		}
+	}
+
+	public static Integer getInteger(Object value) {
+		if ( value instanceof Integer ) {
+			return (Integer) value;
+		}
+		else {
+			return Integer.valueOf( (String) value );
+		}
+	}
+
+	public static Boolean getBoolean(Object value) {
+		if ( value instanceof Boolean ) {
+			return (Boolean) value;
+		}
+		else {
+			return Boolean.valueOf( (String) value );
+		}
+	}
+
+	public static CacheMode getCacheMode(Object value) {
+		if ( value instanceof CacheMode ) {
+			return (CacheMode) value;
+		}
+		else {
+			return CacheMode.parse( (String) value );
+		}
+	}
+}