harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r394071 - in /incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth: Subject.java login/AppConfigurationEntry.java spi/LoginModule.java
Date Fri, 14 Apr 2006 12:18:01 GMT
Author: smishura
Date: Fri Apr 14 05:18:00 2006
New Revision: 394071

URL: http://svn.apache.org/viewcvs?rev=394071&view=rev
Log:
Updating to 1.5 signatures.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/login/AppConfigurationEntry.java
  (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/spi/LoginModule.java
  (contents, props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java?rev=394071&r1=394070&r2=394071&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java
Fri Apr 14 05:18:00 2006
@@ -29,6 +29,7 @@
 import java.security.AccessController;
 import java.security.DomainCombiner;
 import java.security.Permission;
+import java.security.Principal;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -102,8 +103,8 @@
     /**
      * @com.intel.drl.spec_ref
      */
-    public Subject(boolean readOnly, Set subjPrincipals, Set pubCredentials,
-            Set privCredentials) {
+    public Subject(boolean readOnly, Set<? extends Principal> subjPrincipals,
+            Set<?> pubCredentials, Set<?> privCredentials) {
 
         if (subjPrincipals == null || pubCredentials == null
                 || privCredentials == null) {
@@ -254,42 +255,42 @@
     /**
      * @com.intel.drl.spec_ref
      */
-    public Set getPrincipals() {
+    public Set<Principal> getPrincipals() {
         return principals;
     }
 
     /**
      * @com.intel.drl.spec_ref
      */
-    public Set getPrincipals(Class c) {
+    public <T extends Principal> Set<T> getPrincipals(Class<T> c) {
         return ((SecureSet) principals).get(c);
     }
 
     /**
      * @com.intel.drl.spec_ref
      */
-    public Set getPrivateCredentials() {
+    public Set<Object> getPrivateCredentials() {
         return privateCredentials;
     }
 
     /**
      * @com.intel.drl.spec_ref
      */
-    public Set getPrivateCredentials(Class c) {
+    public <T> Set<T> getPrivateCredentials(Class<T> c) {
         return privateCredentials.get(c);
     }
 
     /**
      * @com.intel.drl.spec_ref
      */
-    public Set getPublicCredentials() {
+    public Set<Object> getPublicCredentials() {
         return publicCredentials;
     }
 
     /**
      * @com.intel.drl.spec_ref
      */
-    public Set getPublicCredentials(Class c) {
+    public <T> Set<T> getPublicCredentials(Class<T> c) {
         return publicCredentials.get(c);
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/login/AppConfigurationEntry.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/login/AppConfigurationEntry.java?rev=394071&r1=394070&r2=394071&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/login/AppConfigurationEntry.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/login/AppConfigurationEntry.java
Fri Apr 14 05:18:00 2006
@@ -31,7 +31,7 @@
 
 
     // the login module options
-    private final Map options;
+    private final Map<String, ?> options;
 
     // the control flag
     private final AppConfigurationEntry.LoginModuleControlFlag controlFlag;
@@ -44,7 +44,7 @@
      */
     public AppConfigurationEntry(String loginModuleName,
             AppConfigurationEntry.LoginModuleControlFlag controlFlag,
-            Map options) {
+            Map<String, ?> options) {
 
         if (loginModuleName == null || loginModuleName.length() == 0) {
             throw new IllegalArgumentException(
@@ -81,7 +81,7 @@
     /** 
      * @com.intel.drl.spec_ref 
      */
-    public Map getOptions() {
+    public Map<java.lang.String, ?> getOptions() {
         return options;
     }
 

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/login/AppConfigurationEntry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/spi/LoginModule.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/spi/LoginModule.java?rev=394071&r1=394070&r2=394071&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/spi/LoginModule.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/spi/LoginModule.java
Fri Apr 14 05:18:00 2006
@@ -35,7 +35,7 @@
      * @com.intel.drl.spec_ref
      */
     void initialize(Subject subject, CallbackHandler callbackHandler,
-            Map sharedState, Map options);
+            Map<String, ?> sharedState, Map<String, ?> options);
 
     /**
      * @com.intel.drl.spec_ref

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/spi/LoginModule.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message