You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/05/21 15:22:02 UTC
ant git commit: Shorten fully-qualified names (cherry-pick 5c6e9ac)
Repository: ant
Updated Branches:
refs/heads/1.9.x fee6d73d5 -> f979b4444
Shorten fully-qualified names (cherry-pick 5c6e9ac)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f979b444
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f979b444
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f979b444
Branch: refs/heads/1.9.x
Commit: f979b4444378fb3595d2f00101336b774d1134cf
Parents: fee6d73
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon May 21 17:21:35 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon May 21 17:21:35 2018 +0200
----------------------------------------------------------------------
.../apache/tools/ant/helper/ProjectHelper2.java | 5 ++-
.../optional/ejb/DescriptorHandler.java | 23 ++++------
.../org/apache/tools/ant/types/Permissions.java | 46 ++++++++++----------
3 files changed, 36 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/f979b444/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 34dfde3..d2014b3 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -23,6 +23,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.HashMap;
@@ -226,7 +227,7 @@ public class ProjectHelper2 extends ProjectHelper {
try {
context.setBuildFile((File) null);
context.setBuildFile(url);
- } catch (java.net.MalformedURLException ex) {
+ } catch (MalformedURLException ex) {
throw new BuildException(ex);
}
buildFileName = url.toString();
@@ -773,7 +774,7 @@ public class ProjectHelper2 extends ProjectHelper {
if (MagicNames.ANT_FILE_TYPE_URL.equals(dupType)) {
try {
dupFile = new URL(dup);
- } catch (java.net.MalformedURLException mue) {
+ } catch (MalformedURLException mue) {
throw new BuildException("failed to parse "
+ dup + " as URL while looking"
+ " at a duplicate project"
http://git-wip-us.apache.org/repos/asf/ant/blob/f979b444/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index 9ae0e67..af15945 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.Hashtable;
@@ -168,7 +169,7 @@ public class DescriptorHandler extends HandlerBase {
URL urldtd = new URL(location);
urlDTDs.put(publicId, urldtd);
}
- } catch (java.net.MalformedURLException e) {
+ } catch (MalformedURLException e) {
//ignored
}
@@ -262,7 +263,6 @@ public class DescriptorHandler extends HandlerBase {
inEJBRef = false;
}
-
/**
* SAX parser call-back method that is invoked when a new element is entered
* into. Used to store the context (attribute name) in the currentAttribute
@@ -290,7 +290,6 @@ public class DescriptorHandler extends HandlerBase {
}
}
-
/**
* SAX parser call-back method that is invoked when an element is exited.
* Used to blank out (set to the empty string, not nullify) the name of
@@ -338,11 +337,9 @@ public class DescriptorHandler extends HandlerBase {
*/
public void characters(char[] ch, int start, int length)
throws SAXException {
-
currentText += new String(ch, start, length);
}
-
/**
* Called when an endelement is seen.
* This may be overridden in derived classes.
@@ -357,15 +354,14 @@ public class DescriptorHandler extends HandlerBase {
return;
}
- if (currentElement.equals(HOME_INTERFACE)
- || currentElement.equals(REMOTE_INTERFACE)
- || currentElement.equals(LOCAL_INTERFACE)
- || currentElement.equals(LOCAL_HOME_INTERFACE)
- || currentElement.equals(BEAN_CLASS)
- || currentElement.equals(PK_CLASS)) {
+ if (HOME_INTERFACE.equals(currentElement)
+ || REMOTE_INTERFACE.equals(currentElement)
+ || LOCAL_INTERFACE.equals(currentElement)
+ || LOCAL_HOME_INTERFACE.equals(currentElement)
+ || BEAN_CLASS.equals(currentElement)
+ || PK_CLASS.equals(currentElement)) {
// Get the filename into a String object
- File classFile = null;
String className = currentText.trim();
// If it's a primitive wrapper then we shouldn't try and put
@@ -376,8 +372,7 @@ public class DescriptorHandler extends HandlerBase {
// name, create the File object and add it to the Hashtable.
className = className.replace('.', File.separatorChar);
className += ".class";
- classFile = new File(srcDir, className);
- ejbFiles.put(className, classFile);
+ ejbFiles.put(className, new File(srcDir, className));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/f979b444/src/main/org/apache/tools/ant/types/Permissions.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java
index d0559c7..da805af 100644
--- a/src/main/org/apache/tools/ant/types/Permissions.java
+++ b/src/main/org/apache/tools/ant/types/Permissions.java
@@ -19,10 +19,12 @@
package org.apache.tools.ant.types;
import java.lang.reflect.Constructor;
+import java.net.SocketPermission;
import java.security.UnresolvedPermission;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.PropertyPermission;
import java.util.Set;
import java.util.StringTokenizer;
@@ -122,27 +124,27 @@ public class Permissions {
}
}
// Add base set of permissions
- granted.add(new java.net.SocketPermission("localhost:1024-", "listen"));
- granted.add(new java.util.PropertyPermission("java.version", "read"));
- granted.add(new java.util.PropertyPermission("java.vendor", "read"));
- granted.add(new java.util.PropertyPermission("java.vendor.url", "read"));
- granted.add(new java.util.PropertyPermission("java.class.version", "read"));
- granted.add(new java.util.PropertyPermission("os.name", "read"));
- granted.add(new java.util.PropertyPermission("os.version", "read"));
- granted.add(new java.util.PropertyPermission("os.arch", "read"));
- granted.add(new java.util.PropertyPermission("file.encoding", "read"));
- granted.add(new java.util.PropertyPermission("file.separator", "read"));
- granted.add(new java.util.PropertyPermission("path.separator", "read"));
- granted.add(new java.util.PropertyPermission("line.separator", "read"));
- granted.add(new java.util.PropertyPermission("java.specification.version", "read"));
- granted.add(new java.util.PropertyPermission("java.specification.vendor", "read"));
- granted.add(new java.util.PropertyPermission("java.specification.name", "read"));
- granted.add(new java.util.PropertyPermission("java.vm.specification.version", "read"));
- granted.add(new java.util.PropertyPermission("java.vm.specification.vendor", "read"));
- granted.add(new java.util.PropertyPermission("java.vm.specification.name", "read"));
- granted.add(new java.util.PropertyPermission("java.vm.version", "read"));
- granted.add(new java.util.PropertyPermission("java.vm.vendor", "read"));
- granted.add(new java.util.PropertyPermission("java.vm.name", "read"));
+ granted.add(new SocketPermission("localhost:1024-", "listen"));
+ granted.add(new PropertyPermission("java.version", "read"));
+ granted.add(new PropertyPermission("java.vendor", "read"));
+ granted.add(new PropertyPermission("java.vendor.url", "read"));
+ granted.add(new PropertyPermission("java.class.version", "read"));
+ granted.add(new PropertyPermission("os.name", "read"));
+ granted.add(new PropertyPermission("os.version", "read"));
+ granted.add(new PropertyPermission("os.arch", "read"));
+ granted.add(new PropertyPermission("file.encoding", "read"));
+ granted.add(new PropertyPermission("file.separator", "read"));
+ granted.add(new PropertyPermission("path.separator", "read"));
+ granted.add(new PropertyPermission("line.separator", "read"));
+ granted.add(new PropertyPermission("java.specification.version", "read"));
+ granted.add(new PropertyPermission("java.specification.vendor", "read"));
+ granted.add(new PropertyPermission("java.specification.name", "read"));
+ granted.add(new PropertyPermission("java.vm.specification.version", "read"));
+ granted.add(new PropertyPermission("java.vm.specification.vendor", "read"));
+ granted.add(new PropertyPermission("java.vm.specification.name", "read"));
+ granted.add(new PropertyPermission("java.vm.version", "read"));
+ granted.add(new PropertyPermission("java.vm.vendor", "read"));
+ granted.add(new PropertyPermission("java.vm.name", "read"));
}
private java.security.Permission createPermission(
@@ -187,7 +189,7 @@ public class Permissions {
*/
@Override
public void checkExit(final int status) {
- final java.security.Permission perm = new java.lang.RuntimePermission("exitVM", null);
+ final java.security.Permission perm = new RuntimePermission("exitVM", null);
try {
checkPermission(perm);
} catch (final SecurityException e) {