[109996] trunk/dports/devel/play

[ciserlohn at macports.org]

Revision: 109996
          https://trac.macports.org/changeset/109996
Author:   ciserlohn at macports.org
Date:     2013-08-23 13:28:06 -0700 (Fri, 23 Aug 2013)
Log Message:
-----------
play: update to version 1.2.6

* Include patch to fix compilation issue with JDK 1.7
  (see https://github.com/playframework/play1/pull/614/files)

Modified Paths:
--------------
    trunk/dports/devel/play/Portfile
    trunk/dports/devel/play/files/patch-framework-build.xml.diff

Added 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	2013-08-23 17:20:54 UTC (rev 109995)
+++ trunk/dports/devel/play/Portfile	2013-08-23 20:28:06 UTC (rev 109996)
@@ -5,7 +5,7 @@
 
 name                play
 conflicts           sox
-version             1.2.5
+version             1.2.6
 categories          devel java www
 platforms           darwin
 license             Apache-2
@@ -27,21 +27,22 @@
 homepage            http://www.playframework.org/
 master_sites        https://github.com/playframework/play/tarball/${version}
 
-checksums           rmd160  52cd23a0029852e2f0d45318861e208c9c98ab1d \
-                    sha256  950e094fcb57d66c20a006a6c004e3b110f9b0affdbdc2f495f467c094895e43
+checksums           rmd160  3fc7179408971d506c15b3d43a62d1c21c484188 \
+                    sha256  2208a156deeb79417a3b1c8f30c28cc8144b81ea530764c771f60bce6ceb31d1
 
 depends_build       port:apache-ant
 
 depends_lib         port:python27
 
 post-extract {
-    file rename [glob ${workpath}/playframework-play-*] ${worksrcpath}
+    file rename [glob ${workpath}/playframework-play1-*] ${worksrcpath}
 
     # delete windows specific files
     delete ${worksrcpath}/play.bat ${worksrcpath}/python
 }
 
-patchfiles          patch-framework-build.xml.diff
+patchfiles          patch-framework-build.xml.diff \
+                    patch-framework-src-play-db-DBPlugin.java.diff
 
 post-patch {
     reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|" ${worksrcpath}/play

Modified: trunk/dports/devel/play/files/patch-framework-build.xml.diff
===================================================================
--- trunk/dports/devel/play/files/patch-framework-build.xml.diff	2013-08-23 17:20:54 UTC (rev 109995)
+++ trunk/dports/devel/play/files/patch-framework-build.xml.diff	2013-08-23 20:28:06 UTC (rev 109996)
@@ -5,7 +5,7 @@
  <project name="play! framework" default="jar" basedir=".">
  
 -    <property name="baseversion" value="1.2.x" />
-+    <property name="version" value="1.2.5" />
++    <property name="version" value="1.2.6" />
  
      <path id="project.classpath">
          <fileset dir=".">

Added: 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	                        (rev 0)
+++ trunk/dports/devel/play/files/patch-framework-src-play-db-DBPlugin.java.diff	2013-08-23 20:28:06 UTC (rev 109996)
@@ -0,0 +1,40 @@
+--- 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: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130823/0fa8512c/attachment.html>