Author: andygumbrecht
Date: Mon Jul 7 12:36:31 2014
New Revision: 1608430
URL: http://svn.apache.org/r1608430
Log:
Merged revision(s) 1608271-1608402 from tomee/tomee/trunk:
this code was great for JpaTest but is totally broken for the container itself,
removing it
........
TOMEE-1266 password can be null now with tomcat pool
........
Modified:
tomee/tomee/branches/tomee-1.7.x/ (props changed)
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
Propchange: tomee/tomee/branches/tomee-1.7.x/
------------------------------------------------------------------------------
Merged /tomee/tomee/trunk:r1608271-1608402
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1608430&r1=1608429&r2=1608430&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Mon Jul 7 12:36:31 2014
@@ -2700,21 +2700,6 @@ public class Assembler extends Assembler
}
private static class PersistenceClassLoaderHandlerImpl implements
PersistenceClassLoaderHandler {
- static {
- final boolean hack =
"true".equalsIgnoreCase(System.getProperty("openejb.openjpa.canRedefine",
"false"));
- if (!hack) {
- try { // hack for java 7 (was fine before)
- final Class<?> classRedefinerClass =
ParentClassLoaderFinder.Helper.get().loadClass("org.apache.openjpa.enhance.ClassRedefiner");
- final Field field =
classRedefinerClass.getDeclaredField("_canRedefine");
- field.setAccessible(true);
- field.set(null, Boolean.FALSE);
- } catch (final Throwable e) {
- // use JUL and not openejb Logger
-
java.util.logging.Logger.getLogger(PersistenceClassLoaderHandlerImpl.class.getName()).log(Level.SEVERE,
e.getMessage(), e);
- }
- }
- }
-
private static final AtomicBoolean logged = new AtomicBoolean(false);
private final Map<String, List<ClassFileTransformer>> transformers =
new TreeMap<String, List<ClassFileTransformer>>();
Modified:
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1608430&r1=1608429&r2=1608430&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
Mon Jul 7 12:36:31 2014
@@ -170,10 +170,6 @@ public class TomEEDataSourceCreator exte
}
}
- if (!converted.containsKey("password")) {
- converted.setProperty("password", "");
- }
-
final String currentUrl = converted.getProperty("url");
if (currentUrl != null) {
try {
