[maven-debian-helper] 02/02: Removed PackageScanner.makeExecutable() and use File.setExecutable() instead

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit 25ad3a734e7bdce813ed926abcdf93a80c85d1cd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 26 10:16:53 2013 +0200

    Removed PackageScanner.makeExecutable() and use File.setExecutable() instead
---
 .../maven/packager/GenerateDebianFilesMojo.java    |    4 +--
 .../maven/packager/util/NoOutputHandler.java       |   26 --------------------
 .../debian/maven/packager/util/PackageScanner.java |    4 ---
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
index 025e116..7b0ff72 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@ -383,7 +383,7 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
                     generateFile(context, "watch.svn.vm", outputDirectory, "watch");
                     generateFile(context, "orig-tar.svn.vm", outputDirectory, "orig-tar.sh");
 
-                    scanner.makeExecutable("debian/orig-tar.sh");
+                    new File("debian/orig-tar.sh").setExecutable(true);
 
                 } else {
                     System.err.println("Cannot locate the version in the download url (" + downloadUrl + ").");
@@ -402,7 +402,7 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
             generateFile(context, "compat.vm", outputDirectory, "compat");
             generateFile(context, rulesTemplate, outputDirectory, "rules");
 
-            scanner.makeExecutable("debian/rules");
+            new File("debian/rules").setExecutable(true);
 
             String debianVersion = projectVersion.replace("-alpha-", "~alpha");
             debianVersion = debianVersion.replace("-beta-", "~beta");
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/NoOutputHandler.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/NoOutputHandler.java
deleted file mode 100644
index 2ab4738..0000000
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/NoOutputHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2012 Ludovic Claude.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.debian.maven.packager.util;
-
-public class NoOutputHandler implements OutputHandler {
-
-    public void newLine(String line) {
-    }
-
-    public void failure() {
-    }
-}
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java
index 5446bb7..e3a3f61 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java
@@ -175,10 +175,6 @@ public class PackageScanner {
         return jars;
     }
 
-    public void makeExecutable(String file) {
-        IOUtil.executeProcess(new String[]{"chmod", "+x", file}, new NoOutputHandler());
-    }
-
     public List<DebianDependency> addDocDependencies(Collection<DebianDependency> debianDeps, Map<DebianDependency,
         Dependency> versionedPackagesAndDependencies) {
         List<DebianDependency> docDeps = new ArrayList<DebianDependency>();

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