[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf/ui ...

[Norman Richards]

  User: nrichards
  Date: 07/01/29 13:54:42

  Modified:    src/pdf/org/jboss/seam/pdf/ui  UISignature.java
  Log:
  externalize keywstore config
  
  Revision  Changes    Path
  1.3       +10 -26    jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UISignature.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISignature.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UISignature.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UISignature.java	29 Jan 2007 03:01:33 -0000	1.2
  +++ UISignature.java	29 Jan 2007 18:54:42 -0000	1.3
  @@ -10,6 +10,7 @@
   import javax.faces.context.FacesContext;
   
   import org.jboss.seam.pdf.ITextUtils;
  +import org.jboss.seam.pdf.KeyStoreConfig;
   import org.jboss.seam.util.Resources;
   
   import com.lowagie.text.DocWriter;
  @@ -28,12 +29,6 @@
       String reason;
       String location;
       
  -    // keystore
  -    String keyStore         = null;
  -    String keyStorePassword = null;
  -    String keyPassword      = null;
  -    String keyAlias         = null;   
  -    
       public void setField(String field) {
           this.field = field;
       }
  @@ -48,21 +43,7 @@
           this.location = location;
       }
          
  -    public void setKeyAlias(String keyAlias) {
  -        this.keyAlias = keyAlias;
  -    }
  -
  -    public void setKeyPassword(String keyPassword) {
  -        this.keyPassword = keyPassword;
  -    }
  -
  -    public void setKeyStore(String keyStore) {
  -        this.keyStore = keyStore;
  -    }
   
  -    public void setKeyStorePassword(String keyStorePassword) {
  -        this.keyStorePassword = keyStorePassword;
  -    }
       
       @Override
       public void createITextObject(FacesContext context) {}
  @@ -123,14 +104,17 @@
       }    
   
       public byte[] sign(byte[] originalBytes) {         
  +        KeyStoreConfig store = KeyStoreConfig.instance();
  +        
           try {                        
  -            InputStream is = Resources.getResourceAsStream(keyStore);
  +            InputStream is = Resources.getResourceAsStream(store.getKeyStore());
               
               KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); 
  -            ks.load(is, keyStorePassword.toCharArray());
  +            ks.load(is, store.getKeyStorePassword().toCharArray());
   
  -            PrivateKey key = (PrivateKey) ks.getKey(keyAlias, keyPassword.toCharArray());
  -            Certificate[] chain =  ks.getCertificateChain(keyAlias); 
  +            PrivateKey key = (PrivateKey) ks.getKey(store.getKeyAlias(),
  +                        store.getKeyPassword().toCharArray());
  +            Certificate[] chain =  ks.getCertificateChain(store.getKeyAlias()); 
   
               PdfReader reader = new PdfReader(originalBytes); 
               ByteArrayOutputStream os = new ByteArrayOutputStream();