geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r425077 - in /geronimo/branches/1.1/applications: console-core/src/java/org/apache/geronimo/console/core/keystore/ console-standard/src/java/org/apache/geronimo/console/certmanager/ console-standard/src/webapp/WEB-INF/view/certmanager/ cons...
Date Mon, 24 Jul 2006 14:45:57 GMT
Author: sppatel
Date: Mon Jul 24 07:45:56 2006
New Revision: 425077

URL: http://svn.apache.org/viewvc?rev=425077&view=rev
Log:
GERONIMO-1037 prompt for confirm on uninstall config

Modified:
    geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp

Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=425077&r1=425076&r2=425077&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
(original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
Mon Jul 24 07:45:56 2006
@@ -22,15 +22,18 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -456,6 +459,15 @@
         saveKeyStore();
     }
 
+    public void deleteEntry(String alias)
+            throws KeyStoreException,
+            CertificateException,
+            NoSuchAlgorithmException, IOException {
+
+        keystore.deleteEntry(alias);
+
+        saveKeyStore();
+    }
 
     public static final GBeanInfo GBEAN_INFO;
 
@@ -486,6 +498,8 @@
                 String.class, String.class });
         infoFactory.addOperation("importPKCS7Certificate", new Class[] {
                 String.class, String.class });
+
+        infoFactory.addOperation("deleteEntry", new Class[] {String.class });
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java?rev=425077&r1=425076&r2=425077&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
Mon Jul 24 07:45:56 2006
@@ -30,6 +30,7 @@
 import javax.portlet.RenderResponse;
 
 import org.apache.geronimo.console.certmanager.actions.ChangeStorePassword;
+import org.apache.geronimo.console.certmanager.actions.DeleteEntry;
 import org.apache.geronimo.console.certmanager.actions.GenerateCSR;
 import org.apache.geronimo.console.certmanager.actions.GenerateKeyPair;
 import org.apache.geronimo.console.certmanager.actions.ImportCAReply;
@@ -89,6 +90,8 @@
             ImportCAReply.action(this, request, response);
         } else if (action.equals("generate-key-pair")) {
             GenerateKeyPair.action(this, request, response);
+        } else if (action.equals("delete-entry")) {
+            DeleteEntry.action(this, request, response);
         }
     }
 
@@ -127,6 +130,8 @@
             ImportCAReply.render(this, request, response);
         } else if (action.equals("generate-key-pair")) {
             GenerateKeyPair.render(this, request, response);
+        } else if (action.equals("delete-entry")) {
+            DeleteEntry.render(this, request, response);
         }
     }
 

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp?rev=425077&r1=425076&r2=425077&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
Mon Jul 24 07:45:56 2006
@@ -15,9 +15,9 @@
 </table>
 <br/>
 
-<c:if test="${info.privateKey}">
 <table cellspacing="5">
 <tr>
+<c:if test="${info.privateKey}">
 <td><a href="<portlet:renderURL>
 <portlet:param name='action' value='generate-csr'/>
 <portlet:param name='alias' value='${info.alias}'/>
@@ -28,13 +28,18 @@
 <portlet:param name='alias' value='${info.alias}'/>
 </portlet:renderURL>">
 import CA reply</a></td>
+</c:if>
+<td><a href="<portlet:actionURL>
+<portlet:param name='action' value='delete-entry'/>
+<portlet:param name='alias' value='${info.alias}'/>
+</portlet:actionURL>" onClick="return confirm('Are you sure you want to delete entry
${info.alias}?');">
+Delete Entry</a></td>
 <td><a href="<portlet:renderURL>
 </portlet:renderURL>">
 keystore list</a></td>
 </tr>
 </table>
 <br/>
-</c:if>
 
 <c:set var="certs" value="${requestScope['org.apache.geronimo.console.certs']}"/>
 

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=425077&r1=425076&r2=425077&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
Mon Jul 24 07:45:56 2006
@@ -36,7 +36,7 @@
             <c:if test="${moduleDetails.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="restart"/></portlet:actionURL>">Restart</a></c:if>
         </td>
         <td width="75" class="${backgroundClass}">
-            <a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param
name="action" value="uninstall"/></portlet:actionURL>">Uninstall</a>
+            <a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param
name="action" value="uninstall"/></portlet:actionURL>" onClick="return confirm('Are
you sure you want to uninstall ${moduleDetails.configId}?');">Uninstall</a>
         </td>
     </tr>
   </c:forEach>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp?rev=425077&r1=425076&r2=425077&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
Mon Jul 24 07:45:56 2006
@@ -51,7 +51,7 @@
                  <portlet:param name="mode" value="delete" />
                  <portlet:param name="brokerURI" value="${info.brokerURI}" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
-               </portlet:actionURL>">delete</a>
+               </portlet:actionURL>" onClick="return confirm('Are you sure you want
to delete ${info.connectorName}?');">delete</a>
              </td>
           </tr>
 </c:forEach>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp?rev=425077&r1=425076&r2=425077&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
Mon Jul 24 07:45:56 2006
@@ -43,7 +43,7 @@
                <a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="delete" />
                  <portlet:param name="objectName" value="${entry.brokerURI}" />
-               </portlet:actionURL>">delete</a>
+               </portlet:actionURL>" onClick="return confirm('Are you sure you want
to delete ${entry.brokerName}?');">delete</a>
              </td>
 -->
           </tr>



Mime
View raw message