Author: markt
Date: Mon Jun 8 11:08:18 2015
New Revision: 1684146
URL: http://svn.apache.org/r1684146
Log:
Fix import order issues
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java
tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
---
tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
Mon Jun 8 11:08:18 2015
@@ -16,9 +16,10 @@
*/
package javax.security.auth.message.callback;
+import java.security.Principal;
+
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
-import java.security.Principal;
/**
* Callback that enables an authentication module to inform the runtime of the
call principal or name of the caller principal.
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
---
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
Mon Jun 8 11:08:18 2015
@@ -16,9 +16,10 @@
*/
package javax.security.auth.message.callback;
-import javax.security.auth.callback.Callback;
import java.security.cert.CertStore;
+import javax.security.auth.callback.Callback;
+
/**
* Callback that enables a runtime to inform authentication modules of the
CertStore to use.
*
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
---
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
Mon Jun 8 11:08:18 2015
@@ -16,10 +16,11 @@
*/
package javax.security.auth.message.callback;
-import javax.security.auth.callback.Callback;
+import java.util.Arrays;
+
import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
-import java.util.Arrays;
/**
* Callback that enables an authentication module to supply a username and
password (to a runtime?) and determine if
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
---
tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java
Mon Jun 8 11:08:18 2015
@@ -16,13 +16,13 @@
*/
package javax.security.auth.message.callback;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.x500.X500Principal;
-
import java.math.BigInteger;
import java.security.PrivateKey;
import java.security.cert.Certificate;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.x500.X500Principal;
+
/**
* Callback that enables an authentication module to request a certificate
chain and private key from the runtime.
* The information specifying the chain and key may be an alias, a digest, a
subject key, or an issuer ID.
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
---
tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java
Mon Jun 8 11:08:18 2015
@@ -16,8 +16,8 @@
*/
package javax.security.auth.message.callback;
-import javax.security.auth.callback.Callback;
import javax.crypto.SecretKey;
+import javax.security.auth.callback.Callback;
/**
* A callback enabling an authentication module to request a secret key from
the runtime, by supplying an alias.
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
---
tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java
Mon Jun 8 11:08:18 2015
@@ -16,9 +16,10 @@
*/
package javax.security.auth.message.callback;
-import javax.security.auth.callback.Callback;
import java.security.KeyStore;
+import javax.security.auth.callback.Callback;
+
/**
* A Callback enabling an authentication module to request a truststore from
the runtime.
*
Modified:
tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
Mon Jun 8 11:08:18 2015
@@ -16,10 +16,11 @@
*/
package javax.security.auth.message.config;
+import java.util.Map;
+
import javax.security.auth.Subject;
import javax.security.auth.message.AuthException;
-import java.util.Map;
/**
* @version $Rev$ $Date$
Modified:
tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
Mon Jun 8 11:08:18 2015
@@ -16,11 +16,11 @@
*/
package javax.security.auth.message.config;
+import java.util.Map;
+
import javax.security.auth.Subject;
import javax.security.auth.message.AuthException;
-import java.util.Map;
-
/**
* @version $Rev$ $Date$
*/
Modified:
tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
Mon Jun 8 11:08:18 2015
@@ -16,11 +16,13 @@
*/
package javax.security.auth.message.module;
+import java.util.Map;
+
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.message.AuthException;
import javax.security.auth.message.ClientAuth;
import javax.security.auth.message.MessagePolicy;
-import javax.security.auth.callback.CallbackHandler;
-import java.util.Map;
+
/**
* @version $Rev$ $Date$
Modified:
tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java?rev=1684146&r1=1684145&r2=1684146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
Mon Jun 8 11:08:18 2015
@@ -16,11 +16,12 @@
*/
package javax.security.auth.message.module;
+import java.util.Map;
+
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.message.AuthException;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.ServerAuth;
-import java.util.Map;
/**
* @version $Rev$ $Date$
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
