Thread: [Aglets-commits] aglets/src/com/ibm/aglets/security Lifetime.java, 1.3, 1.4 PolicyPermission.java,
Status: Beta
Brought to you by:
cat4hire
From: Luca F. <cat...@us...> - 2009-07-28 07:05:04
|
Update of /cvsroot/aglets/aglets/src/com/ibm/aglets/security In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18746/src/com/ibm/aglets/security Modified Files: Lifetime.java PolicyPermission.java PolicyFileReader.java Randoms.java PolicyGrant.java PolicyFileWriter.java PolicyFileParsingException.java DateString.java PolicyImpl.java PolicyDB.java Log Message: Merge of experimental branch. Index: PolicyFileReader.java =================================================================== RCS file: /cvsroot/aglets/aglets/src/com/ibm/aglets/security/PolicyFileReader.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- PolicyFileReader.java 27 Jul 2009 10:31:40 -0000 1.6 +++ PolicyFileReader.java 28 Jul 2009 07:04:53 -0000 1.7 @@ -93,9 +93,7 @@ private StreamTokenizer _st = null; private PolicyDB _db = null; - private static final LogCategory log - = LogInitializer.getCategory(PolicyFileReader.class.getName() ); - + private static AgletsLogger logger = AgletsLogger.getLogger(PolicyFileReader.class.getName()); public PolicyFileReader(String policyFilename) { try { readPolicyFile(policyFilename); @@ -434,7 +432,7 @@ } protected synchronized void readPolicyFile(String filename) throws FileNotFoundException { - log.info("Reading security policy file: " + filename); + logger.info("Reading security policy file: " + filename); if (filename == null) { throw new FileNotFoundException("Policy filename is null."); } @@ -446,11 +444,11 @@ try { readPolicyDB(); reader.close(); - log.debug("Policy file read complete"); + logger.debug("Policy file read complete"); } catch (PolicyFileParsingException excpt) { - log.error("Error parsing policy file: ",excpt); + logger.error("Error parsing policy file: ",excpt); } catch (IOException excpt) { - log.error("Error parsing policy file: ",excpt); + logger.error("Error parsing policy file: ",excpt); } } protected synchronized void readPolicyGrant() Index: PolicyPermission.java =================================================================== RCS file: /cvsroot/aglets/aglets/src/com/ibm/aglets/security/PolicyPermission.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PolicyPermission.java 27 Jul 2009 10:31:40 -0000 1.5 +++ PolicyPermission.java 28 Jul 2009 07:04:53 -0000 1.6 @@ -31,9 +31,8 @@ * @author ONO Kouichi */ public class PolicyPermission { - private static final LogCategory log = - LogInitializer.getCategory(PolicyPermission.class.getName() ); - private static final String CLASSNAME_PERMISSION = + private static AgletsLogger logger = AgletsLogger.getLogger(PolicyPermission.class.getName()); + private static final String CLASSNAME_PERMISSION = "java.security.Permission"; private static final String CLASSNAME_BASIC_PERMISSION = "java.security.BasicPermission"; @@ -288,7 +287,7 @@ } } _permission = (Permission)obj; - log.debug("Created permission: "+_permission); + logger.debug("Created permission: "+_permission); return _permission; } public boolean equals(PolicyPermission permission) { Index: PolicyGrant.java =================================================================== RCS file: /cvsroot/aglets/aglets/src/com/ibm/aglets/security/PolicyGrant.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PolicyGrant.java 27 Jul 2009 10:31:40 -0000 1.2 +++ PolicyGrant.java 28 Jul 2009 07:04:53 -0000 1.3 @@ -456,4 +456,38 @@ return lines; } + + + /** + * Returns the number of the permission stored whitin this grant. + * @return the number of permission within this grant, zero if there are no permissions. + */ + public final int getPermissionCount(){ + if( this._permissions == null ) + return 0; + else + return this._permissions.size(); + } + + /** + * Returns the number of signers for the current policy grant. + * @return the number of signers (>= 0) + */ + public final int getSignersCount(){ + if( this._signers == null ) + return 0; + else + return this._signers.size(); + } + + /** + * Returns the number of onwers for this policy grant. + * @return the numbero fo owners or zero if no one has been specified. + */ + public final int getOwnersCount(){ + if( this._owners == null ) + return 0; + else + return this._owners.size(); + } } |