--- a/jdk/src/share/classes/com/sun/security/auth/PolicyParser.java Tue Nov 09 18:57:12 2010 +0000
+++ b/jdk/src/share/classes/com/sun/security/auth/PolicyParser.java Thu Nov 11 15:51:12 2010 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -300,7 +300,7 @@
keyStoreType = match("quoted string");
} else {
throw new ParsingException(st.lineno(),
- rb.getString("expected keystore type"));
+ rb.getString("expected.keystore.type"));
}
}
@@ -368,8 +368,8 @@
"WILDCARD class but no WILDCARD name");
throw new ParsingException
(st.lineno(),
- rb.getString("can not specify Principal with a ") +
- rb.getString("wildcard class without a wildcard name"));
+ rb.getString("can.not.specify.Principal.with.a.") +
+ rb.getString("wildcard.class.without.a.wildcard.name"));
}
try {
@@ -389,7 +389,7 @@
} else {
throw new
ParsingException(st.lineno(),
- rb.getString("expected codeBase or SignedBy"));
+ rb.getString("expected.codeBase.or.SignedBy"));
}
}
@@ -397,7 +397,7 @@
if (principals == null) {
throw new ParsingException
(st.lineno(),
- rb.getString("only Principal-based grant entries permitted"));
+ rb.getString("only.Principal.based.grant.entries.permitted"));
}
e.principals = principals;
@@ -416,7 +416,7 @@
} else {
throw new
ParsingException(st.lineno(),
- rb.getString("expected permission entry"));
+ rb.getString("expected.permission.entry"));
}
}
match("}");
@@ -522,12 +522,12 @@
switch (lookahead) {
case StreamTokenizer.TT_NUMBER:
throw new ParsingException(st.lineno(), expect,
- rb.getString("number ") +
+ rb.getString("number.") +
String.valueOf(st.nval));
case StreamTokenizer.TT_EOF:
throw new ParsingException
- (rb.getString("expected ") + expect +
- rb.getString(", read end of file"));
+ (rb.getString("expected.") + expect +
+ rb.getString(".read.end.of.file"));
case StreamTokenizer.TT_WORD:
if (expect.equalsIgnoreCase(st.sval)) {
lookahead = st.nextToken();
@@ -603,11 +603,11 @@
switch (lookahead) {
case StreamTokenizer.TT_NUMBER:
throw new ParsingException(st.lineno(), ";",
- rb.getString("number ") +
+ rb.getString("number.") +
String.valueOf(st.nval));
case StreamTokenizer.TT_EOF:
throw new ParsingException
- (rb.getString("expected ';', read end of file"));
+ (rb.getString("expected.read.end.of.file"));
default:
lookahead = st.nextToken();
}
@@ -942,13 +942,13 @@
}
public ParsingException(int line, String msg) {
- super(rb.getString("line ") + line + rb.getString(": ") + msg);
+ super(rb.getString("line.") + line + rb.getString("COLON") + msg);
}
public ParsingException(int line, String expect, String actual) {
- super(rb.getString("line ") + line + rb.getString(": expected '") +
- expect + rb.getString("', found '") + actual +
- rb.getString("'"));
+ super(rb.getString("line.") + line + rb.getString(".expected.") +
+ expect + rb.getString(".found.") + actual +
+ rb.getString("QUOTE"));
}
}