diff -urN ../../305/ejbca/Changelog.txt ./Changelog.txt
--- ../../305/ejbca/Changelog.txt	Wed Feb  9 09:27:08 2005
+++ ./Changelog.txt	Wed Mar 30 09:05:26 2005
@@ -1,3 +1,14 @@
+3.0.7
+-----
+* [ECA-54] - HardCATokens goes off-line when bean gets passivated
+* [ECA-49] - saving of generated request from CA fails on IE
+
+
+3.0.6
+-----
+* [ECA-40] - defined hardtoken issuer and profiles disapears after some time
+* [ECA-42] - <enterpris-beans> tag missing in xml fil
+
 3.0.5
 -----
 Added support for activation of hardcatokens in View CA Info page.
diff -urN ../../305/ejbca/doc/HOWTO-database.txt ./doc/HOWTO-database.txt
--- ../../305/ejbca/doc/HOWTO-database.txt	Fri Nov 19 14:53:56 2004
+++ ./doc/HOWTO-database.txt	Sun Feb 13 12:01:32 2005
@@ -4,7 +4,7 @@
 The following databases have in some stage been tested with EJBCA:
 
 * Hypersoniq (hsqldb) (default in JBoss)
-* PostegreSQL 7.2 (http://www.postgresql.org/)
+* PostegreSQL 7.2 and 8.0 (http://www.postgresql.org/)
 * MySQL (http://www.mysql.com/)
 * Oracle 8i (http://www.oracle.com/)
 * Sybase
diff -urN ../../305/ejbca/doc/README ./doc/README
--- ../../305/ejbca/doc/README	Mon Feb  7 17:25:45 2005
+++ ./doc/README	Wed Mar 30 12:38:17 2005
@@ -1,4 +1,4 @@
-$Id: README,v 1.150.2.18 2005/02/07 16:25:45 anatom Exp $
+$Id: README,v 1.150.2.19 2005/03/30 10:38:17 anatom Exp $
 
 This software is OSI Certified Open Source Software.
 OSI Certified is a certification mark of the Open Source
@@ -465,6 +465,10 @@
 given number of days.
 * exportprofiles - exports entity and certificate profiles to xml-files.
 * importprofiles - imports entity and certificate profiles from xml-files.
+When you export a profile that should be imported in another CA, make sure the 
+'Available CAs' is set to 'Any CA' for the profiles you export. Otherwise you
+can get into trouble with authorization if you don't have the same CAs with the same 
+caids (DNs) where you import the profiles.
 * importca - creates a new CA by importing keys from en existing PKCS12 file.
 A PKCS12 file can be generates from PEM files with openssl.
 
diff -urN ../../305/ejbca/doc/RELEASE_NOTES ./doc/RELEASE_NOTES
--- ../../305/ejbca/doc/RELEASE_NOTES	Mon Jan 24 17:47:03 2005
+++ ./doc/RELEASE_NOTES	Wed Mar 30 08:56:04 2005
@@ -1,7 +1,20 @@
+EJBCA V3.0.7
+------------
+This is a plugin-upgrade from 3.0.6 or 3.0.5. 
+Apply patch, build and redeploy.
+
+EJBCA V3.0.6
+------------
+This is a plugin-upgrade from 3.0.5. 
+Apply patch, build and redeploy.
+
+If you are using the hard token stuff on MySQL (which you probably aren't or you would have noticed 
+this bug), you should drop the table HardTokenData and restart JBoss to recreate the table.
+
 EJBCA V3.0.5
 ------------
 
-This is a plugin-upgrade from 3.0.3. 
+This is a plugin-upgrade from 3.0.4. 
 Apply patch, build and redeploy.
 
 For users of MS SQL 2000 you should note the column name 'rule_' (earlier 'rule' which is 
diff -urN ../../305/ejbca/src/adminweb/WEB-INF/web.xml ./src/adminweb/WEB-INF/web.xml
--- ../../305/ejbca/src/adminweb/WEB-INF/web.xml	Wed Jan  5 18:22:24 2005
+++ ./src/adminweb/WEB-INF/web.xml	Mon Mar 21 10:33:16 2005
@@ -179,29 +179,29 @@
   <ejb-local-ref>
     <ejb-ref-name>HardTokenSessionLocal</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <local-home>se.anatom.ejbca.hardtoken.HardTokenSessionLocalHome</local-home>
-    <local>se.anatom.ejbca.hardtoken.HardTokenSessionLocal</local>
+    <local-home>se.anatom.ejbca.hardtoken.IHardTokenSessionLocalHome</local-home>
+    <local>se.anatom.ejbca.hardtoken.IHardTokenSessionLocal</local>
     <ejb-link>HardTokenSession</ejb-link>
   </ejb-local-ref>  
   <ejb-local-ref>
     <ejb-ref-name>HardTokenBatchJobSessionLocal</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <local-home>se.anatom.ejbca.hardtoken.HardTokenBatchJobSessionLocalHome</local-home>
-    <local>se.anatom.ejbca.hardtoken.HardTokenBatchJobSessionLocal</local>
+    <local-home>se.anatom.ejbca.hardtoken.IHardTokenBatchJobSessionLocalHome</local-home>
+    <local>se.anatom.ejbca.hardtoken.IHardTokenBatchJobSessionLocal</local>
     <ejb-link>HardTokenBatchJobSession</ejb-link>
   </ejb-local-ref>
     <ejb-local-ref>
     <ejb-ref-name>KeyRecoverySessionLocal</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <local-home>se.anatom.ejbca.keyrecovery.KeyRecoverySessionLocalHome</local-home>
-    <local>se.anatom.ejbca.keyrecovery.KeyRecoverySessionLocal</local>
+    <local-home>se.anatom.ejbca.keyrecovery.IKeyRecoverySessionLocalHome</local-home>
+    <local>se.anatom.ejbca.keyrecovery.IKeyRecoverySessionLocal</local>
     <ejb-link>KeyRecoverySession</ejb-link>
   </ejb-local-ref>          
   <ejb-local-ref>
     <ejb-ref-name>PublisherSessionLocal</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <local-home>se.anatom.ejbca.ca.publisher.PublisherSessionLocalHome</local-home>
-    <local>se.anatom.ejbca.ca.publisher.PublisherSessionLocal</local>
+    <local-home>se.anatom.ejbca.ca.publisher.IPublisherSessionLocalHome</local-home>
+    <local>se.anatom.ejbca.ca.publisher.IPublisherSessionLocal</local>
     <ejb-link>PublisherSession</ejb-link>
   </ejb-local-ref>     
 </web-app>
diff -urN ../../305/ejbca/src/adminweb/ca/editcas/editcapage.jsp ./src/adminweb/ca/editcas/editcapage.jsp
--- ../../305/ejbca/src/adminweb/ca/editcas/editcapage.jsp	Mon May 10 06:35:43 2004
+++ ./src/adminweb/ca/editcas/editcapage.jsp	Tue Mar 29 18:07:47 2005
@@ -1,695 +1,695 @@
-<%               
-  TreeMap rootcaprofiles = info.getAuthorizedRootCACertificateProfileNames();
-  TreeMap subcaprofiles = info.getAuthorizedSubCACertificateProfileNames();    
-  
-  TreeMap casigners = info.getCANames();
-
-  HashMap certprofileidtonamemap = info.getCertificateProfileIdToNameMap();
-  HashMap publisheridtonamemap = ejbcawebbean.getInformationMemory().getPublisherIdToNameMap();
-
-  Collection availablecatokens = HardCATokenManager.getAvailableHardCATokens();
-  String[] availablecatokentypes = new String[availablecatokens.size() + 1];
-  String[] availablecatokentypetexts = new String[availablecatokens.size() + 1];  
-  availablecatokentypes[0] = "NONE";
-  availablecatokentypetexts[0] = ejbcawebbean.getText("SOFT");
-
-  Iterator availablecatokensiter = availablecatokens.iterator();
-  int numberofavailabletokens = 1;
-  while(availablecatokensiter.hasNext()){
-    AvailableHardCAToken nextavailable = (AvailableHardCAToken) availablecatokensiter.next();
-    if(nextavailable.isUsed()){
-      availablecatokentypes[numberofavailabletokens] = nextavailable.getClassPath();
-      if(nextavailable.isTranslateable()){
-        availablecatokentypetexts[numberofavailabletokens] =  ejbcawebbean.getText(nextavailable.getName());
-      }else{
-        availablecatokentypetexts[numberofavailabletokens] =  nextavailable.getName();
-      }
-      numberofavailabletokens++;
-    }
-  }
- 
-  row = 0;
-  CAInfo cainfo = null;
-  X509CAInfo x509cainfo = null;
-  
-  String catokentext = null;
-  CATokenInfo catokeninfo = null;
-  
-  boolean revokable = true;
-  boolean signbyexternal = false;
-  boolean isexternal = false;
-  boolean waitingresponse = false;  
-
-  if(editca){
-    cainfo = cabean.getCAInfo(caid).getCAInfo();
-    catokeninfo = cainfo.getCATokenInfo();
-
-    if(catokeninfo instanceof SoftCATokenInfo){
-      catokentext = ejbcawebbean.getText("SOFT"); 
-    }
-    if(catokeninfo instanceof HardCATokenInfo){
-       catokentype = CATokenInfo.CATOKENTYPE_HSM;
-       catokenpath = ((HardCATokenInfo  ) catokeninfo).getClassPath();
-       AvailableHardCAToken availablecatoken = HardCATokenManager.getAvailableHardCAToken(catokenpath); 
-       if(!availablecatoken.isUsed())
-         throw new Exception("HardCAToken is not used, configuration error");
-      if(availablecatoken.isTranslateable()){
-        catokentext =  ejbcawebbean.getText(availablecatoken.getName());
-      }else{
-        catokentext =  availablecatoken.getName();
-      }      
-    }
-
-    revokable = cainfo.getStatus() != SecConst.CA_REVOKED && cainfo.getStatus() != SecConst.CA_EXTERNAL && cainfo.getStatus() != SecConst.CA_WAITING_CERTIFICATE_RESPONSE;
-
-    signbyexternal = cainfo.getSignedBy() == CAInfo.SIGNEDBYEXTERNALCA;
-    isexternal = cainfo.getStatus() == SecConst.CA_EXTERNAL;
-    waitingresponse = cainfo.getStatus() == SecConst.CA_WAITING_CERTIFICATE_RESPONSE;
-
-    x509cainfo = (X509CAInfo) cainfo;
-  }
-
-  OCSPCAServiceInfo ocspcainfo = null; 
-  java.security.cert.X509Certificate ocspcert = null; 
-  if(editca && !isexternal){
-    Iterator iter = x509cainfo.getExtendedCAServiceInfos().iterator();       
-    while(iter.hasNext()){
-      ExtendedCAServiceInfo serviceinfo = (ExtendedCAServiceInfo) iter.next();
-      if(serviceinfo instanceof OCSPCAServiceInfo){
-        ocspcainfo = (OCSPCAServiceInfo) serviceinfo;
-        if(ocspcainfo.getOCSPSignerCertificatePath() != null)
-          ocspcert = (java.security.cert.X509Certificate) ocspcainfo.getOCSPSignerCertificatePath().get(0);
-      }
-     }
-   }
-
-%>
-<SCRIPT language="JavaScript">
-<!--  
-<% if(!editca){ %>
-  var rootcaprofiles = new Array(<%= rootcaprofiles.keySet().size()%>);
-  var subcaprofiles = new Array(<%= subcaprofiles.keySet().size()%>);
-  var NAME       = 0;
-  var ID         = 1;
-<%
-      Iterator iter = rootcaprofiles.keySet().iterator();
-      int i = 0;
-      while(iter.hasNext()){
-        String next = (String) iter.next();  %> 
-    rootcaprofiles[<%=i%>] = new Array(2);
-    rootcaprofiles[<%=i%>][NAME] = "<%= next %>";      
-    rootcaprofiles[<%=i%>][ID] = <%= rootcaprofiles.get(next) %>;
-   <%   i++; 
-      }
- 
-      iter = subcaprofiles.keySet().iterator();
-      i = 0;
-      while(iter.hasNext()){
-        String next = (String) iter.next();  %> 
-    subcaprofiles[<%=i%>] = new Array(2);
-    subcaprofiles[<%=i%>][NAME] = "<%= next %>";      
-    subcaprofiles[<%=i%>][ID] = <%= subcaprofiles.get(next) %>;
-   <%   i++; 
-      }
-%>
-      
-function fillCertProfileField(){
-   var certprofselect   =  document.ca.<%=SELECT_CERTIFICATEPROFILE%>; 
-
-   var num = certprofselect.length;
-   for( i=num-1; i >= 0; i-- ){
-       certprofselect.options[i]=null;
-    }   
- 
-   var profiles = subcaprofiles;
-   if(document.ca.<%= SELECT_SIGNEDBY %>.options[document.ca.<%= SELECT_SIGNEDBY %>.options.selectedIndex].value == <%= CAInfo.SELFSIGNED %>)
-      profiles = rootcaprofiles;
-
-   for( i=0; i < profiles.length; i ++){
-     certprofselect.options[i]=new Option(profiles[i][NAME],
-                                     profiles[i][ID]);    
-     
-   }
-}
-
-  <% if(!processrequest){ %>
-function isExternal(){
-   var makebutton      =  document.ca.<%= BUTTON_MAKEREQUEST %>; 
-   var createbutton    =  document.ca.<%= BUTTON_CREATE %>; 
-   var validityfield   =  document.ca.<%=TEXTFIELD_VALIDITY%>;
-   var certproffield   =  document.ca.<%=SELECT_CERTIFICATEPROFILE %>;
-   var subjectaltname  =  document.ca.<%=TEXTFIELD_SUBJECTALTNAME%>;
-   var policyidfield   =  document.ca.<%=TEXTFIELD_POLICYID%>;
-   var activateocsp    =  document.ca.<%=CHECKBOX_ACTIVATEOCSPSERVICE%>;
-   
-
-   makebutton.disabled = true;
-   createbutton.disabled = false; 
-   validityfield.disabled = false; 
-   certproffield.disabled = false; 
-   subjectaltname.disabled = false; 
-   policyidfield.disabled = false; 
-   activateocsp.disabled = false;
-   activateocsp.checked = true;   
-
-   if(document.ca.<%= SELECT_SIGNEDBY %>.options[document.ca.<%= SELECT_SIGNEDBY %>.options.selectedIndex].value == <%= CAInfo.SIGNEDBYEXTERNALCA %>){
-      makebutton.disabled = false;   
-      createbutton.disabled = true;
-      validityfield.disabled = true; 
-      certproffield.disabled = true; 
-      subjectaltname.disabled = true; 
-      policyidfield.disabled = true;   
-      activateocsp.disabled = true;
-      activateocsp.checked = false;   
-   } 
-}
-
-
-    <% } %>
-<% }
-   if(revokable){ %>
-function confirmrevokation(){
-  var returnval = false;
-  if(document.ca.<%= SELECT_REVOKEREASONS %>.options.selectedIndex == -1){
-     alert("<%= ejbcawebbean.getText("AREVOKEATIONREASON") %>"); 
-     returnval = false;
-  }else{
-    returnval = confirm("<%= ejbcawebbean.getText("AREYOUSUREREVOKECA") %>");
-  } 
-  return returnval;
-}
-
-<%  }  
-
-   if(editca && !isexternal){ %>
-function confirmrenewal(){
-    
-  return confirm("<%= ejbcawebbean.getText("AREYOUSURERENEWCA") %>") && checkallfields();     
-}
-
-  <% if(ocspcert != null){ %>
-function viewocspcert(){        
-    var link = "<%= VIEWCERT_LINK %>?<%= CERTSERNO_PARAMETER %>=<%= java.net.URLEncoder.encode(ocspcert.getSerialNumber().toString(16) + "," + CertTools.getIssuerDN(ocspcert),"UTF-8")%>";
-    link = encodeURI(link);
-    window.open(link, 'view_cert','height=600,width=500,scrollbars=yes,toolbar=no,resizable=1');
-}
- 
-function checkactivateocsp(){ 
-  if(document.ca.<%=CHECKBOX_ACTIVATEOCSPSERVICE%>.checked){
-    document.ca.<%=BUTTON_REVOKERENEWOCSPCERTIFICATE%>.disabled = false;
-  }
-  else{    
-    document.ca.<%=BUTTON_REVOKERENEWOCSPCERTIFICATE%>.disabled = true;
-  }
-}
-
-<% } 
-}  %>  
-
-function checkusefield(usefield, criticalfield){
-  var usebox = eval("document.ca." + usefield);
-  var cribox = eval("document.ca." + criticalfield);
-  if(usebox.checked){
-    cribox.disabled = false;
-  }
-  else{
-    cribox.checked=false;
-    cribox.disabled = true;
-  }
-}
-
-function checkallfields(){
-    var illegalfields = 0;
-    
-
-    <% if(!editca){ %>
-    if(!checkfieldforcompletednchars("document.ca.<%=TEXTFIELD_SUBJECTDN%>","<%= ejbcawebbean.getText("ONLYCHARACTERS") + " " + ejbcawebbean.getText("SUBJECTDN") %>"))
-      illegalfields++;
-    if((document.ca.<%= TEXTFIELD_SUBJECTDN %>.value == "")){
-      alert("<%= ejbcawebbean.getText("YOUAREREQUIRED") + " " + ejbcawebbean.getText("SUBJECTDN")%>");
-      illegalfields++;
-    }
-   <% } %> 
-
-    <% if(!editca || (editca && cainfo.getSignedBy() != CAInfo.SIGNEDBYEXTERNALCA)){ %>
-    if(!checkfieldfordecimalnumbers("document.ca.<%=TEXTFIELD_VALIDITY%>","<%= ejbcawebbean.getText("ONLYDECNUMBERSINVALIDITY") %>"))
-      illegalfields++;
-    if((document.ca.<%= TEXTFIELD_VALIDITY %>.value == "") && document.ca.<%= SELECT_SIGNEDBY %>.options[document.ca.<%= SELECT_SIGNEDBY %>.options.selectedIndex].value != <%= CAInfo.SIGNEDBYEXTERNALCA %>){
-      alert("<%= ejbcawebbean.getText("YOUAREREQUIRED") + " " + ejbcawebbean.getText("VALIDITY")%>");
-      illegalfields++;
-    }   
-    <% }
-
-       if(catype == CAInfo.CATYPE_X509){ 
-         if(!editca){%>        
-    if(!checkfieldforcompletednchars("document.ca.<%=TEXTFIELD_SUBJECTALTNAME%>","<%= ejbcawebbean.getText("ONLYCHARACTERS") + " " + ejbcawebbean.getText("SUBJECTALTNAME")%>"))
-      illegalfields++;
-   if(!checkfieldforipaddess("document.ca.<%=TEXTFIELD_POLICYID%>","<%= ejbcawebbean.getText("ONLYNUMBERALSANDDOTS") + ejbcawebbean.getText("POLICYID")%>"))
-      illegalfields++;
-      <% } %>
-      <% if(!processrequest){ %>
-    if(!checkfieldfordecimalnumbers("document.ca.<%=TEXTFIELD_CRLPERIOD%>","<%= ejbcawebbean.getText("ONLYDECNUMBERSINCRLPERIOD") %>"))
-      illegalfields++;
-    if((document.ca.<%= TEXTFIELD_CRLPERIOD %>.value == "")){
-      alert("<%= ejbcawebbean.getText("YOUAREREQUIRED") + " " + ejbcawebbean.getText("CRLPERIOD")%>");
-      illegalfields++;
-    }
-    <%  } 
-      }  %> 
-     return illegalfields == 0;  
-   } 
--->
-
-</SCRIPT>
-<body <% if(!editca) out.write(" onload='fillCertProfileField()' "); %>> 
-<div align="center"> 
-  <% if(processrequest){ %>
-  <h2><%= ejbcawebbean.getText("PROCESSREQUEST") %><br></h2>
-  <h3><%= ejbcawebbean.getText("CANAME")+ " : " + caname %><br>
-      <%= ejbcawebbean.getText("ONLYTHEPUBLICKEY") %></h3>
-  <% }else{
-       if(editca){ %>
-  <h2><%= ejbcawebbean.getText("EDITCA") %><br></h2>
-  <h3><%= ejbcawebbean.getText("CANAME")+ " : " + cainfo.getName() %> </h3>
-  <%   }else{ %>
-   <h2><%= ejbcawebbean.getText("CREATECA") %><br></h2>
-   <h3><%= ejbcawebbean.getText("CANAME")+ " : " + caname %> </h3>
-  <%   }
-     }%>
-</div>
-  <table width="100%" border="0" cellspacing="3" cellpadding="3">
-    <tr id="Row<%=row++%2%>"> 
-      <td width="50%" valign="top"> 
-        <div align="left"> 
-          <h3>&nbsp;</h3>
-        </div>
-      </td>
-      <td width="50%" valign="top"> 
-        <div align="right">
-        <A href="<%=THIS_FILENAME %>"><u><%= ejbcawebbean.getText("BACKTOCAS") %></u></A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-   <!--     <A  onclick='displayHelpWindow("<%= ejbcawebbean.getHelpfileInfix("ca_help.html") + "#cas"%>")'>
-        <u><%= ejbcawebbean.getText("HELP") %></u> </A></div> -->
-      </td>
-    </tr>
-   <% if(!processrequest){ %>
-    <form name="changecatype" action="<%= THIS_FILENAME %>" method="post">
-      <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_CHOOSE_CATYPE %>'>
-      <tr id="Row<%=row++%2%>"> 
-        <td width="50%"  align="right"> 
-          <%= ejbcawebbean.getText("TYPEOFCA") %>
-        </td>
-        <td width="50%" valign="top"> 
-           X509
-        </td>
-      </tr>
-    </form>
-
-    <% if(!isexternal) {
-         if(editca){ %>
-        <tr id="Row<%=row++%2%>">
-          <td width="50%"  align="right">          
-            <%= ejbcawebbean.getText("CATOKENTYPE") %>
-         </td>	 
-	 <td><%= catokentext %>
-         </td>	
-      </tr>
-
-    <%   }else{ %>
-    <form name="changecatokentype" action="<%= THIS_FILENAME %>" method="post">
-       <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_CHOOSE_CATOKENTYPE %>'>
-       <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=caname %>'>
-       <tr id="Row<%=row++%2%>">
-          <td width="50%"  align="right">          
-            <%= ejbcawebbean.getText("CATOKENTYPE") %>
-         </td>	 
-	 <td><select name="<%=SELECT_CATOKEN %>" size="1" onchange="document.changecatokentype.submit()"'>
-                <% for(int i=0; i < numberofavailabletokens; i++){%>
-	 	<option value="<%=availablecatokentypes[i] %>" <% if(catokenpath.equals(availablecatokentypes[i]))
-                                             out.write("selected"); %>><%= availablecatokentypetexts[i] %></option>
-                <% } %>
-	     </select>
-         </td>	
-      </tr>
-    </form>
-    <%   }
-       }
-     }%>
-  <form name="ca" method="post" action="<%=THIS_FILENAME %>" ENCTYPE="post">
-    <input type="hidden" name='<%= HIDDEN_CATOKENTYPE %>' value='<%=catokentype %>'>
-    <input type="hidden" name='<%= HIDDEN_CATYPE %>' value='<%=catype %>'>
-  <% if(processrequest){ %>  
-    <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_PROCESSREQUEST2 %>'>
-    <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=caname %>'>
-  <% } else { %>
-  <%   if(editca){ %>  
-    <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_EDIT_CA %>'>
-    <input type="hidden" name='<%= HIDDEN_CAID %>' value='<%=caid %>'>
-    <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=cainfo.getName() %>'>
-  <%   } else { %>
-    <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_CREATE_CA %>'>
-    <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=caname %>'>
-  <%   }
-     }
-   if( catokentype == CATokenInfo.CATOKENTYPE_P12 && !processrequest && !isexternal){ %>
-   <%@ include file="softcatokenpage.jsp" %> 
-<%}  
-   if( catokentype == CATokenInfo.CATOKENTYPE_HSM && !processrequest && !isexternal){ %>
-   <%@ include file="hardcatokenpage.jsp" %> 
-<%}  %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("SUBJECTDN") %>
-      </td>
-      <td width="50%"> 
-        <% if(editca){
-              out.write(cainfo.getSubjectDN() + "<br>"); 
-           }else{ %>
-        <input type="text" name="<%=TEXTFIELD_SUBJECTDN%>" size="40" <% if(processrequest) out.write(" value='" + processedsubjectdn + "'"); %> maxlength="255">
-        <% } %>
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("SIGNEDBY") %>
-      </td>
-      <td width="50%">
-           <% if(processrequest){ %>
-                <select name="<%=SELECT_SIGNEDBY %>" size="1" onchange="fillCertProfileField();">                
-                <% Iterator iter = casigners.keySet().iterator();
-                   while(iter.hasNext()){
-                     String nameofca = (String) iter.next();  %>              
-                     <option value="<%= casigners.get(nameofca)%>"><%= nameofca %></option>  
-                <% } %> 
-	        </select> 
-           <% }else{
-                if(editca){
-                if(cainfo.getSignedBy() >= 0 && cainfo.getSignedBy() <= CAInfo.SPECIALCAIDBORDER){
-                  if(cainfo.getSignedBy() == CAInfo.SELFSIGNED)
-                    out.write(ejbcawebbean.getText("SELFSIGNED"));
-                  if(cainfo.getSignedBy() == CAInfo.SIGNEDBYEXTERNALCA)
-                    out.write(ejbcawebbean.getText("SIGNEDBYEXTERNALCA"));
-                }else
-                  out.write((String) caidtonamemap.get(new Integer(cainfo.getSignedBy())));
-              }else{%>
-        <select name="<%=SELECT_SIGNEDBY %>" size="1" onchange="fillCertProfileField(); isExternal()">
-                <option value="<%= CAInfo.SELFSIGNED%>" selected><%= ejbcawebbean.getText("SELFSIGNED") %></option>  
-                <option value="<%= CAInfo.SIGNEDBYEXTERNALCA%>"><%= ejbcawebbean.getText("EXTERNALCA") %></option>  
-                <% Iterator iter = casigners.keySet().iterator();
-                   while(iter.hasNext()){
-                     String nameofca = (String) iter.next();  %>              
-                     <option value="<%= casigners.get(nameofca)%>"><%= nameofca %></option>  
-                <% } %> 
-	 </select>
-           <%   }
-              }%> 
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("CERTIFICATEPROFILE") %>
-      </td>
-      <td width="50%"> 
-           <% if(editca){
-                if(cainfo.getCertificateProfileId() != 0)
-                  out.write((String) certprofileidtonamemap.get(new Integer(cainfo.getCertificateProfileId())));
-                else
-                  out.write(ejbcawebbean.getText("NOTUSED"));
-              }else{%>
-        <select name="<%=SELECT_CERTIFICATEPROFILE %>" size="1" >                
-	</select>
-           <% } %> 
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("VALIDITY") %> (<%= ejbcawebbean.getText("DAYS") %>)
-      </td>
-      <td width="50%"> 
-        <% if(isexternal || (editca && cainfo.getSignedBy() == CAInfo.SIGNEDBYEXTERNALCA)){
-              if(cainfo.getValidity() != 0)
-                out.write("" + cainfo.getValidity());
-              else
-                out.write(ejbcawebbean.getText("NOTUSED"));
-           }else{ %>
-        <input type="text" name="<%=TEXTFIELD_VALIDITY%>" size="5" maxlength="255" 
-           <% if(editca) out.write(" value='" +cainfo.getValidity() + "'> <i>" + 
-                                    ejbcawebbean.getText("USEDINCARENEWAL") + "</i>");
-              else out.write(">");
-           }%>
-      </td>
-    </tr>
-    <tr id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("DESCRIPTION") %>
-      </td>
-      <td width="50%"> 
-        <% if(isexternal){
-              out.write(cainfo.getDescription());
-           }else{ %>
-        <textarea name="<%=TEXTFIELD_DESCRIPTION%>" cols=40 rows=6><% if(editca) out.write(cainfo.getDescription());%></textarea>
-       <% } %>
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        &nbsp;
-      </td>
-      <td width="50%"> 
-        &nbsp;
-      </td>
-    </tr>
-   <% if(catype == CAInfo.CATYPE_X509){ 
-        
-        %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("SUBJECTALTNAME") %>
-      </td>
-      <td width="50%">
-         <% if(editca)
-              if(x509cainfo.getSubjectAltName() == null || x509cainfo.getSubjectAltName().trim().equals(""))
-                out.write(ejbcawebbean.getText("NONE")); 
-              else
-                out.write(x509cainfo.getSubjectAltName());                
-            else{  %>  
-         <input type="text" name="<%=TEXTFIELD_SUBJECTALTNAME%>" size="40" maxlength="255">
-         <% } %>   
-      </td>
-    </tr> 
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("POLICYID") %>
-        <% if(!editca) out.write("<br><i>" + ejbcawebbean.getText("LEAVEBLANKTOUSEDEFAULT") + "</i>");%>
-      </td>
-      <td width="50%">
-         <% if(editca) 
-              if(x509cainfo.getPolicyId() == null || x509cainfo.getPolicyId().trim().equals(""))
-                out.write(ejbcawebbean.getText("NONE")); 
-              else
-                out.write(x509cainfo.getPolicyId());                
-            else{  %>  
-         <input type="text" name="<%=TEXTFIELD_POLICYID%>" size="40" maxlength="255">
-         <% } %>   
-      </td>
-    </tr> 
-   <% if(!processrequest && !isexternal){ %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("CRLSPECIFICDATA") %>
-      </td>
-      <td width="50%"> 
-        &nbsp;
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-         <%= ejbcawebbean.getText("AUTHORITYKEYID") %> <br> <%= ejbcawebbean.getText("AUTHORITYKEYIDCRITICAL") %> 
-      </td>
-      <td width="50%">
-           <input type="checkbox" name="<%=CHECKBOX_AUTHORITYKEYIDENTIFIER %>" onClick="checkusefield('<%=CHECKBOX_AUTHORITYKEYIDENTIFIER %>', '<%=CHECKBOX_AUTHORITYKEYIDENTIFIERCRITICAL %>')" value="<%=CHECKBOX_VALUE %>" 
-           <% if((editca && x509cainfo.getUseAuthorityKeyIdentifier()) || !editca)
-                 out.write("CHECKED");
-              if(isexternal) out.write(" disabled ");
-           %>> <br> 
-          <input type="checkbox" name="<%=CHECKBOX_AUTHORITYKEYIDENTIFIERCRITICAL %>" value="<%=CHECKBOX_VALUE %>" 
-           <%
-             if(editca){
-               if(!x509cainfo.getUseAuthorityKeyIdentifier() || isexternal)
-                 out.write(" disabled ");  
-               else
-               if(x509cainfo.getAuthorityKeyIdentifierCritical())
-                 out.write("CHECKED");
-             }%>> 
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-         <%= ejbcawebbean.getText("CRLNUMBER") %> <br> <%= ejbcawebbean.getText("CRLNUMBERCRITICAL") %> 
-      </td>
-      <td width="50%">
-           <input type="checkbox" name="<%=CHECKBOX_USECRLNUMBER %>" onClick="checkusefield('<%=CHECKBOX_USECRLNUMBER %>', '<%=CHECKBOX_CRLNUMBERCRITICAL %>')" value="<%=CHECKBOX_VALUE %>" 
-           <% if((editca && x509cainfo.getUseCRLNumber()) || !editca)
-                 out.write("CHECKED");
-              if(isexternal) out.write(" disabled "); 
-           %>> <br> 
-          <input type="checkbox" name="<%=CHECKBOX_CRLNUMBERCRITICAL %>" value="<%=CHECKBOX_VALUE %>" 
-           <%
-             if(editca){
-               if(!x509cainfo.getUseCRLNumber() || isexternal)
-                 out.write(" disabled ");  
-               else
-               if(x509cainfo.getCRLNumberCritical())
-                 out.write("CHECKED");
-             }%>> 
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("CRLPERIOD") %> (<%= ejbcawebbean.getText("HOURS") %>)
-      </td>
-      <td width="50%">
-           <% if(isexternal){
-                out.write("" + x509cainfo.getCRLPeriod());
-              }else{ %>
-         <input type="text" name="<%=TEXTFIELD_CRLPERIOD%>" size="40" maxlength="255"
-            <% if(editca) out.write(" value='" + x509cainfo.getCRLPeriod()+ "'");%>>
-           <% } %> 
-      </td>
-    </tr>    
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%" align="right"> 
-        <%= ejbcawebbean.getText("CRLPUBLISHERS") %> <br>&nbsp;
-      </td>
-      <td width="50%"> 
-        <select name="<%=SELECT_AVAILABLECRLPUBLISHERS%>" size="5" multiple >
-           <%   Collection usedpublishers = null;
-                if(editca) usedpublishers = x509cainfo.getCRLPublishers(); 
-                Iterator iter = publisheridtonamemap.keySet().iterator(); 
-                while(iter.hasNext()){
-                  Integer next = (Integer) iter.next(); %>
-           <option  value="<%= next %>" 
-              <%    if(editca && usedpublishers.contains(next))
-                      out.write(" selected ");
-                  %>>
-              <%= publisheridtonamemap.get(next) %>         
-           </option>  
-              <% } %>
-        </select>
-      </td>
-    </tr>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("OTHERDATA") %>
-      </td>
-      <td width="50%"> 
-        &nbsp;
-      </td>
-    </tr>
-    <% if(!editca || (editca && ocspcainfo != null)){ %>
-    <tr id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("OCSPSERVICE") %>
-      </td>
-      <td width="50%"> <%= ejbcawebbean.getText("ACTIVE") %> 
-        <input type="checkbox" onclick="checkactivateocsp()" name="<%=CHECKBOX_ACTIVATEOCSPSERVICE %>" value="<%=CHECKBOX_VALUE %>" 
-           <% if(waitingresponse) out.write(" disabled ");%>
-            <% if((editca && (ocspcainfo.getStatus() == ExtendedCAServiceInfo.STATUS_ACTIVE)) || !editca)
-                 out.write("CHECKED");%>>
-         <% if(editca && ocspcert != null){ %> &nbsp;&nbsp;         
-         <input type="submit" name="<%= BUTTON_REVOKERENEWOCSPCERTIFICATE %>" <% if(ocspcainfo.getStatus() != ExtendedCAServiceInfo.STATUS_ACTIVE || waitingresponse) out.write(" disabled ");%> value="<%= ejbcawebbean.getText("REVOKERENEWOCSPCERT") %>" >
-         <br>         
-         <a style="cursor:hand;" onClick="viewocspcert()"><u><%= ejbcawebbean.getText("VIEWOCSPCERTIFICATE")%></u></a>
-         <% } %>
-      </td>
-    </tr>    
-    <% } %>
-    <tr id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        <%= ejbcawebbean.getText("FINISHUSER") %>
-      </td>
-      <td width="50%"> 
-        <input type="checkbox" name="<%=CHECKBOX_FINISHUSER %>" value="<%=CHECKBOX_VALUE %>" 
-            <% if((editca && x509cainfo.getFinishUser()) || !editca)
-                 out.write("CHECKED");%>>         
-      </td>
-    </tr>
-   <%  } 
-    }
-    if(editca && !waitingresponse){%>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="50%"  align="right"> 
-        &nbsp;
-      </td>
-      <td width="50%"> 
-        <a style="cursor:hand;" onClick="window.open('<%=VIEWCERT_LINK%>?caid=<%=caid%>', 'view_cert','height=600,width=600,scrollbars=yes,toolbar=no,resizable=1')";><u><%= ejbcawebbean.getText("VIEWCACERTIFICATE")%></u></a>
-      </td>
-    </tr>
-    <% } %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="49%" valign="top">&nbsp;</td>
-      <td width="51%" valign="top"> 
-      <% if(!isexternal){ 
-           if(processrequest){ %>
-          <input type="submit" name="<%= BUTTON_PROCESSREQUEST %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("PROCESSREQUEST") %>">
-      <% }else{
-            if(editca){ %>
-          <input type="submit" name="<%= BUTTON_SAVE %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("SAVE") %>">
-        <%  }else{ %>
-          <input type="submit" name="<%= BUTTON_CREATE %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("CREATE") %>">
-        <%  }
-         } %>   
-        <input type="submit" name="<%= BUTTON_CANCEL %>" value="<%= ejbcawebbean.getText("CANCEL") %>">
-        <% }else{ %>
-        <input type="submit" name="<%= BUTTON_CANCEL %>" value="<%= ejbcawebbean.getText("BACK") %>">
-        <% } %>
-      </td>
-    </tr>
-       <% if(editca && revokable){ %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="49%" valign="top">&nbsp;</td>
-      <td width="51%" valign="top">         
-        <select name="<%=SELECT_REVOKEREASONS %>" >
-          <% for(int i=0; i < RevokedInfoView.reasontexts.length; i++){ 
-               if(i!= 7){%>
-               <option value='<%= i%>'><%= ejbcawebbean.getText(RevokedInfoView.reasontexts[i]) %></option>
-          <%   } 
-             } %>
-        </select>
-        <input type="submit" name="<%= BUTTON_REVOKECA %>" value="<%= ejbcawebbean.getText("REVOKE") %>" onClick='return confirmrevokation()'>     
-      </td>
-    </tr>
-        <% } %>   
-       <% if(!editca && !processrequest){ %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="49%" valign="top" align="right"></td>
-      <td width="51%" valign="top">             
-        <input type="submit" disabled name="<%= BUTTON_MAKEREQUEST %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("MAKEREQUEST") %>" >
-      </td>
-    </tr>
-        <% } %>   
-       <% if(editca && !isexternal && !waitingresponse){ %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="49%" valign="top" align="right"></td>
-      <td width="51%" valign="top">             
-        <input type="submit" name="<%= BUTTON_RENEWCA %>" onClick='return confirmrenewal()' value="<%= ejbcawebbean.getText("RENEWCA") %>" >
-      </td>
-    </tr>
-        <% } %>   
-       <% if(editca && waitingresponse){ %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="49%" valign="top" align="right"></td>
-      <td width="51%" valign="top">             
-        <input type="submit" name="<%= BUTTON_RECEIVEREQUEST %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("RECIEVEREQUEST") %>" >
-      </td>
-    </tr>
-        <% } %>   
-       <% if(editca && !isexternal && !waitingresponse){ %>
-    <tr  id="Row<%=row++%2%>"> 
-      <td width="49%" valign="top" align="right"></td>
-      <td width="51%" valign="top">             
-        <input type="submit" name="<%= BUTTON_PUBLISHCA %>"  value="<%= ejbcawebbean.getText("REPUBLISHCA") %>" >
-      </td>
-    </tr>
-        <% } %>   
-  </form>
-  </table>
+<%               
+  TreeMap rootcaprofiles = info.getAuthorizedRootCACertificateProfileNames();
+  TreeMap subcaprofiles = info.getAuthorizedSubCACertificateProfileNames();    
+  
+  TreeMap casigners = info.getCANames();
+
+  HashMap certprofileidtonamemap = info.getCertificateProfileIdToNameMap();
+  HashMap publisheridtonamemap = ejbcawebbean.getInformationMemory().getPublisherIdToNameMap();
+
+  Collection availablecatokens = HardCATokenManager.instance().getAvailableHardCATokens();
+  String[] availablecatokentypes = new String[availablecatokens.size() + 1];
+  String[] availablecatokentypetexts = new String[availablecatokens.size() + 1];  
+  availablecatokentypes[0] = "NONE";
+  availablecatokentypetexts[0] = ejbcawebbean.getText("SOFT");
+
+  Iterator availablecatokensiter = availablecatokens.iterator();
+  int numberofavailabletokens = 1;
+  while(availablecatokensiter.hasNext()){
+    AvailableHardCAToken nextavailable = (AvailableHardCAToken) availablecatokensiter.next();
+    if(nextavailable.isUsed()){
+      availablecatokentypes[numberofavailabletokens] = nextavailable.getClassPath();
+      if(nextavailable.isTranslateable()){
+        availablecatokentypetexts[numberofavailabletokens] =  ejbcawebbean.getText(nextavailable.getName());
+      }else{
+        availablecatokentypetexts[numberofavailabletokens] =  nextavailable.getName();
+      }
+      numberofavailabletokens++;
+    }
+  }
+ 
+  row = 0;
+  CAInfo cainfo = null;
+  X509CAInfo x509cainfo = null;
+  
+  String catokentext = null;
+  CATokenInfo catokeninfo = null;
+  
+  boolean revokable = true;
+  boolean signbyexternal = false;
+  boolean isexternal = false;
+  boolean waitingresponse = false;  
+
+  if(editca){
+    cainfo = cabean.getCAInfo(caid).getCAInfo();
+    catokeninfo = cainfo.getCATokenInfo();
+
+    if(catokeninfo instanceof SoftCATokenInfo){
+      catokentext = ejbcawebbean.getText("SOFT"); 
+    }
+    if(catokeninfo instanceof HardCATokenInfo){
+       catokentype = CATokenInfo.CATOKENTYPE_HSM;
+       catokenpath = ((HardCATokenInfo  ) catokeninfo).getClassPath();
+       AvailableHardCAToken availablecatoken = HardCATokenManager.instance().getAvailableHardCAToken(catokenpath); 
+       if(!availablecatoken.isUsed())
+         throw new Exception("HardCAToken is not used, configuration error");
+      if(availablecatoken.isTranslateable()){
+        catokentext =  ejbcawebbean.getText(availablecatoken.getName());
+      }else{
+        catokentext =  availablecatoken.getName();
+      }      
+    }
+
+    revokable = cainfo.getStatus() != SecConst.CA_REVOKED && cainfo.getStatus() != SecConst.CA_EXTERNAL && cainfo.getStatus() != SecConst.CA_WAITING_CERTIFICATE_RESPONSE;
+
+    signbyexternal = cainfo.getSignedBy() == CAInfo.SIGNEDBYEXTERNALCA;
+    isexternal = cainfo.getStatus() == SecConst.CA_EXTERNAL;
+    waitingresponse = cainfo.getStatus() == SecConst.CA_WAITING_CERTIFICATE_RESPONSE;
+
+    x509cainfo = (X509CAInfo) cainfo;
+  }
+
+  OCSPCAServiceInfo ocspcainfo = null; 
+  java.security.cert.X509Certificate ocspcert = null; 
+  if(editca && !isexternal){
+    Iterator iter = x509cainfo.getExtendedCAServiceInfos().iterator();       
+    while(iter.hasNext()){
+      ExtendedCAServiceInfo serviceinfo = (ExtendedCAServiceInfo) iter.next();
+      if(serviceinfo instanceof OCSPCAServiceInfo){
+        ocspcainfo = (OCSPCAServiceInfo) serviceinfo;
+        if(ocspcainfo.getOCSPSignerCertificatePath() != null)
+          ocspcert = (java.security.cert.X509Certificate) ocspcainfo.getOCSPSignerCertificatePath().get(0);
+      }
+     }
+   }
+
+%>
+<SCRIPT language="JavaScript">
+<!--  
+<% if(!editca){ %>
+  var rootcaprofiles = new Array(<%= rootcaprofiles.keySet().size()%>);
+  var subcaprofiles = new Array(<%= subcaprofiles.keySet().size()%>);
+  var NAME       = 0;
+  var ID         = 1;
+<%
+      Iterator iter = rootcaprofiles.keySet().iterator();
+      int i = 0;
+      while(iter.hasNext()){
+        String next = (String) iter.next();  %> 
+    rootcaprofiles[<%=i%>] = new Array(2);
+    rootcaprofiles[<%=i%>][NAME] = "<%= next %>";      
+    rootcaprofiles[<%=i%>][ID] = <%= rootcaprofiles.get(next) %>;
+   <%   i++; 
+      }
+ 
+      iter = subcaprofiles.keySet().iterator();
+      i = 0;
+      while(iter.hasNext()){
+        String next = (String) iter.next();  %> 
+    subcaprofiles[<%=i%>] = new Array(2);
+    subcaprofiles[<%=i%>][NAME] = "<%= next %>";      
+    subcaprofiles[<%=i%>][ID] = <%= subcaprofiles.get(next) %>;
+   <%   i++; 
+      }
+%>
+      
+function fillCertProfileField(){
+   var certprofselect   =  document.ca.<%=SELECT_CERTIFICATEPROFILE%>; 
+
+   var num = certprofselect.length;
+   for( i=num-1; i >= 0; i-- ){
+       certprofselect.options[i]=null;
+    }   
+ 
+   var profiles = subcaprofiles;
+   if(document.ca.<%= SELECT_SIGNEDBY %>.options[document.ca.<%= SELECT_SIGNEDBY %>.options.selectedIndex].value == <%= CAInfo.SELFSIGNED %>)
+      profiles = rootcaprofiles;
+
+   for( i=0; i < profiles.length; i ++){
+     certprofselect.options[i]=new Option(profiles[i][NAME],
+                                     profiles[i][ID]);    
+     
+   }
+}
+
+  <% if(!processrequest){ %>
+function isExternal(){
+   var makebutton      =  document.ca.<%= BUTTON_MAKEREQUEST %>; 
+   var createbutton    =  document.ca.<%= BUTTON_CREATE %>; 
+   var validityfield   =  document.ca.<%=TEXTFIELD_VALIDITY%>;
+   var certproffield   =  document.ca.<%=SELECT_CERTIFICATEPROFILE %>;
+   var subjectaltname  =  document.ca.<%=TEXTFIELD_SUBJECTALTNAME%>;
+   var policyidfield   =  document.ca.<%=TEXTFIELD_POLICYID%>;
+   var activateocsp    =  document.ca.<%=CHECKBOX_ACTIVATEOCSPSERVICE%>;
+   
+
+   makebutton.disabled = true;
+   createbutton.disabled = false; 
+   validityfield.disabled = false; 
+   certproffield.disabled = false; 
+   subjectaltname.disabled = false; 
+   policyidfield.disabled = false; 
+   activateocsp.disabled = false;
+   activateocsp.checked = true;   
+
+   if(document.ca.<%= SELECT_SIGNEDBY %>.options[document.ca.<%= SELECT_SIGNEDBY %>.options.selectedIndex].value == <%= CAInfo.SIGNEDBYEXTERNALCA %>){
+      makebutton.disabled = false;   
+      createbutton.disabled = true;
+      validityfield.disabled = true; 
+      certproffield.disabled = true; 
+      subjectaltname.disabled = true; 
+      policyidfield.disabled = true;   
+      activateocsp.disabled = true;
+      activateocsp.checked = false;   
+   } 
+}
+
+
+    <% } %>
+<% }
+   if(revokable){ %>
+function confirmrevokation(){
+  var returnval = false;
+  if(document.ca.<%= SELECT_REVOKEREASONS %>.options.selectedIndex == -1){
+     alert("<%= ejbcawebbean.getText("AREVOKEATIONREASON") %>"); 
+     returnval = false;
+  }else{
+    returnval = confirm("<%= ejbcawebbean.getText("AREYOUSUREREVOKECA") %>");
+  } 
+  return returnval;
+}
+
+<%  }  
+
+   if(editca && !isexternal){ %>
+function confirmrenewal(){
+    
+  return confirm("<%= ejbcawebbean.getText("AREYOUSURERENEWCA") %>") && checkallfields();     
+}
+
+  <% if(ocspcert != null){ %>
+function viewocspcert(){        
+    var link = "<%= VIEWCERT_LINK %>?<%= CERTSERNO_PARAMETER %>=<%= java.net.URLEncoder.encode(ocspcert.getSerialNumber().toString(16) + "," + CertTools.getIssuerDN(ocspcert),"UTF-8")%>";
+    link = encodeURI(link);
+    window.open(link, 'view_cert','height=600,width=500,scrollbars=yes,toolbar=no,resizable=1');
+}
+ 
+function checkactivateocsp(){ 
+  if(document.ca.<%=CHECKBOX_ACTIVATEOCSPSERVICE%>.checked){
+    document.ca.<%=BUTTON_REVOKERENEWOCSPCERTIFICATE%>.disabled = false;
+  }
+  else{    
+    document.ca.<%=BUTTON_REVOKERENEWOCSPCERTIFICATE%>.disabled = true;
+  }
+}
+
+<% } 
+}  %>  
+
+function checkusefield(usefield, criticalfield){
+  var usebox = eval("document.ca." + usefield);
+  var cribox = eval("document.ca." + criticalfield);
+  if(usebox.checked){
+    cribox.disabled = false;
+  }
+  else{
+    cribox.checked=false;
+    cribox.disabled = true;
+  }
+}
+
+function checkallfields(){
+    var illegalfields = 0;
+    
+
+    <% if(!editca){ %>
+    if(!checkfieldforcompletednchars("document.ca.<%=TEXTFIELD_SUBJECTDN%>","<%= ejbcawebbean.getText("ONLYCHARACTERS") + " " + ejbcawebbean.getText("SUBJECTDN") %>"))
+      illegalfields++;
+    if((document.ca.<%= TEXTFIELD_SUBJECTDN %>.value == "")){
+      alert("<%= ejbcawebbean.getText("YOUAREREQUIRED") + " " + ejbcawebbean.getText("SUBJECTDN")%>");
+      illegalfields++;
+    }
+   <% } %> 
+
+    <% if(!editca || (editca && cainfo.getSignedBy() != CAInfo.SIGNEDBYEXTERNALCA)){ %>
+    if(!checkfieldfordecimalnumbers("document.ca.<%=TEXTFIELD_VALIDITY%>","<%= ejbcawebbean.getText("ONLYDECNUMBERSINVALIDITY") %>"))
+      illegalfields++;
+    if((document.ca.<%= TEXTFIELD_VALIDITY %>.value == "") && document.ca.<%= SELECT_SIGNEDBY %>.options[document.ca.<%= SELECT_SIGNEDBY %>.options.selectedIndex].value != <%= CAInfo.SIGNEDBYEXTERNALCA %>){
+      alert("<%= ejbcawebbean.getText("YOUAREREQUIRED") + " " + ejbcawebbean.getText("VALIDITY")%>");
+      illegalfields++;
+    }   
+    <% }
+
+       if(catype == CAInfo.CATYPE_X509){ 
+         if(!editca){%>        
+    if(!checkfieldforcompletednchars("document.ca.<%=TEXTFIELD_SUBJECTALTNAME%>","<%= ejbcawebbean.getText("ONLYCHARACTERS") + " " + ejbcawebbean.getText("SUBJECTALTNAME")%>"))
+      illegalfields++;
+   if(!checkfieldforipaddess("document.ca.<%=TEXTFIELD_POLICYID%>","<%= ejbcawebbean.getText("ONLYNUMBERALSANDDOTS") + ejbcawebbean.getText("POLICYID")%>"))
+      illegalfields++;
+      <% } %>
+      <% if(!processrequest){ %>
+    if(!checkfieldfordecimalnumbers("document.ca.<%=TEXTFIELD_CRLPERIOD%>","<%= ejbcawebbean.getText("ONLYDECNUMBERSINCRLPERIOD") %>"))
+      illegalfields++;
+    if((document.ca.<%= TEXTFIELD_CRLPERIOD %>.value == "")){
+      alert("<%= ejbcawebbean.getText("YOUAREREQUIRED") + " " + ejbcawebbean.getText("CRLPERIOD")%>");
+      illegalfields++;
+    }
+    <%  } 
+      }  %> 
+     return illegalfields == 0;  
+   } 
+-->
+
+</SCRIPT>
+<body <% if(!editca) out.write(" onload='fillCertProfileField()' "); %>> 
+<div align="center"> 
+  <% if(processrequest){ %>
+  <h2><%= ejbcawebbean.getText("PROCESSREQUEST") %><br></h2>
+  <h3><%= ejbcawebbean.getText("CANAME")+ " : " + caname %><br>
+      <%= ejbcawebbean.getText("ONLYTHEPUBLICKEY") %></h3>
+  <% }else{
+       if(editca){ %>
+  <h2><%= ejbcawebbean.getText("EDITCA") %><br></h2>
+  <h3><%= ejbcawebbean.getText("CANAME")+ " : " + cainfo.getName() %> </h3>
+  <%   }else{ %>
+   <h2><%= ejbcawebbean.getText("CREATECA") %><br></h2>
+   <h3><%= ejbcawebbean.getText("CANAME")+ " : " + caname %> </h3>
+  <%   }
+     }%>
+</div>
+  <table width="100%" border="0" cellspacing="3" cellpadding="3">
+    <tr id="Row<%=row++%2%>"> 
+      <td width="50%" valign="top"> 
+        <div align="left"> 
+          <h3>&nbsp;</h3>
+        </div>
+      </td>
+      <td width="50%" valign="top"> 
+        <div align="right">
+        <A href="<%=THIS_FILENAME %>"><u><%= ejbcawebbean.getText("BACKTOCAS") %></u></A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+   <!--     <A  onclick='displayHelpWindow("<%= ejbcawebbean.getHelpfileInfix("ca_help.html") + "#cas"%>")'>
+        <u><%= ejbcawebbean.getText("HELP") %></u> </A></div> -->
+      </td>
+    </tr>
+   <% if(!processrequest){ %>
+    <form name="changecatype" action="<%= THIS_FILENAME %>" method="post">
+      <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_CHOOSE_CATYPE %>'>
+      <tr id="Row<%=row++%2%>"> 
+        <td width="50%"  align="right"> 
+          <%= ejbcawebbean.getText("TYPEOFCA") %>
+        </td>
+        <td width="50%" valign="top"> 
+           X509
+        </td>
+      </tr>
+    </form>
+
+    <% if(!isexternal) {
+         if(editca){ %>
+        <tr id="Row<%=row++%2%>">
+          <td width="50%"  align="right">          
+            <%= ejbcawebbean.getText("CATOKENTYPE") %>
+         </td>	 
+	 <td><%= catokentext %>
+         </td>	
+      </tr>
+
+    <%   }else{ %>
+    <form name="changecatokentype" action="<%= THIS_FILENAME %>" method="post">
+       <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_CHOOSE_CATOKENTYPE %>'>
+       <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=caname %>'>
+       <tr id="Row<%=row++%2%>">
+          <td width="50%"  align="right">          
+            <%= ejbcawebbean.getText("CATOKENTYPE") %>
+         </td>	 
+	 <td><select name="<%=SELECT_CATOKEN %>" size="1" onchange="document.changecatokentype.submit()"'>
+                <% for(int i=0; i < numberofavailabletokens; i++){%>
+	 	<option value="<%=availablecatokentypes[i] %>" <% if(catokenpath.equals(availablecatokentypes[i]))
+                                             out.write("selected"); %>><%= availablecatokentypetexts[i] %></option>
+                <% } %>
+	     </select>
+         </td>	
+      </tr>
+    </form>
+    <%   }
+       }
+     }%>
+  <form name="ca" method="post" action="<%=THIS_FILENAME %>" ENCTYPE="post">
+    <input type="hidden" name='<%= HIDDEN_CATOKENTYPE %>' value='<%=catokentype %>'>
+    <input type="hidden" name='<%= HIDDEN_CATYPE %>' value='<%=catype %>'>
+  <% if(processrequest){ %>  
+    <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_PROCESSREQUEST2 %>'>
+    <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=caname %>'>
+  <% } else { %>
+  <%   if(editca){ %>  
+    <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_EDIT_CA %>'>
+    <input type="hidden" name='<%= HIDDEN_CAID %>' value='<%=caid %>'>
+    <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=cainfo.getName() %>'>
+  <%   } else { %>
+    <input type="hidden" name='<%= ACTION %>' value='<%=ACTION_CREATE_CA %>'>
+    <input type="hidden" name='<%= HIDDEN_CANAME %>' value='<%=caname %>'>
+  <%   }
+     }
+   if( catokentype == CATokenInfo.CATOKENTYPE_P12 && !processrequest && !isexternal){ %>
+   <%@ include file="softcatokenpage.jsp" %> 
+<%}  
+   if( catokentype == CATokenInfo.CATOKENTYPE_HSM && !processrequest && !isexternal){ %>
+   <%@ include file="hardcatokenpage.jsp" %> 
+<%}  %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("SUBJECTDN") %>
+      </td>
+      <td width="50%"> 
+        <% if(editca){
+              out.write(cainfo.getSubjectDN() + "<br>"); 
+           }else{ %>
+        <input type="text" name="<%=TEXTFIELD_SUBJECTDN%>" size="40" <% if(processrequest) out.write(" value='" + processedsubjectdn + "'"); %> maxlength="255">
+        <% } %>
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("SIGNEDBY") %>
+      </td>
+      <td width="50%">
+           <% if(processrequest){ %>
+                <select name="<%=SELECT_SIGNEDBY %>" size="1" onchange="fillCertProfileField();">                
+                <% Iterator iter = casigners.keySet().iterator();
+                   while(iter.hasNext()){
+                     String nameofca = (String) iter.next();  %>              
+                     <option value="<%= casigners.get(nameofca)%>"><%= nameofca %></option>  
+                <% } %> 
+	        </select> 
+           <% }else{
+                if(editca){
+                if(cainfo.getSignedBy() >= 0 && cainfo.getSignedBy() <= CAInfo.SPECIALCAIDBORDER){
+                  if(cainfo.getSignedBy() == CAInfo.SELFSIGNED)
+                    out.write(ejbcawebbean.getText("SELFSIGNED"));
+                  if(cainfo.getSignedBy() == CAInfo.SIGNEDBYEXTERNALCA)
+                    out.write(ejbcawebbean.getText("SIGNEDBYEXTERNALCA"));
+                }else
+                  out.write((String) caidtonamemap.get(new Integer(cainfo.getSignedBy())));
+              }else{%>
+        <select name="<%=SELECT_SIGNEDBY %>" size="1" onchange="fillCertProfileField(); isExternal()">
+                <option value="<%= CAInfo.SELFSIGNED%>" selected><%= ejbcawebbean.getText("SELFSIGNED") %></option>  
+                <option value="<%= CAInfo.SIGNEDBYEXTERNALCA%>"><%= ejbcawebbean.getText("EXTERNALCA") %></option>  
+                <% Iterator iter = casigners.keySet().iterator();
+                   while(iter.hasNext()){
+                     String nameofca = (String) iter.next();  %>              
+                     <option value="<%= casigners.get(nameofca)%>"><%= nameofca %></option>  
+                <% } %> 
+	 </select>
+           <%   }
+              }%> 
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("CERTIFICATEPROFILE") %>
+      </td>
+      <td width="50%"> 
+           <% if(editca){
+                if(cainfo.getCertificateProfileId() != 0)
+                  out.write((String) certprofileidtonamemap.get(new Integer(cainfo.getCertificateProfileId())));
+                else
+                  out.write(ejbcawebbean.getText("NOTUSED"));
+              }else{%>
+        <select name="<%=SELECT_CERTIFICATEPROFILE %>" size="1" >                
+	</select>
+           <% } %> 
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("VALIDITY") %> (<%= ejbcawebbean.getText("DAYS") %>)
+      </td>
+      <td width="50%"> 
+        <% if(isexternal || (editca && cainfo.getSignedBy() == CAInfo.SIGNEDBYEXTERNALCA)){
+              if(cainfo.getValidity() != 0)
+                out.write("" + cainfo.getValidity());
+              else
+                out.write(ejbcawebbean.getText("NOTUSED"));
+           }else{ %>
+        <input type="text" name="<%=TEXTFIELD_VALIDITY%>" size="5" maxlength="255" 
+           <% if(editca) out.write(" value='" +cainfo.getValidity() + "'> <i>" + 
+                                    ejbcawebbean.getText("USEDINCARENEWAL") + "</i>");
+              else out.write(">");
+           }%>
+      </td>
+    </tr>
+    <tr id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("DESCRIPTION") %>
+      </td>
+      <td width="50%"> 
+        <% if(isexternal){
+              out.write(cainfo.getDescription());
+           }else{ %>
+        <textarea name="<%=TEXTFIELD_DESCRIPTION%>" cols=40 rows=6><% if(editca) out.write(cainfo.getDescription());%></textarea>
+       <% } %>
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        &nbsp;
+      </td>
+      <td width="50%"> 
+        &nbsp;
+      </td>
+    </tr>
+   <% if(catype == CAInfo.CATYPE_X509){ 
+        
+        %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("SUBJECTALTNAME") %>
+      </td>
+      <td width="50%">
+         <% if(editca)
+              if(x509cainfo.getSubjectAltName() == null || x509cainfo.getSubjectAltName().trim().equals(""))
+                out.write(ejbcawebbean.getText("NONE")); 
+              else
+                out.write(x509cainfo.getSubjectAltName());                
+            else{  %>  
+         <input type="text" name="<%=TEXTFIELD_SUBJECTALTNAME%>" size="40" maxlength="255">
+         <% } %>   
+      </td>
+    </tr> 
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("POLICYID") %>
+        <% if(!editca) out.write("<br><i>" + ejbcawebbean.getText("LEAVEBLANKTOUSEDEFAULT") + "</i>");%>
+      </td>
+      <td width="50%">
+         <% if(editca) 
+              if(x509cainfo.getPolicyId() == null || x509cainfo.getPolicyId().trim().equals(""))
+                out.write(ejbcawebbean.getText("NONE")); 
+              else
+                out.write(x509cainfo.getPolicyId());                
+            else{  %>  
+         <input type="text" name="<%=TEXTFIELD_POLICYID%>" size="40" maxlength="255">
+         <% } %>   
+      </td>
+    </tr> 
+   <% if(!processrequest && !isexternal){ %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("CRLSPECIFICDATA") %>
+      </td>
+      <td width="50%"> 
+        &nbsp;
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+         <%= ejbcawebbean.getText("AUTHORITYKEYID") %> <br> <%= ejbcawebbean.getText("AUTHORITYKEYIDCRITICAL") %> 
+      </td>
+      <td width="50%">
+           <input type="checkbox" name="<%=CHECKBOX_AUTHORITYKEYIDENTIFIER %>" onClick="checkusefield('<%=CHECKBOX_AUTHORITYKEYIDENTIFIER %>', '<%=CHECKBOX_AUTHORITYKEYIDENTIFIERCRITICAL %>')" value="<%=CHECKBOX_VALUE %>" 
+           <% if((editca && x509cainfo.getUseAuthorityKeyIdentifier()) || !editca)
+                 out.write("CHECKED");
+              if(isexternal) out.write(" disabled ");
+           %>> <br> 
+          <input type="checkbox" name="<%=CHECKBOX_AUTHORITYKEYIDENTIFIERCRITICAL %>" value="<%=CHECKBOX_VALUE %>" 
+           <%
+             if(editca){
+               if(!x509cainfo.getUseAuthorityKeyIdentifier() || isexternal)
+                 out.write(" disabled ");  
+               else
+               if(x509cainfo.getAuthorityKeyIdentifierCritical())
+                 out.write("CHECKED");
+             }%>> 
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+         <%= ejbcawebbean.getText("CRLNUMBER") %> <br> <%= ejbcawebbean.getText("CRLNUMBERCRITICAL") %> 
+      </td>
+      <td width="50%">
+           <input type="checkbox" name="<%=CHECKBOX_USECRLNUMBER %>" onClick="checkusefield('<%=CHECKBOX_USECRLNUMBER %>', '<%=CHECKBOX_CRLNUMBERCRITICAL %>')" value="<%=CHECKBOX_VALUE %>" 
+           <% if((editca && x509cainfo.getUseCRLNumber()) || !editca)
+                 out.write("CHECKED");
+              if(isexternal) out.write(" disabled "); 
+           %>> <br> 
+          <input type="checkbox" name="<%=CHECKBOX_CRLNUMBERCRITICAL %>" value="<%=CHECKBOX_VALUE %>" 
+           <%
+             if(editca){
+               if(!x509cainfo.getUseCRLNumber() || isexternal)
+                 out.write(" disabled ");  
+               else
+               if(x509cainfo.getCRLNumberCritical())
+                 out.write("CHECKED");
+             }%>> 
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("CRLPERIOD") %> (<%= ejbcawebbean.getText("HOURS") %>)
+      </td>
+      <td width="50%">
+           <% if(isexternal){
+                out.write("" + x509cainfo.getCRLPeriod());
+              }else{ %>
+         <input type="text" name="<%=TEXTFIELD_CRLPERIOD%>" size="40" maxlength="255"
+            <% if(editca) out.write(" value='" + x509cainfo.getCRLPeriod()+ "'");%>>
+           <% } %> 
+      </td>
+    </tr>    
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%" align="right"> 
+        <%= ejbcawebbean.getText("CRLPUBLISHERS") %> <br>&nbsp;
+      </td>
+      <td width="50%"> 
+        <select name="<%=SELECT_AVAILABLECRLPUBLISHERS%>" size="5" multiple >
+           <%   Collection usedpublishers = null;
+                if(editca) usedpublishers = x509cainfo.getCRLPublishers(); 
+                Iterator iter = publisheridtonamemap.keySet().iterator(); 
+                while(iter.hasNext()){
+                  Integer next = (Integer) iter.next(); %>
+           <option  value="<%= next %>" 
+              <%    if(editca && usedpublishers.contains(next))
+                      out.write(" selected ");
+                  %>>
+              <%= publisheridtonamemap.get(next) %>         
+           </option>  
+              <% } %>
+        </select>
+      </td>
+    </tr>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("OTHERDATA") %>
+      </td>
+      <td width="50%"> 
+        &nbsp;
+      </td>
+    </tr>
+    <% if(!editca || (editca && ocspcainfo != null)){ %>
+    <tr id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("OCSPSERVICE") %>
+      </td>
+      <td width="50%"> <%= ejbcawebbean.getText("ACTIVE") %> 
+        <input type="checkbox" onclick="checkactivateocsp()" name="<%=CHECKBOX_ACTIVATEOCSPSERVICE %>" value="<%=CHECKBOX_VALUE %>" 
+           <% if(waitingresponse) out.write(" disabled ");%>
+            <% if((editca && (ocspcainfo.getStatus() == ExtendedCAServiceInfo.STATUS_ACTIVE)) || !editca)
+                 out.write("CHECKED");%>>
+         <% if(editca && ocspcert != null){ %> &nbsp;&nbsp;         
+         <input type="submit" name="<%= BUTTON_REVOKERENEWOCSPCERTIFICATE %>" <% if(ocspcainfo.getStatus() != ExtendedCAServiceInfo.STATUS_ACTIVE || waitingresponse) out.write(" disabled ");%> value="<%= ejbcawebbean.getText("REVOKERENEWOCSPCERT") %>" >
+         <br>         
+         <a style="cursor:hand;" onClick="viewocspcert()"><u><%= ejbcawebbean.getText("VIEWOCSPCERTIFICATE")%></u></a>
+         <% } %>
+      </td>
+    </tr>    
+    <% } %>
+    <tr id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        <%= ejbcawebbean.getText("FINISHUSER") %>
+      </td>
+      <td width="50%"> 
+        <input type="checkbox" name="<%=CHECKBOX_FINISHUSER %>" value="<%=CHECKBOX_VALUE %>" 
+            <% if((editca && x509cainfo.getFinishUser()) || !editca)
+                 out.write("CHECKED");%>>         
+      </td>
+    </tr>
+   <%  } 
+    }
+    if(editca && !waitingresponse){%>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="50%"  align="right"> 
+        &nbsp;
+      </td>
+      <td width="50%"> 
+        <a style="cursor:hand;" onClick="window.open('<%=VIEWCERT_LINK%>?caid=<%=caid%>', 'view_cert','height=600,width=600,scrollbars=yes,toolbar=no,resizable=1')";><u><%= ejbcawebbean.getText("VIEWCACERTIFICATE")%></u></a>
+      </td>
+    </tr>
+    <% } %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="49%" valign="top">&nbsp;</td>
+      <td width="51%" valign="top"> 
+      <% if(!isexternal){ 
+           if(processrequest){ %>
+          <input type="submit" name="<%= BUTTON_PROCESSREQUEST %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("PROCESSREQUEST") %>">
+      <% }else{
+            if(editca){ %>
+          <input type="submit" name="<%= BUTTON_SAVE %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("SAVE") %>">
+        <%  }else{ %>
+          <input type="submit" name="<%= BUTTON_CREATE %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("CREATE") %>">
+        <%  }
+         } %>   
+        <input type="submit" name="<%= BUTTON_CANCEL %>" value="<%= ejbcawebbean.getText("CANCEL") %>">
+        <% }else{ %>
+        <input type="submit" name="<%= BUTTON_CANCEL %>" value="<%= ejbcawebbean.getText("BACK") %>">
+        <% } %>
+      </td>
+    </tr>
+       <% if(editca && revokable){ %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="49%" valign="top">&nbsp;</td>
+      <td width="51%" valign="top">         
+        <select name="<%=SELECT_REVOKEREASONS %>" >
+          <% for(int i=0; i < RevokedInfoView.reasontexts.length; i++){ 
+               if(i!= 7){%>
+               <option value='<%= i%>'><%= ejbcawebbean.getText(RevokedInfoView.reasontexts[i]) %></option>
+          <%   } 
+             } %>
+        </select>
+        <input type="submit" name="<%= BUTTON_REVOKECA %>" value="<%= ejbcawebbean.getText("REVOKE") %>" onClick='return confirmrevokation()'>     
+      </td>
+    </tr>
+        <% } %>   
+       <% if(!editca && !processrequest){ %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="49%" valign="top" align="right"></td>
+      <td width="51%" valign="top">             
+        <input type="submit" disabled name="<%= BUTTON_MAKEREQUEST %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("MAKEREQUEST") %>" >
+      </td>
+    </tr>
+        <% } %>   
+       <% if(editca && !isexternal && !waitingresponse){ %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="49%" valign="top" align="right"></td>
+      <td width="51%" valign="top">             
+        <input type="submit" name="<%= BUTTON_RENEWCA %>" onClick='return confirmrenewal()' value="<%= ejbcawebbean.getText("RENEWCA") %>" >
+      </td>
+    </tr>
+        <% } %>   
+       <% if(editca && waitingresponse){ %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="49%" valign="top" align="right"></td>
+      <td width="51%" valign="top">             
+        <input type="submit" name="<%= BUTTON_RECEIVEREQUEST %>" onClick='return checkallfields()' value="<%= ejbcawebbean.getText("RECIEVEREQUEST") %>" >
+      </td>
+    </tr>
+        <% } %>   
+       <% if(editca && !isexternal && !waitingresponse){ %>
+    <tr  id="Row<%=row++%2%>"> 
+      <td width="49%" valign="top" align="right"></td>
+      <td width="51%" valign="top">             
+        <input type="submit" name="<%= BUTTON_PUBLISHCA %>"  value="<%= ejbcawebbean.getText("REPUBLISHCA") %>" >
+      </td>
+    </tr>
+        <% } %>   
+  </form>
+  </table>
diff -urN ../../305/ejbca/src/adminweb/ca/editcas/hardcatokenpage.jsp ./src/adminweb/ca/editcas/hardcatokenpage.jsp
--- ../../305/ejbca/src/adminweb/ca/editcas/hardcatokenpage.jsp	Mon May 10 06:35:43 2004
+++ ./src/adminweb/ca/editcas/hardcatokenpage.jsp	Thu Mar 31 15:27:34 2005
@@ -17,7 +17,7 @@
         <%= ejbcawebbean.getText("AUTHENTICATIONCODE") %>
       </td>
       <td width="50%"> 
-        <input type="text" name="<%=TEXTFIELD_AUTHENTICATIONCODE%>" size="40" maxlength="255">
+        <input type="password" name="<%=TEXTFIELD_AUTHENTICATIONCODE%>" size="40" maxlength="255">
       </td>
     </tr>
     <% }%>
diff -urN ../../305/ejbca/src/adminweb/languages/languagefile.en.properties ./src/adminweb/languages/languagefile.en.properties
--- ../../305/ejbca/src/adminweb/languages/languagefile.en.properties	Tue Jan 25 18:08:14 2005
+++ ./src/adminweb/languages/languagefile.en.properties	Thu Mar 31 16:34:04 2005
@@ -1499,7 +1499,7 @@
 
 ONLYNUMBERALSANDDOTS      = Only numerals and '.' are allowed in field 
 
-ONLYSTATUSCANBESELECTED   = Only status values New, Generated or Historical can be selected.  
+ONLYSTATUSCANBESELECTED   = Only status values New (Or Key Recovery), Generated or Historical can be selected.  
 
 ONLYKRSTATUSCANBESELECTED = Only status values New, Key Recovery, Generated or Historical can be selected.  
 
diff -urN ../../305/ejbca/src/adminweb/ra/editendentity.jsp ./src/adminweb/ra/editendentity.jsp
--- ../../305/ejbca/src/adminweb/ra/editendentity.jsp	Tue Jan 25 16:10:56 2005
+++ ./src/adminweb/ra/editendentity.jsp	Thu Mar 31 16:34:05 2005
@@ -299,7 +299,7 @@
   
               if(request.getParameter(SELECT_CHANGE_STATUS)!=null){
                 int newstatus = Integer.parseInt(request.getParameter(SELECT_CHANGE_STATUS));
-                if(newstatus == UserDataRemote.STATUS_NEW || newstatus == UserDataRemote.STATUS_GENERATED || newstatus == UserDataRemote.STATUS_HISTORICAL )
+                if(newstatus == UserDataRemote.STATUS_NEW || newstatus == UserDataRemote.STATUS_GENERATED || newstatus == UserDataRemote.STATUS_HISTORICAL || newstatus == UserDataRemote.STATUS_KEYRECOVERY)
                   newuser.setStatus(newstatus); 
               }
                // Send changes to database.
@@ -1118,7 +1118,11 @@
       </td>
       <td > 
         <select name="<%=SELECT_CHANGE_STATUS %>" tabindex="<%=tabindex++%>" >
+         <%if(userdata.getStatus()== UserDataRemote.STATUS_KEYRECOVERY){ %>
+           <option selected value='<%= UserDataRemote.STATUS_KEYRECOVERY %>'><%= ejbcawebbean.getText("STATUSKEYRECOVERY") %></option>
+         <% }else{ %>  
          <option <%if(userdata.getStatus()== UserDataRemote.STATUS_NEW) out.write(" selected ");%> value='<%= UserDataRemote.STATUS_NEW %>'><%= ejbcawebbean.getText("STATUSNEW") %></option>
+         <% } %>
          <option <%if(userdata.getStatus()== UserDataRemote.STATUS_FAILED) out.write(" selected ");%> value='<%= UserDataRemote.STATUS_FAILED %>'><%= ejbcawebbean.getText("STATUSFAILED") %></option>  -->
          <option <%if(userdata.getStatus()== UserDataRemote.STATUS_INITIALIZED) out.write(" selected ");%> value='<%= UserDataRemote.STATUS_INITIALIZED %>'><%= ejbcawebbean.getText("STATUSINITIALIZED") %></option>  -->
          <option <%if(userdata.getStatus()== UserDataRemote.STATUS_INPROCESS) out.write(" selected ");%> value='<%= UserDataRemote.STATUS_INPROCESS %>'><%= ejbcawebbean.getText("STATUSINPROCESS") %></option>  -->
diff -urN ../../305/ejbca/src/ca/ca/META-INF/ejb-jar.xml ./src/ca/ca/META-INF/ejb-jar.xml
--- ../../305/ejbca/src/ca/ca/META-INF/ejb-jar.xml	Wed Jan  5 18:22:20 2005
+++ ./src/ca/ca/META-INF/ejb-jar.xml	Thu Mar 31 16:34:05 2005
@@ -137,6 +137,22 @@
         <local>se.anatom.ejbca.log.ILogSessionLocal</local>
         <ejb-link>LogSession</ejb-link>
      </ejb-local-ref>
+     <ejb-local-ref>
+        <description>The RA Admin session bean</description>
+        <ejb-ref-name>ejb/RaAdminSessionLocal</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local-home>se.anatom.ejbca.ra.raadmin.IRaAdminSessionLocalHome</local-home>
+        <local>se.anatom.ejbca.ra.raadmin.IRaAdminSessionLocal</local>
+        <ejb-link>RaAdminSession</ejb-link>
+     </ejb-local-ref>
+     <ejb-local-ref>
+        <description>The Key Recovery Session Bean</description>
+        <ejb-ref-name>ejb/KeyRecoverySessionLocal</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local-home>se.anatom.ejbca.keyrecovery.IKeyRecoverySessionLocalHome</local-home>
+        <local>se.anatom.ejbca.keyrecovery.IKeyRecoverySessionLocal</local>
+        <ejb-link>KeyRecoverySession</ejb-link>
+     </ejb-local-ref>     
 
      <security-identity>
         <description></description>
diff -urN ../../305/ejbca/src/ca/ca/META-INF/jbosscmp-jdbc-sybase.xml ./src/ca/ca/META-INF/jbosscmp-jdbc-sybase.xml
--- ../../305/ejbca/src/ca/ca/META-INF/jbosscmp-jdbc-sybase.xml	Wed Mar 31 12:47:20 2004
+++ ./src/ca/ca/META-INF/jbosscmp-jdbc-sybase.xml	Mon Mar  7 13:15:07 2005
@@ -4,7 +4,7 @@
 
 <defaults>
     <datasource>java:/DefaultDS</datasource>
-    <datasource-mapping>mySQL</datasource-mapping>
+    <datasource-mapping>Sybase</datasource-mapping>
 </defaults>
 
 <!-- Default setting for mySQL in EJBCA version > 2.0. 
diff -urN ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-mssql2000.xml ./src/hardtoken/META-INF/jbosscmp-jdbc-mssql2000.xml
--- ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-mssql2000.xml	Fri Jan  9 19:13:02 2004
+++ ./src/hardtoken/META-INF/jbosscmp-jdbc-mssql2000.xml	Fri Feb 18 17:59:27 2005
@@ -6,7 +6,7 @@
     <datasource>java:/DefaultDS</datasource>
     <datasource-mapping>MS SQLSERVER2000</datasource-mapping>
 </defaults>
-
+<enterprise-beans>
     <entity>
         <ejb-name>HardTokenProfileData</ejb-name>
         <cmp-field>
@@ -15,5 +15,6 @@
             <sql-type>TEXT</sql-type>
         </cmp-field>
     </entity>
-
+ 
+</enterprise-beans>
 </jbosscmp-jdbc>
diff -urN ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-mysql.xml ./src/hardtoken/META-INF/jbosscmp-jdbc-mysql.xml
--- ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-mysql.xml	Fri Jan  9 12:59:55 2004
+++ ./src/hardtoken/META-INF/jbosscmp-jdbc-mysql.xml	Fri Feb 18 17:59:26 2005
@@ -7,6 +7,7 @@
         <datasource-mapping>mySQL</datasource-mapping>
     </defaults>
 
+ <enterprise-beans>
     <entity>
         <ejb-name>HardTokenProfileData</ejb-name>
         <cmp-field>
@@ -16,4 +17,5 @@
         </cmp-field>
     </entity>
 
+  </enterprise-beans>
 </jbosscmp-jdbc>
diff -urN ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-oracle.xml ./src/hardtoken/META-INF/jbosscmp-jdbc-oracle.xml
--- ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-oracle.xml	Fri Jan  9 19:13:02 2004
+++ ./src/hardtoken/META-INF/jbosscmp-jdbc-oracle.xml	Sun Feb 20 11:39:04 2005
@@ -7,6 +7,7 @@
     <datasource-mapping>Oracle8</datasource-mapping>
   </defaults>
 
+<enterprise-beans>
     <entity>
         <ejb-name>HardTokenProfileData</ejb-name>
         <cmp-field>
@@ -15,5 +16,6 @@
             <sql-type>LONG</sql-type>
         </cmp-field>
     </entity>
+</enterprise-beans>
 
 </jbosscmp-jdbc>
diff -urN ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-sybase.xml ./src/hardtoken/META-INF/jbosscmp-jdbc-sybase.xml
--- ../../305/ejbca/src/hardtoken/META-INF/jbosscmp-jdbc-sybase.xml	Wed Mar 31 12:47:21 2004
+++ ./src/hardtoken/META-INF/jbosscmp-jdbc-sybase.xml	Fri Feb 18 17:59:27 2005
@@ -6,7 +6,7 @@
         <datasource>java:/DefaultDS</datasource>
         <datasource-mapping>Sybase</datasource-mapping>
     </defaults>
-
+<enterprise-beans>  
     <entity>
         <ejb-name>HardTokenProfileData</ejb-name>
         <cmp-field>
@@ -15,5 +15,6 @@
             <sql-type>IMAGE</sql-type>
         </cmp-field>
     </entity>
+</enterprise-beans>    
 
 </jbosscmp-jdbc>
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/apply/RequestHelper.java ./src/java/se/anatom/ejbca/apply/RequestHelper.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/apply/RequestHelper.java	Tue Sep 28 18:18:13 2004
+++ ./src/java/se/anatom/ejbca/apply/RequestHelper.java	Fri Mar  4 16:56:52 2005
@@ -251,7 +251,6 @@
         throws Exception {
         if (certs.length == 0) {
             log.error("0 length certificate can not be sent to NS client!");
-
             return;
         }
 
@@ -278,10 +277,17 @@
         throws Exception {
         if (b64cert.length == 0) {
             log.error("0 length certificate can not be sent to client!");
-
             return;
         }
 
+        if (out.containsHeader("Pragma")) {
+            log.debug("Removing Pragma header to avoid caching issues in IE");
+            out.setHeader("Pragma",null);
+        }
+        if (out.containsHeader("Cache-Control")) {
+            log.debug("Removing Cache-Control header to avoid caching issues in IE");
+            out.setHeader("Cache-Control",null);
+        }
         // Set content-type to general file
         out.setContentType("application/octet-stream");        
         out.setHeader("Content-disposition", "filename=cert.pem");
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/auth/LocalAuthenticationSessionBean.java ./src/java/se/anatom/ejbca/ca/auth/LocalAuthenticationSessionBean.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/auth/LocalAuthenticationSessionBean.java	Thu May 13 17:34:40 2004
+++ ./src/java/se/anatom/ejbca/ca/auth/LocalAuthenticationSessionBean.java	Thu Mar 31 16:34:04 2005
@@ -22,6 +22,8 @@
 import se.anatom.ejbca.BaseSessionBean;
 import se.anatom.ejbca.ca.exception.AuthLoginException;
 import se.anatom.ejbca.ca.exception.AuthStatusException;
+import se.anatom.ejbca.keyrecovery.IKeyRecoverySessionLocal;
+import se.anatom.ejbca.keyrecovery.IKeyRecoverySessionLocalHome;
 import se.anatom.ejbca.log.Admin;
 import se.anatom.ejbca.log.ILogSessionLocal;
 import se.anatom.ejbca.log.ILogSessionLocalHome;
@@ -29,19 +31,28 @@
 import se.anatom.ejbca.ra.UserDataLocal;
 import se.anatom.ejbca.ra.UserDataLocalHome;
 import se.anatom.ejbca.ra.UserDataPK;
+import se.anatom.ejbca.ra.raadmin.IRaAdminSessionLocal;
+import se.anatom.ejbca.ra.raadmin.IRaAdminSessionLocalHome;
 
 
 /**
  * Authenticates users towards a user database.
  *
- * @version $Id: LocalAuthenticationSessionBean.java,v 1.26 2004/05/13 15:34:40 herrvendil Exp $
+ * @version $Id: LocalAuthenticationSessionBean.java,v 1.26.2.1 2005/03/31 14:34:04 herrvendil Exp $
  */
 public class LocalAuthenticationSessionBean extends BaseSessionBean {
     /** home interface to user entity bean */
     private UserDataLocalHome userHome = null;
 
-    /** The remote interface of the log session bean */
+    /** The local interface of the log session bean */
     private ILogSessionLocal logsession;
+    
+    /** The local interface of the keyrecovery session bean */
+    private IKeyRecoverySessionLocal keyrecoverysession = null;
+    
+    /** boolean indicating if keyrecovery should be used. */
+    private boolean usekeyrecovery = true;
+    
 
     /**
      * Default create for SessionBean without any creation Arguments.
@@ -63,6 +74,33 @@
 
         debug("<ejbCreate()");
     }
+    
+    /**
+     * Method returning the keyrecovery session if key recovery is configured in the globalconfiguration
+     * else null is returned. 
+     * 
+     * @param admin
+     * @return
+     */
+    private IKeyRecoverySessionLocal getKeyRecoverySession(Admin admin){
+    	if(usekeyrecovery && keyrecoverysession == null){
+    		try{
+              IRaAdminSessionLocalHome raadminhome = (IRaAdminSessionLocalHome) lookup("java:comp/env/ejb/RaAdminSessionLocal", IRaAdminSessionLocalHome.class);                            
+              IRaAdminSessionLocal raadmin = raadminhome.create();        
+              usekeyrecovery = (raadmin.loadGlobalConfiguration(admin)).getEnableKeyRecovery();
+
+              if(usekeyrecovery){
+                IKeyRecoverySessionLocalHome keyrecoveryhome = (IKeyRecoverySessionLocalHome) lookup("java:comp/env/ejb/KeyRecoverySessionLocal", IKeyRecoverySessionLocalHome.class);
+                keyrecoverysession = keyrecoveryhome.create();
+              }
+    		}catch(Exception e){
+    			  e.printStackTrace();
+    	          throw new EJBException(e);
+            }
+    	}
+    	
+    	return keyrecoverysession;
+    }
 
     /**
      * Implements IAuthenticationSession::authenticateUser. Implements a mechanism that queries a
@@ -131,6 +169,12 @@
             UserDataLocal data = userHome.findByPrimaryKey(pk);
             data.setStatus(UserDataLocal.STATUS_GENERATED);
             data.setTimeModified((new Date()).getTime());
+            
+            // Reset key recoveryflag if keyrecovery is used.
+            if(this.getKeyRecoverySession(admin) != null){            	
+              getKeyRecoverySession(admin).unmarkUser(admin,username);
+            }
+            
             logsession.log(admin, data.getCAId(), LogEntry.MODULE_CA, new java.util.Date(),username, null, LogEntry.EVENT_INFO_CHANGEDENDENTITY,"Changed status to STATUS_GENERATED.");
             debug("<finishUser("+username+", hiddenpwd)");
         } catch (ObjectNotFoundException oe) {            
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/auth/junit/TestAuthenticationSession.java ./src/java/se/anatom/ejbca/ca/auth/junit/TestAuthenticationSession.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/auth/junit/TestAuthenticationSession.java	Fri Apr 16 09:38:59 2004
+++ ./src/java/se/anatom/ejbca/ca/auth/junit/TestAuthenticationSession.java	Thu Mar 31 16:34:02 2005
@@ -13,6 +13,8 @@
  
 package se.anatom.ejbca.ca.auth.junit;
 
+import java.security.KeyPair;
+import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Random;
 
@@ -27,17 +29,26 @@
 import se.anatom.ejbca.ca.auth.IAuthenticationSessionHome;
 import se.anatom.ejbca.ca.auth.IAuthenticationSessionRemote;
 import se.anatom.ejbca.ca.auth.UserAuthData;
+import se.anatom.ejbca.ca.sign.ISignSessionHome;
+import se.anatom.ejbca.ca.sign.ISignSessionRemote;
+import se.anatom.ejbca.keyrecovery.IKeyRecoverySessionHome;
+import se.anatom.ejbca.keyrecovery.IKeyRecoverySessionRemote;
 import se.anatom.ejbca.log.Admin;
 import se.anatom.ejbca.ra.IUserAdminSessionHome;
 import se.anatom.ejbca.ra.IUserAdminSessionRemote;
 import se.anatom.ejbca.ra.UserDataHome;
 import se.anatom.ejbca.ra.UserDataPK;
 import se.anatom.ejbca.ra.UserDataRemote;
+import se.anatom.ejbca.ra.raadmin.GlobalConfiguration;
+import se.anatom.ejbca.ra.raadmin.IRaAdminSessionHome;
+import se.anatom.ejbca.ra.raadmin.IRaAdminSessionRemote;
+import se.anatom.ejbca.util.CertTools;
+import se.anatom.ejbca.util.KeyTools;
 
 /**
  * Tests authentication session used by signer.
  *
- * @version $Id: TestAuthenticationSession.java,v 1.19 2004/04/16 07:38:59 anatom Exp $
+ * @version $Id: TestAuthenticationSession.java,v 1.19.2.1 2005/03/31 14:34:02 herrvendil Exp $
  */
 public class TestAuthenticationSession extends TestCase {
     private static Logger log = Logger.getLogger(TestAuthenticationSession.class);
@@ -45,9 +56,11 @@
     private static Context ctx;
     private static IAuthenticationSessionRemote remote;
     private static IUserAdminSessionRemote usersession;
+    private static IKeyRecoverySessionRemote keyrecsession;
+    private static IRaAdminSessionRemote raadminsession;
     private static String username;
     private static String pwd;
-    private static int caid=1;
+    private static int caid="CN=TEST".hashCode();
     private static Admin admin = null;
 
     /**
@@ -61,6 +74,8 @@
 
     protected void setUp() throws Exception {
         log.debug(">setUp()");
+        
+        CertTools.installBCProvider();
 
         ctx = getInitialContext();
         Object obj = ctx.lookup("AuthenticationSession");
@@ -70,7 +85,14 @@
         IUserAdminSessionHome userhome = (IUserAdminSessionHome) javax.rmi.PortableRemoteObject.narrow(obj, IUserAdminSessionHome.class);        
         usersession = userhome.create();
         admin = new Admin(Admin.TYPE_INTERNALUSER);
-
+        obj = ctx.lookup("KeyRecoverySession");    
+        IKeyRecoverySessionHome keyrechome = (IKeyRecoverySessionHome) javax.rmi.PortableRemoteObject.narrow(obj, IKeyRecoverySessionHome.class);
+        keyrecsession = keyrechome.create();
+        
+        obj = ctx.lookup("RaAdminSession");
+        IRaAdminSessionHome raadminsessionhome = (IRaAdminSessionHome) javax.rmi.PortableRemoteObject.narrow(obj, IRaAdminSessionHome.class);                
+        raadminsession = raadminsessionhome.create();
+        
         log.debug("<setUp()");
     }
 
@@ -196,15 +218,61 @@
     }
 
     /**
+     * Test reset of key recovery mark.
+     * 
+     * @throws Exception
+     */
+    public void test05UnmarkKeyRecoveryOnFinish() throws Exception {
+    	log.debug(">test05UnmarkKeyRecoveryOnFinish()");
+    	
+    	GlobalConfiguration config = raadminsession.loadGlobalConfiguration(admin);
+    	boolean orgkeyrecconfig = config.getEnableKeyRecovery();
+    	config.setEnableKeyRecovery(true);
+    	raadminsession.saveGlobalConfiguration(admin,config);
+    	
+        // create certificate for user
+        Object obj1 = ctx.lookup("UserData");
+        UserDataHome userhome = (UserDataHome) javax.rmi.PortableRemoteObject.narrow(obj1, UserDataHome.class);
+        UserDataPK pk = new UserDataPK(username);
+        UserDataRemote data = userhome.findByPrimaryKey(pk);
+        // Set status to NEW
+        data.setStatus(UserDataRemote.STATUS_NEW);
+        data.setPassword("foo123");
+    	
+    	// Create a dummy certificate and keypair.
+    	KeyPair keys = KeyTools.genKeys(2048);
+        ISignSessionHome home = (ISignSessionHome) javax.rmi.PortableRemoteObject.narrow(getInitialContext().lookup("RSASignSession"), ISignSessionHome.class);
+        ISignSessionRemote ss = home.create();
+    	X509Certificate cert = (X509Certificate) ss.createCertificate(admin,username,"foo123",keys.getPublic()); 
+    	
+    	// First mark the user for recovery
+    	keyrecsession.addKeyRecoveryData(admin, cert, username, keys);
+		keyrecsession.markNewestAsRecoverable(admin,username);
+    	
+    	// Now finish the user (The actual test)
+		remote.finishUser(admin,username,pwd);
+		// And se if the user is still marked
+		
+		assertTrue("Failure the Users keyrecovery session should have been unmarked", !keyrecsession.isUserMarked(admin,username));
+		
+		// Clean up
+		keyrecsession.removeAllKeyRecoveryData(admin,username);
+		
+		config.setEnableKeyRecovery(orgkeyrecconfig);
+    	raadminsession.saveGlobalConfiguration(admin,config);
+    	log.debug("<test05UnmarkKeyRecoveryOnFinish()");
+    }
+    
+    /**
      * Delete user after completed tests
      *
      * @throws Exception error
      */
-    public void test05DeleteUser() throws Exception {
-        log.debug(">test01DeleteUser()");
+    public void test06DeleteUser() throws Exception {
+        log.debug(">test06DeleteUser()");
         String email = username+"@anatom.se";
         usersession.deleteUser(admin,username);
         log.debug("deleted user: "+username);
-        log.debug("<test01DeleteUser()");
+        log.debug("<test06DeleteUser()");
     }
 }
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/CA.java ./src/java/se/anatom/ejbca/ca/caadmin/CA.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/CA.java	Mon May 10 11:24:06 2004
+++ ./src/java/se/anatom/ejbca/ca/caadmin/CA.java	Wed Mar 30 08:51:42 2005
@@ -40,6 +40,7 @@
 import se.anatom.ejbca.ca.caadmin.extendedcaservices.OCSPCAService;
 import se.anatom.ejbca.ca.caadmin.extendedcaservices.OCSPCAServiceInfo;
 import se.anatom.ejbca.ca.caadmin.extendedcaservices.OCSPCAServiceRequest;
+import se.anatom.ejbca.ca.caadmin.hardcatokens.HardCATokenManager;
 import se.anatom.ejbca.ca.exception.IllegalKeyStoreException;
 import se.anatom.ejbca.ca.exception.SignRequestSignatureException;
 import se.anatom.ejbca.ca.store.certificateprofiles.CertificateProfile;
@@ -50,7 +51,7 @@
 /**
  * CA is a base class that should be inherited by all CA types
  *
- * @version $Id: CA.java,v 1.11 2004/05/10 09:24:06 anatom Exp $
+ * @version $Id: CA.java,v 1.11.2.1 2005/03/30 06:51:42 anatom Exp $
  */
 public abstract class CA extends UpgradeableDataHashMap implements Serializable {
 
@@ -181,27 +182,38 @@
     
     public int getCertificateProfileId() {return ((Integer) data.get(CERTIFICATEPROFILEID)).intValue();}
     
+    /** Returns the CAs token. The token is fetched from the token registry, or created and added to the token registry.
+     * 
+     * @return The CAs token, be it soft or hard.
+     * @throws IllegalKeyStoreException If the token keystore is invalid (crypto error thrown by crypto provider), or the CA token type is undefined.
+     */
     public CAToken getCAToken() throws IllegalKeyStoreException {
-      if(catoken == null){            
-
-      	      	
-        switch(((Integer) ((HashMap)data.get(CATOKENDATA)).get(CAToken.CATOKENTYPE)).intValue()){
+        CAToken ret = HardCATokenManager.instance().getCAToken(getCAId());
+        if (ret == null) {
+            switch(((Integer) ((HashMap)data.get(CATOKENDATA)).get(CAToken.CATOKENTYPE)).intValue()) {
             case CATokenInfo.CATOKENTYPE_P12:
-              catoken = (CAToken) new SoftCAToken((HashMap)data.get(CATOKENDATA));
-              break;
+                ret = (CAToken) new SoftCAToken((HashMap)data.get(CATOKENDATA));
+                break;
             case CATokenInfo.CATOKENTYPE_HSM:
-              catoken = (CAToken) new HardCATokenContainer((HashMap)data.get(CATOKENDATA)); 
-              break;
+                ret = (CAToken) new HardCATokenContainer((HashMap)data.get(CATOKENDATA)); 
+                break;
             case CATokenInfo.CATOKENTYPE_NULL:
-              catoken = new NullCAToken();  
-        }
-      }
-      return catoken;
+                ret = new NullCAToken();
+            default:
+                throw new IllegalKeyStoreException("No CA Token type defined!");
+            }
+            HardCATokenManager.instance().addCAToken(getCAId(), ret);
+        }            
+      return ret;
     }    
         
+    /** Sets the CA token. Adds or updates the token in the token registry.
+     * 
+     * @param catoken The CAs token, be it soft or hard.
+     */
     public void setCAToken(CAToken catoken){
        data.put(CATOKENDATA, (HashMap) catoken.saveData());        
-       this.catoken = catoken;
+       HardCATokenManager.instance().addCAToken(getCAId(), catoken);
     }
     
     public Collection getRequestCertificateChain(){
@@ -429,7 +441,6 @@
 	  this.owner = owner;	
 	}
     
-    private CAToken catoken = null;
     private HashMap extendedcaservicemap = null;
     private ArrayList certificatechain = null;
     private ArrayList requestcertchain = null;
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/CAAdminSessionBean.java ./src/java/se/anatom/ejbca/ca/caadmin/CAAdminSessionBean.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/CAAdminSessionBean.java	Sat Nov 13 01:24:36 2004
+++ ./src/java/se/anatom/ejbca/ca/caadmin/CAAdminSessionBean.java	Wed Mar 30 08:51:42 2005
@@ -57,6 +57,7 @@
 import se.anatom.ejbca.ca.caadmin.extendedcaservices.ExtendedCAServiceInfo;
 import se.anatom.ejbca.ca.caadmin.extendedcaservices.OCSPCAService;
 import se.anatom.ejbca.ca.caadmin.extendedcaservices.OCSPCAServiceInfo;
+import se.anatom.ejbca.ca.caadmin.hardcatokens.HardCATokenManager;
 import se.anatom.ejbca.ca.crl.ICreateCRLSessionLocal;
 import se.anatom.ejbca.ca.crl.ICreateCRLSessionLocalHome;
 import se.anatom.ejbca.ca.crl.RevokedCertInfo;
@@ -87,7 +88,7 @@
 /**
  * Administrates and manages CAs in EJBCA system.
  *
- * @version $Id: CAAdminSessionBean.java,v 1.25.2.2 2004/11/13 00:24:36 herrvendil Exp $
+ * @version $Id: CAAdminSessionBean.java,v 1.25.2.3 2005/03/30 06:51:42 anatom Exp $
  */
 public class CAAdminSessionBean extends BaseSessionBean {
     
@@ -497,13 +498,13 @@
             getLogSession().log(admin, caid, LogEntry.MODULE_CA,  new java.util.Date(), null, null, LogEntry.EVENT_ERROR_NOTAUTHORIZEDTORESOURCE,"Administrator isn't authorized to remove CA",e);
             throw new AuthorizationDeniedException("Not authorized to remove CA with caid = " + caid);
         }
-        
         // Get CA from database
         try{
             CADataLocal cadata = cadatahome.findByPrimaryKey(new Integer(caid));
             // Remove CA
             cadata.remove();
-            
+            // Remove an eventual CA token from the token registry
+            HardCATokenManager.instance().addCAToken(caid, null);
             getLogSession().log(admin, caid, LogEntry.MODULE_CA,  new java.util.Date(), null, null, LogEntry.EVENT_INFO_CAEDITED,"CA Removed");
         }catch(Exception e) {
             getLogSession().log(admin, caid, LogEntry.MODULE_CA,  new java.util.Date(), null, null, LogEntry.EVENT_ERROR_CAEDITED,"Error when trying to remove CA.",e);
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/DummyHardCAToken.java ./src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/DummyHardCAToken.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/DummyHardCAToken.java	Fri Sep 24 14:41:25 2004
+++ ./src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/DummyHardCAToken.java	Tue Mar 29 18:07:47 2005
@@ -38,7 +38,7 @@
 	private transient Logger log;
 	
 	
-	private static boolean registered = HardCATokenManager.register("se.anatom.ejbca.ca.caadmin.hardcatokens.DummyHardCAToken", "DummyHardCAToken", false, false);
+	private static boolean registered = HardCATokenManager.instance().addAvailableHardCAToken("se.anatom.ejbca.ca.caadmin.hardcatokens.DummyHardCAToken", "DummyHardCAToken", false, false);
 	
 	public DummyHardCAToken(){
 		log = Logger.getLogger(this.getClass());
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenManager.java ./src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenManager.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenManager.java	Wed Jan 26 09:20:03 2005
+++ ./src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenManager.java	Wed Mar 30 08:51:25 2005
@@ -13,126 +13,148 @@
 
 package se.anatom.ejbca.ca.caadmin.hardcatokens;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
+import java.util.Hashtable;
 
 import org.apache.log4j.Logger;
 
 import se.anatom.ejbca.ca.caadmin.AvailableHardCAToken;
+import se.anatom.ejbca.ca.caadmin.CAToken;
 
 /**
- * Class managing available Hard CA Tokens. Each HardCaToken plug-in should register itself by using the method register.
+ * Class managing available Hard CA Tokens and instansiated CA Tokens. 
+ * Each HardCaToken plug-in should register itself by using the method register.
+ * The CA keeps a registry of CA tokens created here.
  * 
  */
 public class HardCATokenManager {
-	
+    
     /** Log4j instance for Base */
     private static transient Logger log = Logger.getLogger(HardCATokenManager.class);
 
-    private static ArrayList availablehardcatokens = new ArrayList();
+    /** Registry of available hard ca token classes that can be instsiated. */
+    private Hashtable availablehardcatokens = new Hashtable();
+    /** Registry of CATokens associated with a specific CA, kept so CATokens will not
+     * be destroyed when a bean is passivated for example. */
+    private Hashtable caTokenRegistry = new Hashtable();
 
-    private static boolean initialized = init(); 
-    
+    /** Implementing the Singleton pattern */
+    private static HardCATokenManager instance = null;
 
     /**
-     * Method used to register all plug-in classes to the manager.
+     * Static intialization block used to register all plug-in classes to the manager.
      * All new plug-ins should add a loadClass call with it's classpath to this method.
-     * 
-     * @return true when finished initializing.
      */
-	private static boolean init(){
+    static {
         loadClass("se.anatom.ejbca.ca.caadmin.hardcatokens.StaticRegistering");
         loadClass("se.anatom.ejbca.ca.caadmin.hardcatokens.DummyHardCAToken");
         loadClass("se.anatom.ejbca.ca.caadmin.hardcatokens.HardCATokenSample");
-    	return true;
     }
 
-    
-	
-	/**
-	 * Method loading a class in order to register itself to the manager.
-	 * Should be used from the init() method only.
-	 * 
-	 * @param classpath 
-	 */
+    /**
+     * Method loading a class in order to register itself to the manager.
+     * Should be used from the init() method only.
+     * 
+     * @param classpath 
+     */
     private static void loadClass(String classpath){
-    	try {    		
-			HardCATokenManager.class.getClassLoader().loadClass(classpath).newInstance();		
-		} catch (ClassNotFoundException e) {
-		    log.info("Class not found: "+classpath); // Do Nothing, just log
-		} catch (InstantiationException e) {
-		    log.error("InstantiationException: "+classpath); // Do Nothing, just log
-		} catch (IllegalAccessException e) {
-		    log.error("IllegalAccessException: "+classpath); // Do Nothing, just log
-		}    
+        try {           
+            HardCATokenManager.class.getClassLoader().loadClass(classpath).newInstance();       
+        } catch (ClassNotFoundException e) {
+            log.info("Class not found: "+classpath); // Do Nothing, just log
+        } catch (InstantiationException e) {
+            log.error("InstantiationException: "+classpath); // Do Nothing, just log
+        } catch (IllegalAccessException e) {
+            log.error("IllegalAccessException: "+classpath); // Do Nothing, just log
+        }    
     }
         
+    /** Don't allow external creation of this class, implementing the Singleton pattern. 
+     */
+    private HardCATokenManager() {}
+    
+    /** Get the instance of this singleton
+     * 
+     */
+    public synchronized static HardCATokenManager instance() {
+        if (instance == null) {
+            instance = new HardCATokenManager();
+        }
+        return instance;
+    }
+    
+    /** Returns a previously registered (using addCAToken) CAToken, or null.
+     * 
+     * @param caid the id of the CA whose CAToken you want to fetch.
+     * @return The previously added CAToken or null if the token does not exist in the registry.
+     */
+    public CAToken getCAToken(int caid) {
+        return (CAToken)caTokenRegistry.get(new Integer(caid));
+    }
+    
+    /** Adds a CA token to the token registry. If a token already exists for the given CAid, 
+     * the old one is removed and replaced with the new. If the token passed is null, an existing token is removed.
+     * 
+     * @param caid the id of the CA whose CAToken you want to fetch.
+     * @param token the token to be added
+     */
+    public synchronized void addCAToken(int caid, CAToken token) {
+        if (caTokenRegistry.contains(new Integer(caid))) {
+            caTokenRegistry.remove(new Integer(caid));
+            log.debug("Removed old CA token for CA: "+caid);
+        }
+        if (token != null) {
+            caTokenRegistry.put(new Integer(caid), token);            
+            log.debug("Added CA token for CA: "+caid);
+        }
+    }
     
-	/**
-	 * Method registering a HardCAToken plug-in as available to the system.
-	 * 
-	 * @param classpath the classpath of the plug-in
-	 * @param name the general name used in adminweb-gui.
-	 * @param translateable indicates if the name should be translated in adminweb-gui
-	 * @param use indicates it this plug-in should be used.
-	 * 
-	 * @return true if registration went successful.
-	 */
-	public static boolean register(String classpath, String name, boolean translateable, boolean use) {
-		boolean retval = false;		
-		try {             
-		   // Check that class exists	
-		   log.debug("HardCATokenManager registering " + classpath);	
-			
-		   Class.forName(classpath).getName();	
-			
-		   availablehardcatokens.add(new AvailableHardCAToken(classpath, name, translateable, use));
-			
-		   retval = true;
-           log.debug("Registered " + classpath + "Successfully.");
-		} catch (ClassNotFoundException e) {
-	       log.error("Error registering " + classpath + " couldn't find classpath");
-		}			
-		
-		return retval;
-	}
-	
-	/**
-	 * Method returning to the system available HardCATokens
-	 * 
-	 * @return a Collection (AvailableHardCAToken) of registrered plug-ins.
-	 */
-	
-	public static Collection getAvailableHardCATokens(){
-	   return availablehardcatokens;	
-		
-	}
-
-	/**
-	 * Method returning to the available hardcatoken with given classpath
-	 * .
-	 * 
-	 * @return the corresponding AvailableHardCAToken or null of classpath couldn't be found
-	 */
-	
-	public static AvailableHardCAToken getAvailableHardCAToken(String classpath){
-		AvailableHardCAToken retval = null;
-        Iterator iter = availablehardcatokens.iterator();
-        while(iter.hasNext()){
-        	AvailableHardCAToken next = (AvailableHardCAToken) iter.next();
-        	if(next.getClassPath().equals(classpath)){
-        	  retval = next;
-        	  break;
-        	}  
+    
+    /**
+     * Method registering a HardCAToken plug-in as available to the system.
+     * 
+     * @param classpath the classpath of the plug-in
+     * @param name the general name used in adminweb-gui.
+     * @param translateable indicates if the name should be translated in adminweb-gui
+     * @param use indicates it this plug-in should be used.
+     * 
+     * @return true if registration went successful, false if the classpath could not be found or the classpath was already registered.
+     */
+    public synchronized boolean addAvailableHardCAToken(String classpath, String name, boolean translateable, boolean use) {
+        boolean retval = false; 
+        if (!availablehardcatokens.contains(classpath)) {
+            try {             
+                   log.debug("HardCATokenManager registering " + classpath);                
+                   // Check that class exists   
+                   Class.forName(classpath).getName();  
+                   // Add to the available tokens
+                   availablehardcatokens.put(classpath, new AvailableHardCAToken(classpath, name, translateable, use));         
+                   retval = true;
+                   log.debug("Registered " + classpath + "Successfully.");
+                } catch (ClassNotFoundException e) {
+                   log.error("Error registering " + classpath + " couldn't find classpath");
+                }            
         }
-		
-		
-		return retval;	
-		
-	}
-	
-	
-	
-	
+        return retval;
+    }
+    
+    /**
+     * Method returning to the system available HardCATokens
+     * 
+     * @return a Collection (AvailableHardCAToken) of registrered plug-ins.
+     */
+    public Collection getAvailableHardCATokens(){
+       return availablehardcatokens.values();   
+    }
+
+    /**
+     * Method returning to the available hardcatoken with given classpath.
+     * 
+     * @return the corresponding AvailableHardCAToken or null of classpath couldn't be found
+     */
+    public AvailableHardCAToken getAvailableHardCAToken(String classpath){
+        if (classpath == null) { return null; }
+        return (AvailableHardCAToken)availablehardcatokens.get(classpath);
+    }
+    
 }
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenSample.java ./src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenSample.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenSample.java	Fri Sep 24 14:41:25 2004
+++ ./src/java/se/anatom/ejbca/ca/caadmin/hardcatokens/HardCATokenSample.java	Tue Mar 29 18:07:47 2005
@@ -43,7 +43,7 @@
     private static transient Logger log = Logger.getLogger(HardCATokenSample.class);
 	
 	
-	private static boolean registered = HardCATokenManager.register("se.anatom.ejbca.ca.caadmin.hardcatokens.HardCATokenSample", "HardCATokenSample", false, false);
+	private static boolean registered = HardCATokenManager.instance().addAvailableHardCAToken("se.anatom.ejbca.ca.caadmin.hardcatokens.HardCATokenSample", "HardCATokenSample", false, false);
 	
 	private static byte[] signkeypairenc = Base64.decode(
 			("rO0ABXNyABVqYXZhLnNlY3VyaXR5LktleVBhaXKXAww60s0SkwIAAkwACnByaXZh"
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/publisher/LocalPublisherSessionBean.java ./src/java/se/anatom/ejbca/ca/publisher/LocalPublisherSessionBean.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/publisher/LocalPublisherSessionBean.java	Sun Sep 19 14:53:06 2004
+++ ./src/java/se/anatom/ejbca/ca/publisher/LocalPublisherSessionBean.java	Sun Mar 13 13:56:08 2005
@@ -52,7 +52,7 @@
  * Stores data used by web server clients.
  * Uses JNDI name for datasource as defined in env 'Datasource' in ejb-jar.xml.
  *
- * @version $Id: LocalPublisherSessionBean.java,v 1.5.2.1 2004/09/19 12:53:06 herrvendil Exp $
+ * @version $Id: LocalPublisherSessionBean.java,v 1.5.2.2 2005/03/13 12:56:08 anatom Exp $
  */
 public class LocalPublisherSessionBean extends BaseSessionBean  {
 
@@ -204,7 +204,7 @@
           returnval &= pdl.getPublisher().storeCRL(admin,incrl,cafp,number);
           getLogSession().log(admin, admin.getCAId(), LogEntry.MODULE_CA, new java.util.Date(), null,
                         null, LogEntry.EVENT_INFO_STORECRL,
-                        "Publisher CLR successfully to publisher " + pdl.getName() +".");        	
+                        "Published CRL successfully to publisher " + pdl.getName() +".");        	
           }catch(PublisherException pe){
         	getLogSession().log(admin, admin.getCAId(), LogEntry.MODULE_CA, new java.util.Date(), null, null,
         			LogEntry.EVENT_ERROR_STORECRL, "Error when publishing CRL to " + pdl.getName() + " : " + pe.getMessage());
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ca/store/certificateprofiles/CertificateProfile.java ./src/java/se/anatom/ejbca/ca/store/certificateprofiles/CertificateProfile.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ca/store/certificateprofiles/CertificateProfile.java	Sat Nov 20 18:02:33 2004
+++ ./src/java/se/anatom/ejbca/ca/store/certificateprofiles/CertificateProfile.java	Sat Nov 20 18:02:33 2004
@@ -28,7 +28,7 @@
  * CertificateProfile is a basic class used to customize a certificate
  * configuration or be inherited by fixed certificate profiles.
  *
- * @version $Id$
+ * @version $Id: CertificateProfile.java,v 1.22.2.2 2004/11/20 17:02:33 herrvendil Exp $
  */
 public class CertificateProfile extends UpgradeableDataHashMap implements Serializable, Cloneable {
     private static Logger log = Logger.getLogger(CertificateProfile.class);
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/hardtoken/LocalHardTokenSessionBean.java ./src/java/se/anatom/ejbca/hardtoken/LocalHardTokenSessionBean.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/hardtoken/LocalHardTokenSessionBean.java	Tue Sep 28 18:20:21 2004
+++ ./src/java/se/anatom/ejbca/hardtoken/LocalHardTokenSessionBean.java	Thu Feb 17 20:35:48 2005
@@ -40,6 +40,7 @@
 import se.anatom.ejbca.BaseSessionBean;
 import se.anatom.ejbca.SecConst;
 import se.anatom.ejbca.authorization.AuthorizationDeniedException;
+import se.anatom.ejbca.authorization.AvailableAccessRules;
 import se.anatom.ejbca.authorization.IAuthorizationSessionLocal;
 import se.anatom.ejbca.authorization.IAuthorizationSessionLocalHome;
 import se.anatom.ejbca.ca.store.ICertificateStoreSessionLocal;
@@ -59,7 +60,7 @@
  * Stores data used by web server clients.
  * Uses JNDI name for datasource as defined in env 'Datasource' in ejb-jar.xml.
  *
- * @version $Id: LocalHardTokenSessionBean.java,v 1.28.2.1 2004/09/28 16:20:21 anatom Exp $
+ * @version $Id: LocalHardTokenSessionBean.java,v 1.28.2.2 2005/02/17 19:35:48 herrvendil Exp $
  */
 public class LocalHardTokenSessionBean extends BaseSessionBean  {
 
@@ -357,7 +358,7 @@
 		  HardTokenProfile profile = next.getHardTokenProfile();
 		  
 		  if(profile instanceof EIDProfile){		  	
-		  	if(authorizedcertprofiles.containsAll(((EIDProfile) profile).getAllCertificateProfileIds())){
+		  	if(isSuperAdmin(admin) || authorizedcertprofiles.containsAll(((EIDProfile) profile).getAllCertificateProfileIds())){
 		  	  returnval.add(next.getId());			  	   
 		  	}		  	
 		  }else{
@@ -644,7 +645,7 @@
           Iterator i = result.iterator();
           while(i.hasNext()){
             htih = (HardTokenIssuerDataLocal) i.next();
-            if(authorizedhardtokenprofiles.containsAll(htih.getHardTokenIssuer().getAvailableHardTokenProfiles()))
+            if(isSuperAdmin(admin) || authorizedhardtokenprofiles.containsAll(htih.getHardTokenIssuer().getAvailableHardTokenProfiles()))
               returnval.add(new HardTokenIssuerData(htih.getId().intValue(), htih.getAlias(), htih.getAdminGroupId(), htih.getHardTokenIssuer()));
           }
         }
@@ -667,13 +668,14 @@
       Collection result = null;
       Collection authorizedhardtokenprofiles = this.getAuthorizedHardTokenProfileIds(admin);
       HardTokenIssuerDataLocal htih = null;
+            
       try{
         result = hardtokenissuerhome.findAll();
         if(result.size()>0){
           Iterator i = result.iterator();
           while(i.hasNext()){
             htih = (HardTokenIssuerDataLocal) i.next();
-            if(authorizedhardtokenprofiles.containsAll(htih.getHardTokenIssuer().getAvailableHardTokenProfiles()))
+            if(isSuperAdmin(admin) || authorizedhardtokenprofiles.containsAll(htih.getHardTokenIssuer().getAvailableHardTokenProfiles()))
               returnval.add(htih.getAlias());
           }
         }
@@ -695,13 +697,15 @@
       Collection authorizedhardtokenprofiles = this.getAuthorizedHardTokenProfileIds(admin);
       TreeMap returnval = new TreeMap();
       Collection result = null;
+      
+      
       try{
         result = hardtokenissuerhome.findAll();
         if(result.size()>0){
           Iterator i = result.iterator();
           while(i.hasNext()){
             HardTokenIssuerDataLocal htih = (HardTokenIssuerDataLocal) i.next();
-            if(authorizedhardtokenprofiles.containsAll(htih.getHardTokenIssuer().getAvailableHardTokenProfiles()))
+            if(isSuperAdmin(admin) || authorizedhardtokenprofiles.containsAll(htih.getHardTokenIssuer().getAvailableHardTokenProfiles()))
               returnval.put(htih.getAlias(), new HardTokenIssuerData(htih.getId().intValue(), htih.getAlias(), htih.getAdminGroupId(), htih.getHardTokenIssuer()));
           }
         }
@@ -1322,5 +1326,20 @@
       return new Integer(id);
     } // findFreeHardTokenIssuerId
 
-
+    /**
+     * Checks if admin is superadministrator
+     * 
+     * @param admin
+     * @return true if superadmin
+     */
+    
+    private boolean isSuperAdmin(Admin admin){
+    	boolean superadmin = false;
+        try {
+        	superadmin = this.getAuthorizationSession(admin).isAuthorizedNoLog(admin, AvailableAccessRules.ROLE_SUPERADMINISTRATOR);
+        } catch (AuthorizationDeniedException e1) {	}
+        
+        return superadmin;
+    }
+    
 } // LocalHardTokenSessionBean
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/ra/raadmin/GlobalConfiguration.java ./src/java/se/anatom/ejbca/ra/raadmin/GlobalConfiguration.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/ra/raadmin/GlobalConfiguration.java	Sat Nov 20 18:02:32 2004
+++ ./src/java/se/anatom/ejbca/ra/raadmin/GlobalConfiguration.java	Wed Feb 23 16:22:02 2005
@@ -18,14 +18,14 @@
 /**
  * This is a  class containing global configuration parameters.
  *
- * @version $Id: GlobalConfiguration.java,v 1.12.2.4 2004/11/20 17:02:32 herrvendil Exp $
+ * @version $Id: GlobalConfiguration.java,v 1.12.2.6 2005/02/23 15:22:02 anatom Exp $
  */
 public class GlobalConfiguration extends UpgradeableDataHashMap implements java.io.Serializable {
 
     // Default Values
     public static final float LATEST_VERSION = 1;
     
-    public static final String EJBCA_VERSION = "EJBCA 3.0.5";
+    public static final String EJBCA_VERSION = "EJBCA 3.0.7";
 
 
     // Entries to choose from in userpreference part, defines the size of data to be displayed on one page.
diff -urN ../../305/ejbca/src/java/se/anatom/ejbca/webdist/cainterface/CACertReqServlet.java ./src/java/se/anatom/ejbca/webdist/cainterface/CACertReqServlet.java
--- ../../305/ejbca/src/java/se/anatom/ejbca/webdist/cainterface/CACertReqServlet.java	Fri Apr 16 09:38:59 2004
+++ ./src/java/se/anatom/ejbca/webdist/cainterface/CACertReqServlet.java	Fri Mar  4 16:57:15 2005
@@ -49,7 +49,7 @@
  * <ul>
  * <li>crl - gets the latest CRL.
  *
- * @version $Id: CACertReqServlet.java,v 1.2 2004/04/16 07:38:59 anatom Exp $
+ * @version $Id: CACertReqServlet.java,v 1.2.2.1 2005/03/04 15:57:15 anatom Exp $
  */
 public class CACertReqServlet extends HttpServlet {
 
@@ -151,14 +151,20 @@
 				ByteArrayOutputStream bOut = new ByteArrayOutputStream();
 				DEROutputStream dOut = new DEROutputStream(bOut);
 				dOut.writeObject(pkcs10request);
-				dOut.close();
-												          
-												          
+				dOut.close();					          					          
 				byte[] b64certreq = se.anatom.ejbca.util.Base64.encode(bOut.toByteArray());
 				String out = "-----BEGIN CERTIFICATE REQUEST-----\n";
 				out += new String(b64certreq);
 				out += "\n-----END CERTIFICATE REQUEST-----\n";      				
                 
+                if (res.containsHeader("Pragma")) {
+                    log.debug("Removing Pragma header to avoid caching issues in IE");
+                    res.setHeader("Pragma",null);
+                }
+                if (res.containsHeader("Cache-Control")) {
+                    log.debug("Removing Cache-Control header to avoid caching issues in IE");
+                    res.setHeader("Cache-Control",null);
+                }
                 String filename = "pkcs10certificaterequest.pem";
                 res.setHeader("Content-disposition", "attachment; filename=" +  filename);
                 res.setContentType("application/octet-stream");