From 605c6d10c80297ca5ea9be0798b77da4ba6baa79 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Wed, 30 Aug 2006 21:29:35 +0000
Subject: [PATCH] Removed java file that has been made obsolete.
---
/dev/null | 105 ----------------------------------------------------
opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java | 6 +-
2 files changed, 3 insertions(+), 108 deletions(-)
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java
deleted file mode 100644
index da3f5f5..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Portions Copyright 2006 Sun Microsystems, Inc.
- */
-package org.opends.server;
-
-import java.io.*;
-import org.opends.server.tools.StopDS;
-
-public class OpenDSAdmin
- extends Thread
-{
- private String dsee_home;
- private String port;
-
- public OpenDSAdmin(String in_dsee_home, String in_port)
- {
- dsee_home = in_dsee_home;
- port = in_port;
- }
-
- public void run()
- {
- try
- {
- startDS();
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-
- public void startDS() throws Exception
- {
- String exec_cmd = dsee_home + "/bin/start-ds.sh -nodetach";
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec(exec_cmd);
- child.waitFor();
- }
-
- public void stopDS() throws Exception
- {
- String exec_cmd = dsee_home + "/bin/stop-ds.sh -p " + port;
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec(exec_cmd);
- child.waitFor();
- }
-
- public static void prepEnv(String dsee_home) throws Exception
- {
- String exec_cmd = "ln -s " + dsee_home + "/locks locks";
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec(exec_cmd);
- child.waitFor();
-
- exec_cmd = "ln -s " + dsee_home + "/db db";
- rtime = Runtime.getRuntime();
- child = rtime.exec(exec_cmd);
- child.waitFor();
-
- exec_cmd = "ln -s " + dsee_home + "/config config";
- rtime = Runtime.getRuntime();
- child = rtime.exec(exec_cmd);
- child.waitFor();
- }
-
- public static void undoEnv() throws Exception
- {
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec("rm locks");
- child.waitFor();
-
- rtime = Runtime.getRuntime();
- child = rtime.exec("rm db");
- child.waitFor();
-
- rtime = Runtime.getRuntime();
- child = rtime.exec("rm config");
- child.waitFor();
- }
-
-}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
index 9c961c3..4ba273f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
@@ -27,7 +27,7 @@
package org.opends.server;
import java.io.*;
-import org.opends.server.OpenDSAdmin;
+//import org.opends.server.OpenDSAdmin;
import org.opends.server.tools.StopDS;
/**
@@ -41,7 +41,7 @@
// The print stream to use for printing error messages.
private PrintStream errorStream;
protected OpenDSTestOutput ds_output = new OpenDSTestOutput();
- protected OpenDSAdmin dsAdmin = null;
+ //protected OpenDSAdmin dsAdmin = null;
/**
* Creates a new instance of this test case with the provided name.
@@ -122,7 +122,7 @@
Runtime rtime = Runtime.getRuntime();
Process child = rtime.exec(exec_cmd);
- dsAdmin.sleep(30000);
+ Thread.sleep(30000);
System.out.println("OpenDS has started.");
}
--
Gitblit v1.10.0