[pal-cvs 3262] [996] java 6 support

svnno****@sourc***** svnno****@sourc*****
2008年 6月 25日 (水) 16:20:28 JST


Revision: 996
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=996
Author:   sone
Date:     2008-06-25 16:20:27 +0900 (Wed, 25 Jun 2008)

Log Message:
-----------
java 6 support

Modified Paths:
--------------
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties


-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java	2008-06-25 06:33:34 UTC (rev 995)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java	2008-06-25 07:20:27 UTC (rev 996)
@@ -469,7 +469,17 @@
         {
             this.jcd = jcd;
         }
-
+        public boolean isWrapperFor(Class<?> iface) throws SQLException
+        {
+            return false;
+            // #ifdef JDBC4 return getConnection().isWrapperFor(iface);
+        }
+        
+        <T> T unwrap(Class<T> iface) throws SQLException
+        {
+            throw new SQLException("PoolingDataSource is not a wrapper.");
+            // #ifdef JDBC4 return getConnection().unwrap(iface);
+        }
         /*
          * (non-Javadoc)
          * 

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties	2008-06-25 06:33:34 UTC (rev 995)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties	2008-06-25 07:20:27 UTC (rev 996)
@@ -64,8 +64,8 @@
 maven.xdoc.version = ${pom.currentVersion}
 
 # Maven Compilation Setting
-maven.compile.source=1.4
-maven.compile.target=1.4
+maven.compile.source=1.5
+maven.compile.target=1.5
 maven.compile.deprecation=on
 
 # Whether to skip tests.


pal-cvs メーリングリストの案内