[148644] trunk/dports/devel/play

[g5pw at macports.org]

Revision: 148644
          https://trac.macports.org/changeset/148644
Author:   g5pw at macports.org
Date:     2016-05-13 02:16:17 -0700 (Fri, 13 May 2016)
Log Message:
-----------
devel/play: remove upstream-included patchfile

Modified Paths:
--------------
    trunk/dports/devel/play/Portfile

Removed Paths:
-------------
    trunk/dports/devel/play/files/patch-framework-src-play-db-DBPlugin.java.diff

Modified: trunk/dports/devel/play/Portfile
===================================================================
--- trunk/dports/devel/play/Portfile	2016-05-13 08:46:57 UTC (rev 148643)
+++ trunk/dports/devel/play/Portfile	2016-05-13 09:16:17 UTC (rev 148644)
@@ -41,8 +41,7 @@
     delete ${worksrcpath}/play.bat ${worksrcpath}/python
 }
 
-patchfiles          patch-framework-build.xml.diff \
-                    patch-framework-src-play-db-DBPlugin.java.diff
+patchfiles          patch-framework-build.xml.diff
 
 post-patch {
     reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|" ${worksrcpath}/play

Deleted: trunk/dports/devel/play/files/patch-framework-src-play-db-DBPlugin.java.diff
===================================================================
--- trunk/dports/devel/play/files/patch-framework-src-play-db-DBPlugin.java.diff	2016-05-13 08:46:57 UTC (rev 148643)
+++ trunk/dports/devel/play/files/patch-framework-src-play-db-DBPlugin.java.diff	2016-05-13 09:16:17 UTC (rev 148644)
@@ -1,40 +0,0 @@
---- framework/src/play/db/DBPlugin.java.orig	2013-08-06 13:31:31.000000000 +0200
-+++ framework/src/play/db/DBPlugin.java	2013-08-23 22:11:26.000000000 +0200
-@@ -11,15 +11,19 @@
- import java.sql.DriverManager;
- import java.sql.DriverPropertyInfo;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.HashMap;
- import java.util.Map;
- import java.util.Properties;
-+
- import javax.naming.Context;
- import javax.naming.InitialContext;
- import javax.sql.DataSource;
- 
- import jregex.Matcher;
-+
- import org.apache.commons.lang.StringUtils;
-+
- import play.Logger;
- import play.Play;
- import play.PlayPlugin;
-@@ -338,6 +342,17 @@
-         public boolean jdbcCompliant() {
-             return this.driver.jdbcCompliant();
-         }
-+      
-+        // Method not annotated with @Override since getParentLogger() is a new method
-+        // in the CommonDataSource interface starting with JDK7 and this annotation
-+        // would cause compilation errors with JDK6.
-+        public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+            try {
-+                return (java.util.logging.Logger) Driver.class.getDeclaredMethod("getParentLogger").invoke(this.driver);
-+            } catch (Throwable e) {
-+                return null;
-+            }
-+        }
-     }
- 
-     public static class PlayConnectionCustomizer implements ConnectionCustomizer {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160513/6c317cee/attachment.html>