Is this still pending?
Why does NodeAgent.java use "SystemPropertyConstants.JKS_KEYSTORE"
but SystemPropertyConstants uses hard-coded strings such as "config"
and "keystore.jks"?
Aren't those names are used elsewhere as well?
Lloyd
On Mar 13, 2007, at 10:33 PM, Nandini Ektare wrote:
> Please review.
>
> Context: Issue 2393
>
> Index: nodeagent/src/java/com/sun/enterprise/ee/nodeagent/
> NodeAgent.java
> ===================================================================
> RCS file: /cvs/glassfish/admin-ee/nodeagent/src/java/com/sun/
> enterprise/ee/nodeagent/NodeAgent.java,v
> retrieving revision 1.13
> diff -u -r1.13 NodeAgent.java
> --- nodeagent/src/java/com/sun/enterprise/ee/nodeagent/
> NodeAgent.java 3 Mar 2007 20:24:21 -0000 1.13
> +++ nodeagent/src/java/com/sun/enterprise/ee/nodeagent/
> NodeAgent.java 14 Mar 2007 05:21:03 -0000
> @@ -632,6 +632,10 @@
> configContext.refresh();
> }
>
> + System.setProperty
> (SystemPropertyConstants.KEYSTORE_PROPERTY,
> + System.getProperty
> (SystemPropertyConstants.INSTANCE_ROOT_PROPERTY) +
> + SystemPropertyConstants.JKS_KEYSTORE);
> +
> // check to see if the nodeagent still exists
> if(getNodeAgentConfigBean(getConfigContext()) ==
> null) {
> // nodeagent has been removed
>
> Index: src/java/com/sun/enterprise/util/SystemPropertyConstants.java
> ===================================================================
> RCS file: /cvs/glassfish/appserv-commons/src/java/com/sun/
> enterprise/util/SystemPropertyConstants.java,v
> retrieving revision 1.19
> diff -u -r1.19 SystemPropertyConstants.java
> --- src/java/com/sun/enterprise/util/
> SystemPropertyConstants.java 21 Nov 2006 16:36:25 -0000 1.19
> +++ src/java/com/sun/enterprise/util/
> SystemPropertyConstants.java 14 Mar 2007 05:31:50 -0000
> @@ -146,9 +146,15 @@
>
> public static final String KEYSTORE_PROPERTY =
> "javax.net.ssl.keyStore";
> public static final String KEYSTORE_PASSWORD_PROPERTY =
> "javax.net.ssl.keyStorePassword";
> -
> + public static final String JKS_KEYSTORE =
> + System.getProperty("file.separator") + "config" +
> + System.getProperty("file.separator") + "keystore.jks";
> +
> public static final String TRUSTSTORE_PROPERTY =
> "javax.net.ssl.trustStore";
> public static final String TRUSTSTORE_PASSWORD_PROPERTY =
> "javax.net.ssl.trustStorePassword";
> + public static final String JKS_TRUSTSTORE =
> + System.getProperty("file.separator") + "config" +
> + System.getProperty("file.separator") + "cacerts.jks";
>
> public static final String ADMIN_REALM = "admin-realm";
> public static final String NSS_DB_PROPERTY =
> "com.sun.appserv.nss.db";
>
> Thanks
> Nandini