[jenkins] 12/22: jnr-posix-upgrade

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch patch-queue/master
in repository jenkins.

commit 70925a700a97a0b2184d308a993d60e5d06de0d5
Author: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Date:   Sun Aug 11 10:41:39 2013 +0100

    jnr-posix-upgrade
    
    
    Gbp-Pq-Topic: dependency-upgrades
---
 core/pom.xml                                     |    5 +++++
 core/src/main/java/hudson/os/PosixAPI.java       |    7 +++----
 core/src/main/java/hudson/os/PosixException.java |    8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 5b48543..a668216 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -118,6 +118,11 @@ THE SOFTWARE.
       <version>1.0.3</version>
     </dependency>
     <dependency>
+      <groupId>org.jruby.extras</groupId>
+      <artifactId>jffi</artifactId>
+      <version>0.6.5</version>
+    </dependency>
+    <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>trilead-putty-extension</artifactId>
       <version>1.2</version>
diff --git a/core/src/main/java/hudson/os/PosixAPI.java b/core/src/main/java/hudson/os/PosixAPI.java
index 1e893c1..db0aa7a 100644
--- a/core/src/main/java/hudson/os/PosixAPI.java
+++ b/core/src/main/java/hudson/os/PosixAPI.java
@@ -1,10 +1,9 @@
 package hudson.os;
 
-import org.jruby.ext.posix.JavaPOSIX;
 import org.jruby.ext.posix.POSIX;
 import org.jruby.ext.posix.POSIXFactory;
 import org.jruby.ext.posix.POSIXHandler;
-import org.jruby.ext.posix.POSIX.ERRORS;
+import com.kenai.constantine.platform.Errno;
 
 import java.io.File;
 import java.io.InputStream;
@@ -35,11 +34,11 @@ public class PosixAPI {
      * used a fallback java implementation which does not support many operations.
      */
     public static boolean supportsNative() {
-        return !(posix instanceof JavaPOSIX);
+        return posix.isNative();
     }
     
     private static final POSIX posix = POSIXFactory.getPOSIX(new POSIXHandler() {
-        public void error(ERRORS errors, String s) {
+        public void error(Errno errors, String s) {
             throw new PosixException(s,errors);
         }
 
diff --git a/core/src/main/java/hudson/os/PosixException.java b/core/src/main/java/hudson/os/PosixException.java
index 93e96ef..b30e33b 100644
--- a/core/src/main/java/hudson/os/PosixException.java
+++ b/core/src/main/java/hudson/os/PosixException.java
@@ -1,6 +1,6 @@
 package hudson.os;
 
-import org.jruby.ext.posix.POSIX.ERRORS;
+import com.kenai.constantine.platform.Errno;
 
 /**
  * Indicates an error during POSIX API call.
@@ -8,14 +8,14 @@ import org.jruby.ext.posix.POSIX.ERRORS;
  * @author Kohsuke Kawaguchi
  */
 public class PosixException extends RuntimeException {
-    private final ERRORS errors;
+    private final Errno errors;
 
-    public PosixException(String message, ERRORS errors) {
+    public PosixException(String message, Errno errors) {
         super(message);
         this.errors = errors;
     }
 
-    public ERRORS getErrorCode() {
+    public Errno getErrorCode() {
         return errors;
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git