avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/policy/reader PolicyReader.java
Date Sun, 22 Sep 2002 01:09:51 GMT
donaldp     2002/09/21 18:09:51

  Modified:    loader/src/java/org/apache/excalibur/policy/reader
                        PolicyReader.java
  Log:
  If signedBy is non-null and keyStore is null - default to using name "default" for keystore.,
  
  Revision  Changes    Path
  1.4       +11 -3     jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/policy/reader/PolicyReader.java
  
  Index: PolicyReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/policy/reader/PolicyReader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PolicyReader.java	22 Sep 2002 01:07:35 -0000	1.3
  +++ PolicyReader.java	22 Sep 2002 01:09:51 -0000	1.4
  @@ -84,7 +84,11 @@
       {
           final String codeBase = getAttribute( element, "code-base" );
           final String signedBy = getAttribute( element, "signed-by" );
  -        final String keyStore = getAttribute( element, "key-store" );
  +        String keyStore = getAttribute( element, "key-store" );
  +        if( null != signedBy && null == keyStore )
  +        {
  +            keyStore = "default";
  +        }
           final NodeList permissionElements =
               element.getElementsByTagName( "permission" );
           final PermissionMetaData[] permissions = buildPermissions( permissionElements );
  @@ -126,7 +130,11 @@
           final String target = getAttribute( element, "target" );
           final String action = getAttribute( element, "action" );
           final String signedBy = getAttribute( element, "signed-by" );
  -        final String keyStore = getAttribute( element, "key-store" );
  +        String keyStore = getAttribute( element, "key-store" );
  +        if( null != signedBy && null == keyStore )
  +        {
  +            keyStore = "default";
  +        }
           return new PermissionMetaData( classname, target, action,
                                          signedBy, keyStore );
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message