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/04/09 13:38:15 UTC

svn commit: r1585941 - in /myfaces/orchestra/trunk: core/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java

Author: lu4242
Date: Wed Apr  9 11:38:15 2014
New Revision: 1585941

URL: http://svn.apache.org/r1585941
Log:
ORCHESTRA-66 DataSource has a new method getParentLogger() in java 7 that needs to be overriden (@Override annotation makes jdk 1.6 compiler fails)

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java
    myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java?rev=1585941&r1=1585940&r2=1585941&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/ConnectionManagerDataSource.java Wed Apr  9 11:38:15 2014
@@ -272,7 +272,6 @@ public class ConnectionManagerDataSource
         */
     }
 
-    @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException
     {
         // Use reflection for Java 6 and 7 compatibility

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=1585941&r1=1585940&r2=1585941&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 Apr  9 11:38:15 2014
@@ -272,7 +272,6 @@ public class ConnectionManagerDataSource
         */
     }
 
-    @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException
     {
         // Use reflection for Java 6 and 7 compatibility