You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/03/05 22:28:03 UTC
svn commit: r1574671 - in /myfaces/orchestra/trunk/core22/src:
main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java
test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java
Author: lu4242
Date: Wed Mar 5 21:28:02 2014
New Revision: 1574671
URL: http://svn.apache.org/r1574671
Log:
small bug fixes
Modified:
myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java
myfaces/orchestra/trunk/core22/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java
Modified: myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java?rev=1574671&r1=1574670&r2=1574671&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java (original)
+++ myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java Wed Mar 5 21:28:02 2014
@@ -25,8 +25,10 @@ import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.HashSet;
import java.util.Set;
+import java.util.logging.Logger;
/**
* Manage all borrowed connections and hand out
@@ -267,4 +269,10 @@ public class ConnectionManagerDataSource
}
*/
}
+
+ @Override
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ return getDataSource().getParentLogger();
+ }
}
Modified: myfaces/orchestra/trunk/core22/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java?rev=1574671&r1=1574670&r2=1574671&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java (original)
+++ myfaces/orchestra/trunk/core22/src/test/java/org/apache/myfaces/orchestra/lib/jsf/TestSerializableConverter.java Wed Mar 5 21:28:02 2014
@@ -26,7 +26,7 @@ import javax.faces.el.VariableResolver;
import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
import org.apache.myfaces.orchestra.frameworkAdapter.local.LocalFrameworkAdapter;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
import org.springframework.web.jsf.DelegatingVariableResolver;