svn commit: r1594374 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/config/ tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/

[jlmonteiro]

Author: jlmonteiro
Date: Tue May 13 20:32:06 2014
New Revision: 1594374

URL: http://svn.apache.org/r1594374
Log:
Fix compilation issues and logger level

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
    
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1594374&r1=1594373&r2=1594374&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Tue May 13 20:32:06 2014
@@ -2170,21 +2170,21 @@ public class AutoConfig implements Dynam
 
         public void dump() {
             for (final String s : resourceAdapterIds) {
-                logger.warning(appId + " module contains resource adapter id: 
" + s);
+                logger.debug(appId + " module contains resource adapter id: " 
+ s);
             }
             for (final String s : resourceIdsByType.keySet()) {
                 for (final String value : resourceIdsByType.get(s)) {
-                    logger.warning(appId + " module contains resource type: " 
+ s + " --> " + value);
+                    logger.debug(appId + " module contains resource type: " + 
s + " --> " + value);
                 }
             }
             for (final String s : resourceEnvIdsByType.keySet()) {
                 for (final String value : resourceEnvIdsByType.get(s)) {
-                    logger.warning(appId + " module contains resource env 
type: " + s + " --> " + value);
+                    logger.debug(appId + " module contains resource env type: 
" + s + " --> " + value);
                 }
             }
             for (final String s : containerIdsByType.keySet()) {
                 for (final String value : containerIdsByType.get(s)) {
-                    logger.warning(appId + " module contains container type: " 
+ s + " --> " + value);
+                    logger.debug(appId + " module contains container type: " + 
s + " --> " + value);
                 }
             }
         }

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1594374&r1=1594373&r2=1594374&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Tue May 13 20:32:06 2014
@@ -1409,7 +1409,7 @@ public class ConfigurationFactory implem
         final OpenEjbConfiguration runningConfig = getRunningConfig();
         if (runningConfig != null) {
             for (final ResourceInfo resourceInfo : 
runningConfig.facilities.resources) {
-                logger.warning(String.format("Trying to match resource type %s 
with classname %s, service %s.", type, resourceInfo.className, 
resourceInfo.service));
+                logger.debug(String.format("Trying to match resource type %s 
with classname %s, service %s.", type, resourceInfo.className, 
resourceInfo.service));
                 if ((type != null && type.equals(resourceInfo.className) || 
isResourceType(resourceInfo.service, resourceInfo.types, type)) && 
implies(required, resourceInfo.properties)) {
                     resourceIds.add(resourceInfo.id);
                     resourceIds.addAll(resourceInfo.aliases);

Modified: 
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1594374&r1=1594373&r2=1594374&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 Tue May 13 20:32:06 2014
@@ -18,8 +18,8 @@ package org.apache.tomee.jdbc;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.openejb.cipher.Ciphers;
 import org.apache.openejb.cipher.PasswordCipher;
+import org.apache.openejb.cipher.PasswordCipherFactory;
 import org.apache.openejb.monitoring.LocalMBeanServer;
 import org.apache.openejb.monitoring.ObjectNameBuilder;
 import org.apache.openejb.resource.jdbc.BasicDataSourceUtil;
@@ -129,7 +129,7 @@ public class TomEEDataSourceCreator exte
         } else {
             String password = properties.getProperty("Password");
             if (passwordCipher != null) {
-                final PasswordCipher cipher = 
Ciphers.getPasswordCipher(passwordCipher);
+                final PasswordCipher cipher = 
PasswordCipherFactory.getPasswordCipher(passwordCipher);
                 final String plainPwd = cipher.decrypt(password.toCharArray());
                 converted.setProperty("password", plainPwd);