You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/11/30 18:33:39 UTC
svn commit: r349999 - in /geronimo/trunk/applications:
console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java
Author: djencks
Date: Wed Nov 30 09:33:29 2005
New Revision: 349999
URL: http://svn.apache.org/viewcvs?rev=349999&view=rev
Log:
GERONIMO-1252 fix keystore portlet
Modified:
geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java
Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=349999&r1=349998&r2=349999&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java Wed Nov 30 09:33:29 2005
@@ -69,7 +69,6 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
public class KeyStoreGBean implements GBeanLifecycle {
- public static final String KEY_STORE_OBJ_NAME = "geronimo.security:type=KeyStore";
private static Log log = LogFactory.getLog(KeyStoreGBean.class);
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java?rev=349999&r1=349998&r2=349999&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java Wed Nov 30 09:33:29 2005
@@ -19,24 +19,19 @@
import java.io.IOException;
import java.security.cert.Certificate;
-
import javax.management.ObjectName;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.certmanager.CertManagerPortlet;
import org.apache.geronimo.console.core.keystore.KeyEntryInfo;
-import org.apache.geronimo.console.core.keystore.KeyStoreGBean;
+import org.apache.geronimo.console.util.ObjectNameConstants;
import org.apache.geronimo.kernel.KernelRegistry;
public class ViewKeyStoreEntryDetail {
- private static Log log = LogFactory.getLog(ViewKeyStoreEntryDetail.class);
-
public static void render(CertManagerPortlet portlet,
RenderRequest request, RenderResponse response)
throws PortletException, IOException {
@@ -48,8 +43,7 @@
try {
// entry info
- ObjectName objname = new ObjectName(
- KeyStoreGBean.KEY_STORE_OBJ_NAME);
+ ObjectName objname = ObjectNameConstants.KEYSTORE_OBJ_NAME;
KeyEntryInfo kinfo = (KeyEntryInfo) KernelRegistry
.getSingleKernel().invoke(objname, "getKeyEntryInfo",
new Object[] { alias },