You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/03/09 20:41:44 UTC
svn commit: r921077 - in /harmony/enhanced/classlib/trunk/modules:
archive/src/main/java/java/util/zip/
archive/src/main/java/org/apache/harmony/archive/internal/nls/
auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/
auth/src/main...
Author: hindessm
Date: Tue Mar 9 19:41:44 2010
New Revision: 921077
URL: http://svn.apache.org/viewvc?rev=921077&view=rev
Log:
Convert some messages to use NLS catalog.
Modified:
harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipEntry.java
harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java
harmony/enhanced/classlib/trunk/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipEntry.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipEntry.java (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipEntry.java Tue Mar 9 19:41:44 2010
@@ -25,6 +25,7 @@ import java.io.UnsupportedEncodingExcept
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import org.apache.harmony.archive.internal.nls.Messages;
/**
* An instance of {@code ZipEntry} represents an entry within a <i>ZIP-archive</i>.
@@ -363,7 +364,7 @@ public class ZipEntry implements ZipCons
long sig = (hdrBuf[0] & 0xff) | ((hdrBuf[1] & 0xff) << 8) |
((hdrBuf[2] & 0xff) << 16) | ((hdrBuf[3] << 24) & 0xffffffffL);
if (sig != CENSIG) {
- throw new ZipException("Central Directory Entry not found");
+ throw new ZipException(Messages.getString("archive.3A"));
}
compressionMethod = (hdrBuf[10] & 0xff) | ((hdrBuf[11] & 0xff) << 8);
@@ -443,7 +444,7 @@ public class ZipEntry implements ZipCons
int b3 = raf.read();
if (b3 < 0) {
- throw new EOFException("in ZipEntry.readIntLE(RandomAccessFile)");
+ throw new EOFException(Messages.getString("archive.3B"));
}
return b0 | (b1 << 8) | (b2 << 16) | (b3 << 24); // ATTENTION: DOES SIGN EXTENSION: IS THIS WANTED?
}
@@ -459,7 +460,7 @@ public class ZipEntry implements ZipCons
if (in.read(b, 0, 2) == 2) {
return (b[0] & 0XFF) | ((b[1] & 0XFF) << 8);
} else {
- throw new EOFException("in ZipEntry.readShortLE(InputStream)");
+ throw new EOFException(Messages.getString("archive.3C"));
}
}
@@ -474,7 +475,7 @@ public class ZipEntry implements ZipCons
| ((b[3] & 0XFF) << 24))
& 0XFFFFFFFFL; // Here for sure NO sign extension is wanted.
} else {
- throw new EOFException("in ZipEntry.readIntLE(InputStream)");
+ throw new EOFException(Messages.getString("archive.3D"));
}
}
}
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java Tue Mar 9 19:41:44 2010
@@ -27,6 +27,7 @@ import java.security.PrivilegedAction;
import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.Iterator;
+import org.apache.harmony.archive.internal.nls.Messages;
/**
* This class provides random read access to a <i>ZIP-archive</i> file.
@@ -161,7 +162,7 @@ public class ZipFile implements ZipConst
private void checkNotClosed() {
if (mRaf == null) {
- throw new IllegalStateException("Zip File closed.");
+ throw new IllegalStateException(Messages.getString("archive.36"));
}
}
@@ -299,7 +300,7 @@ public class ZipFile implements ZipConst
*/
long scanOffset = mRaf.length() - ENDHDR;
if (scanOffset < 0) {
- throw new ZipException("too short to be Zip");
+ throw new ZipException(Messages.getString("archive.37"));
}
long stopOffset = scanOffset - 65536;
@@ -315,7 +316,7 @@ public class ZipFile implements ZipConst
scanOffset--;
if (scanOffset < stopOffset) {
- throw new ZipException("EOCD not found; not a Zip archive?");
+ throw new ZipException(Messages.getString("archive.38"));
}
}
@@ -341,7 +342,7 @@ public class ZipFile implements ZipConst
if (numEntries != totalNumEntries ||
diskNumber != 0 ||
diskWithCentralDir != 0) {
- throw new ZipException("spanned archives not supported");
+ throw new ZipException(Messages.getString("archive.39"));
}
/*
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties Tue Mar 9 19:41:44 2010
@@ -69,3 +69,11 @@ archive.32={0} has invalid digest for {1
archive.33=A length of the encoded header name "{1}" exceeded maximum length {2}
archive.34=A jar verifier does not support more than one entry with the same name
archive.35=JarFile has been closed
+archive.36=Zip File closed.
+archive.37=too short to be Zip
+archive.38=EOCD not found; not a Zip archive?
+archive.39=spanned archives not supported
+archive.3A=Central Directory Entry not found
+archive.3B=in ZipEntry.readIntLE(RandomAccessFile)
+archive.3C=in ZipEntry.readShortLE(InputStream)
+archive.3D=in ZipEntry.readIntLE(InputStream)
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java Tue Mar 9 19:41:44 2010
@@ -33,6 +33,7 @@ import org.apache.harmony.security.asn1.
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1StringType;
import org.apache.harmony.security.asn1.ASN1Type;
+import org.apache.harmony.auth.internal.nls.Messages;
/**
* @see http://www.ietf.org/rfc/rfc3961.txt
@@ -70,7 +71,7 @@ public class KDCRequest {
public DatagramSocket send(InetAddress address, int port) throws IOException {
if (msgType != AS_REQ) {
- throw new RuntimeException("Not implemented");
+ throw new RuntimeException(Messages.getString("auth.65"));
}
byte[] enc = AS_REQ_ASN1.encode(this);
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java Tue Mar 9 19:41:44 2010
@@ -30,6 +30,7 @@ import org.apache.harmony.security.asn1.
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.asn1.DerInputStream;
+import org.apache.harmony.auth.internal.nls.Messages;
/**
* Kerberos Error Message type.
@@ -162,7 +163,7 @@ public class KerberosErrorMessage {
@Override
protected void getValues(Object object, Object[] values) {
- throw new RuntimeException("KerberosErrorMessage encoder is not implemented");
+ throw new RuntimeException(Messages.getString("auth.64"));
}
};
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties Tue Mar 9 19:41:44 2010
@@ -99,3 +99,21 @@ auth.50=\n\tInvalid options format {0}
auth.51=\n\tInvalid token: {0}
auth.52=Error code: {0}
auth.53=Unable to locate a login configuration
+auth.54=Fail to login
+auth.55=Subject is readonly.
+auth.56=Unable to locate JNDI user provider
+auth.57=Unable to locate JNDI group provider
+auth.58=Cannot get user password
+auth.59=Cannot get uidNumber information
+auth.5A=Cannot get gidNumber information
+auth.5B=no CallbackHandler available
+auth.5C=Login incorrect
+auth.5D=No shared status
+auth.5E=Cannot get user ID or user password from shared state
+auth.5F=No Shared State
+auth.60=Login Module is not initialized.
+auth.61=PKCS11 must have NONE as keyStoreURL and privateKeyPasswordURL unset
+auth.62=Protected authentication path must have keyStorePasswordURL and privateKeyPasswordURL unset
+auth.63=Failure to get KeyStore or KeyStore Password
+auth.64=KerberosErrorMessage encoder is not implemented
+auth.65=Not implemented
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java Tue Mar 9 19:41:44 2010
@@ -45,6 +45,7 @@ import javax.security.auth.spi.LoginModu
import org.apache.harmony.auth.UnixNumericGroupPrincipal;
import org.apache.harmony.auth.UnixNumericUserPrincipal;
import org.apache.harmony.auth.UnixPrincipal;
+import org.apache.harmony.auth.internal.nls.Messages;
public class JndiLoginModule extends SharedStateManager implements LoginModule {
@@ -107,11 +108,11 @@ public class JndiLoginModule extends Sha
return true;
case logout:
clear();
- throw new LoginException("Fail to login");
+ throw new LoginException(Messages.getString("auth.54"));
default:
if (subject.isReadOnly()) {
clear();
- throw new LoginException("Subject is readonly.");
+ throw new LoginException(Messages.getString("auth.55"));
}
subject.getPrincipals().add(unixPrincipal);
debugUtil.recordDebugInfo("[JndiLoginModule] added UnixPrincipal to Subject\n");
@@ -173,10 +174,10 @@ public class JndiLoginModule extends Sha
jndiUserProvider = (String) options.get("user.provider.url");
jndiGroupProvider = (String) options.get("group.provider.url");
if (jndiUserProvider == null) {
- throw new LoginException("Unable to locate JNDI user provider");
+ throw new LoginException(Messages.getString("auth.56"));
}
if (jndiGroupProvider == null) {
- throw new LoginException("Unable to locate JNDI group provider");
+ throw new LoginException(Messages.getString("auth.57"));
}
debugUtil.recordDebugInfo("[JndiLoginModule] user provider: " + jndiUserProvider + "\n"
+"[JndiLoginModule] group provider: " + jndiGroupProvider
@@ -218,7 +219,7 @@ public class JndiLoginModule extends Sha
attrIds);
passwordAttr = userAttrs.get("userPassword");
if (passwordAttr == null) {
- throw new LoginException("Cannot get user password");
+ throw new LoginException(Messages.getString("auth.58"));
}
jndiUserPassword = new String((byte[])passwordAttr.get());
if (!jndiUserPassword.equals(crypto(new String(userPassword)))) {
@@ -227,13 +228,13 @@ public class JndiLoginModule extends Sha
uidNumberAttr = userAttrs.get("uidNumber");
if (uidNumberAttr == null) {
- throw new LoginException("Cannot get uidNumber information");
+ throw new LoginException(Messages.getString("auth.59"));
}
uidNumber = Long.valueOf((String) uidNumberAttr.get());
gidNumberAttr = userAttrs.get("gidNumber");
if (gidNumberAttr == null) {
- throw new LoginException("Cannot get gidNumber information");
+ throw new LoginException(Messages.getString("auth.5A"));
}
gidNumber = Long.valueOf((String) gidNumberAttr.get());
}
@@ -255,7 +256,7 @@ public class JndiLoginModule extends Sha
protected void getUserIdentityFromCallbackHandler() throws LoginException {
if (callbackHandler == null) {
- throw new LoginException("no CallbackHandler available");
+ throw new LoginException(Messages.getString("auth.5B"));
}
ArrayList<Callback> callbacks = new ArrayList<Callback>();
NameCallback jndiNameCallback = new NameCallback("User ID");
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java Tue Mar 9 19:41:44 2010
@@ -44,6 +44,7 @@ import javax.security.auth.login.LoginEx
import javax.security.auth.spi.LoginModule;
import javax.security.auth.x500.X500Principal;
import javax.security.auth.x500.X500PrivateCredential;
+import org.apache.harmony.auth.internal.nls.Messages;
public class KeyStoreLoginModule implements LoginModule {
@@ -101,11 +102,11 @@ public class KeyStoreLoginModule impleme
return true;
case logout:
clear();
- throw new LoginException("Fail to login");
+ throw new LoginException(Messages.getString("auth.54"));
default:
if (subject.isReadOnly()) {
clear();
- throw new LoginException("Subject is readonly.");
+ throw new LoginException(Messages.getString("auth.55"));
}
subject.getPrincipals().add(principal);
subject.getPublicCredentials().add(certPath);
@@ -174,7 +175,7 @@ public class KeyStoreLoginModule impleme
if (!keyStoreURL.equals("NONE")
|| privateKeyPasswordURL != null) {
throw new LoginException(
- "PKCS11 must have NONE as keyStoreURL and privateKeyPasswordURL unset");
+ Messages.getString("auth.61"));
}
needPrivateKeyPassword = false;
}
@@ -182,7 +183,7 @@ public class KeyStoreLoginModule impleme
if (has_protected_authentication_path) {
if (keyStorePasswordURL != null && privateKeyPasswordURL != null) {
throw new LoginException(
- "Protected authentication path must have keyStorePasswordURL and privateKeyPasswordURL unset");
+ Messages.getString("auth.62"));
}
needKeyStorePassword = false;
needPrivateKeyPassword = false;
@@ -274,7 +275,7 @@ public class KeyStoreLoginModule impleme
if (null == keyStoreURL || (needKeyStorePassword && null == keyStorePassword)) {
throw new LoginException(
- "Failure to get KeyStore or KeyStore Password");
+ Messages.getString("auth.63"));
}
}
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java Tue Mar 9 19:41:44 2010
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.util.Arrays;
import javax.security.auth.login.LoginException;
+import org.apache.harmony.auth.internal.nls.Messages;
public class LoginModuleUtils {
@@ -80,7 +81,7 @@ public class LoginModuleUtils {
public ACTION checkLogin() throws LoginException {
switch (phase) {
case uninitialized:
- throw new LoginException("Login Module is not initialized.");
+ throw new LoginException(Messages.getString("auth.60"));
case initialized:
return ACTION.login;
default:
@@ -91,7 +92,7 @@ public class LoginModuleUtils {
public ACTION checkCommit() throws LoginException {
switch (phase) {
case uninitialized:
- throw new LoginException("Login Module is not initialized.");
+ throw new LoginException(Messages.getString("auth.60"));
case initialized:
return ACTION.logout;
case logined:
@@ -104,7 +105,7 @@ public class LoginModuleUtils {
public ACTION checkLogout() throws LoginException {
switch (phase) {
case uninitialized:
- throw new LoginException("Login Module is not initialized.");
+ throw new LoginException(Messages.getString("auth.60"));
case initialized:
case logined:
return ACTION.no_action;
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java?rev=921077&r1=921076&r2=921077&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java Tue Mar 9 19:41:44 2010
@@ -21,6 +21,7 @@ import java.util.Map;
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.harmony.auth.internal.nls.Messages;
abstract public class SharedStateManager {
@@ -91,7 +92,7 @@ abstract public class SharedStateManager
debugUtil.recordDebugInfo("[" + getModuleName()
+ "] regular authentication failed\n");
debugUtil.printAndClearDebugInfo();
- throw new FailedLoginException("Login incorrect");
+ throw new FailedLoginException(Messages.getString("auth.5C"));
} else {
debugUtil.recordDebugInfo("[" + getModuleName()
+ "] regular authentication succeeded\n");
@@ -108,7 +109,7 @@ abstract public class SharedStateManager
+ "] regular authentication failed\n");
}
debugUtil.printAndClearDebugInfo();
- throw new FailedLoginException("Login incorrect");
+ throw new FailedLoginException(Messages.getString("auth.5C"));
}
} else {
if (tryFirstPass) {
@@ -128,14 +129,14 @@ abstract public class SharedStateManager
private void getUserIdentityFromSharedStatus() throws LoginException {
if (sharedState == null)
- throw new LoginException("No shared status");
+ throw new LoginException(Messages.getString("auth.5D"));
String userName = (String) sharedState
.get("javax.security.auth.login.name");
char[] userPassword = (char[]) sharedState
.get("javax.security.auth.login.password");
if (userName == null || userPassword == null) {
throw new LoginException(
- "Cannot get user ID or user password from shared state");
+ Messages.getString("auth.5E"));
}
setUserName(userName);
setUserPassword(userPassword);
@@ -144,7 +145,7 @@ abstract public class SharedStateManager
protected void storePass() throws LoginException {
if (storePass) {
if (sharedState == null) {
- throw new LoginException("No Shared State");
+ throw new LoginException(Messages.getString("auth.5F"));
}
if (sharedState.get("javax.security.auth.login.name") == null) {
sharedState
@@ -160,7 +161,7 @@ abstract public class SharedStateManager
protected void clearPass() throws LoginException {
if (clearPass) {
if (sharedState == null) {
- throw new LoginException("No Shared State");
+ throw new LoginException(Messages.getString("auth.5F"));
}
sharedState.remove("javax.security.auth.login.name");
sharedState.remove("javax.security.auth.login.password");