/hg/release/icedtea-web-1.6: Add texts for PolicyEditor's -defau...

[aazores at icedtea.classpath.org]

changeset 8da824ac7755 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=8da824ac7755
author: Andrew Azores <aazores at redhat.com>
date: Tue Sep 01 09:55:42 2015 -0400

	Add texts for PolicyEditor's -defaultfile switch

	* icedteaweb-completion: added -defaultfile to policyeditor options
	* netx/net/sourceforge/jnlp/OptionsDefinitions.java: added DEFAULTFILE to
	PolicyEditor options
	* netx/net/sourceforge/jnlp/resources/Messages.properties
	(PBODefaultFile): new message


diffstat:

 ChangeLog                                               |  9 +++++++++
 icedteaweb-completion                                   |  2 +-
 netx/net/sourceforge/jnlp/OptionsDefinitions.java       |  5 ++++-
 netx/net/sourceforge/jnlp/resources/Messages.properties |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diffs (62 lines):

diff -r 9e24c2ff6b46 -r 8da824ac7755 ChangeLog
--- a/ChangeLog	Thu Jul 30 13:11:53 2015 -0400
+++ b/ChangeLog	Tue Sep 01 09:55:42 2015 -0400
@@ -1,3 +1,12 @@
+2015-09-01  Andrew Azores  <aazores at redhat.com>
+
+	Add texts for PolicyEditor's -defaultfile switch
+	* icedteaweb-completion: added -defaultfile to policyeditor options
+	* netx/net/sourceforge/jnlp/OptionsDefinitions.java: added DEFAULTFILE to
+	PolicyEditor options
+	* netx/net/sourceforge/jnlp/resources/Messages.properties
+	(PBODefaultFile): new message
+
 2015-07-30  Andrew Azores  <aazores at redhat.com>
 
 	PolicyEditor -file switch and main argument cannot be used in conjunction
diff -r 9e24c2ff6b46 -r 8da824ac7755 icedteaweb-completion
--- a/icedteaweb-completion	Thu Jul 30 13:11:53 2015 -0400
+++ b/icedteaweb-completion	Tue Sep 01 09:55:42 2015 -0400
@@ -22,7 +22,7 @@
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     # PolicyEditor Options
-    opts="-codebase -file -help"
+    opts="-codebase -file -defaultfile -help"
 
     COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
     return 0
diff -r 9e24c2ff6b46 -r 8da824ac7755 netx/net/sourceforge/jnlp/OptionsDefinitions.java
--- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java	Thu Jul 30 13:11:53 2015 -0400
+++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java	Tue Sep 01 09:55:42 2015 -0400
@@ -86,7 +86,9 @@
         //policyeditor
         //-help
         FILE("-file", "policy_file", "PBOFile", NumberOfArguments.ONE),
-        CODEBASE("-codebase", "url", "PBOCodebase", NumberOfArguments.ONE_OR_MORE);
+        DEFAULTFILE("-defaultfile", "PBODefaultFile"),
+        CODEBASE("-codebase", "url", "PBOCodebase", NumberOfArguments.ONE_OR_MORE),
+        ;
 
         public final String option;
 
@@ -173,6 +175,7 @@
     public static List<OPTIONS> getPolicyEditorOptions() {
         return Arrays.asList(new OPTIONS[]{
             OPTIONS.HELP1,
+            OPTIONS.DEFAULTFILE,
             OPTIONS.FILE,
             OPTIONS.CODEBASE,
             OPTIONS.VERBOSE
diff -r 9e24c2ff6b46 -r 8da824ac7755 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Thu Jul 30 13:11:53 2015 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Tue Sep 01 09:55:42 2015 -0400
@@ -357,6 +357,8 @@
 
 PBOFile=Specifies a policy file path to open. If exactly one argument is given, and it is not this flag, it is interpreted as a file path to open, as if this flag was given first. This flag exists \
 mostly for compatibility with Policy Tool, but is also needed when opening a policy file and also using the -codebase flag.
+PBODefaultFile=Specifies that the default user-level policy file should be opened. This is the file which is normally used by IcedTea-Web to make decisions about custom policies and permissions \
+for applets at runtime, unless configured otherwise.
 PBOCodebase=Specifies an applet codebase URL. If the specified codebase already exists in the policy file (if any), then it will be selected when the editor opens. If it is a new codebase then it will \
 be added and selected. Multiple URLs may also be given with a single -codebase flag by separating them with spaces. In this case, the last codebase given will be selected, and all will  be \
 added. If this flag is given more than once, only the first is used.