Use server.keystore instead of jmxkeystore in the JMX tests because this ke...

gbellato

24.14.2006 8f9679b64473d91649bd5b8fb5c791029c40d97c

Use server.keystore instead of jmxkeystore in the JMX tests because
this keystore is more generic and has a longer validity (jmxkeystore
certificates expires on December 18 this year).
Also remove the jmxkeystore from the repository.

 opends/tests/unit-tests-testng/resource/jmxkeystore

Binary files differ

 opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java

@@ -172,8 +172,6 @@
                  new File(testConfigDir, "schema"));
    copyDirectory(new File(resourceDir, "MakeLDIF"),
                  new File(testConfigDir, "MakeLDIF"));
    copyFile(new File(testResourceDir, "jmxkeystore"),
             new File(testRoot, "jmxkeystore"));
    copyFile(new File(testResourceDir, "server.keystore"),
             new File(testConfigDir, "server.keystore"));
    copyFile(new File(testResourceDir, "server.truststore"),

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java

@@ -384,7 +384,7 @@
        "objectClass: top",
        "objectClass: ds-cfg-connection-handler",
        "objectClass: ds-cfg-jmx-connection-handler",
        "ds-cfg-ssl-cert-nickname: jmx-cert",
        "ds-cfg-ssl-cert-nickname: server-cert",
        "ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
        "ds-cfg-connection-handler-enabled: true",
        "ds-cfg-use-ssl: true",
@@ -562,8 +562,9 @@
   */
  private String getJmxKeystorePath()
  {
    return DirectoryServer.getServerRoot() + File.separator
                        + "jmxkeystore";
    return DirectoryServer.getServerRoot() + File.separator +
              "config" + File.separator +
              "server.keystore";
  }

  /**