From eb90e65de9f332ecfd306bb5acd6ae327c07c3d0 Mon Sep 17 00:00:00 2001
From: ctissot <ctissot@localhost>
Date: Mon, 10 Mar 2008 09:05:44 +0000
Subject: [PATCH] Replaced references from old machine (builds.opends.org) with new machine name.
---
opends/tests/functional_manual/setup/quicksetup_ssl.html | 2
opends/tests/functional-tests/staf-installer/staf-installer.properties | 2
opends/tests/stress-tests/staf-installer/staf-installer.properties | 2
opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java | 25 ------------
opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java | 30 ---------------
opends/tests/performance/response-time/opends.properties | 4 +-
opends/tests/functional_manual/setup/upgrade_gui.html | 2
7 files changed, 6 insertions(+), 61 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java
index 3f9394e..d03a712 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java
@@ -399,34 +399,4 @@
return new Build(displayName, downloadUrl, category);
}
}
-
- /**
- * For testing only.
- * @param args command line arguments
- */
-// public static void main(String[] args) {
-// try {
-// Properties systemSettings = System.getProperties();
-// systemSettings.put("http.proxyHost", "webcache.central.sun.com");
-// systemSettings.put("http.proxyPort", "8080");
-// systemSettings.put("https.proxyHost", "webcache.central.sun.com");
-// systemSettings.put("https.proxyPort", "8080");
-//
-// System.setProperties(systemSettings);
-//
-// URL buildListUrl = new URL("http://builds.opends.org");
-// RemoteBuildManager rbm = new RemoteBuildManager(null, buildListUrl);
-// //List<Build> builds = rbm.listBuilds();
-// //for (Build build : builds) {
-// // System.out.println("build " + build);
-// //}
-// rbm.download(new URL("https://opends.dev.java.net/" +
-// "files/documents/4926/55351/OpenDS-0.1-build035.zip"),
-// new File("/tmp/OpenDS-xxx.zip"));
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-//
-// }
-
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java
index 24a3c5a..0d5f7dd 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java
@@ -174,29 +174,4 @@
}
}
}
-
-// public static void main(String[] args) {
-// String[] options = {"Retry", "Close"};
-// try {
-// JOptionPane op = new JOptionPane(
-// //JOptionPane.showOptionDialog(null,
-// new BuildListDownloadErrorPanel(
-// new RemoteBuildManager(null,
-// new URL("http://builds.opends.org")),
-// new IllegalArgumentException("abc")),
-// JOptionPane.ERROR_MESSAGE,
-// JOptionPane.YES_NO_OPTION,
-// null,
-// options,
-// null);
-// op.setBackground(Color.WHITE);
-// //op.getRootPane().setBackground(Color.WHITE);
-// JDialog dlg = op.createDialog(null, "Network Error");
-// dlg.getContentPane().setBackground(Color.WHITE);
-// dlg.setVisible(true);
-// } catch (MalformedURLException e) {
-// e.printStackTrace();
-// }
-// }
-
}
diff --git a/opends/tests/functional-tests/staf-installer/staf-installer.properties b/opends/tests/functional-tests/staf-installer/staf-installer.properties
index 1a0b4b3..db6e7bf 100644
--- a/opends/tests/functional-tests/staf-installer/staf-installer.properties
+++ b/opends/tests/functional-tests/staf-installer/staf-installer.properties
@@ -43,7 +43,7 @@
staf.email.to=
daily.build.time=213000
-daily.build.url=http://builds.opends.org/daily-builds/
+daily.build.url=http://www.opends.org/daily-builds/
## TCP port on which to configure staf to listen
## leave as is unless this port is already in use on your test machine
diff --git a/opends/tests/functional_manual/setup/quicksetup_ssl.html b/opends/tests/functional_manual/setup/quicksetup_ssl.html
index 8b5144d..75d547c 100755
--- a/opends/tests/functional_manual/setup/quicksetup_ssl.html
+++ b/opends/tests/functional_manual/setup/quicksetup_ssl.html
@@ -52,7 +52,7 @@
</td>
<td style="vertical-align: top;"> - Click on the
install/QuickSetup.jnlp link on the Build page <br>
- <a href="http://builds.opends.org/install/QuickSetup.jnlp">http://builds.opends.org/install/QuickSetup.jnlp</a><br>
+ <a href="http://www.opends.org/install/QuickSetup.jnlp">http://www.opends.org/install/QuickSetup.jnlp</a><br>
- install OpenDS using the same procedure than in the <a
href="setup_ssl.html">setup_ssl</a> testcase<br>
<br>
diff --git a/opends/tests/functional_manual/setup/upgrade_gui.html b/opends/tests/functional_manual/setup/upgrade_gui.html
index 2169050..824fe56 100755
--- a/opends/tests/functional_manual/setup/upgrade_gui.html
+++ b/opends/tests/functional_manual/setup/upgrade_gui.html
@@ -54,7 +54,7 @@
- Verify the server is running <br>
- Upgrade using the QuickSetup, open a browser on the test machine and
go to this URL<br>
- <a href="http://builds.opends.org/install/QuickSetup.jnlp">http://builds.opends.org/install/QuickSetup.jnlp</a><br>
+ <a href="http://www.opends.org/install/QuickSetup.jnlp">http://www.opends.org/install/QuickSetup.jnlp</a><br>
On the first panel of the QuickSetup, select the second bullet "Upgrade
Existing Server Instance" <br>
and enter the path of the Server to Upgrade {opends-path}<br>
diff --git a/opends/tests/performance/response-time/opends.properties b/opends/tests/performance/response-time/opends.properties
index 3445e4a..efec74b 100644
--- a/opends/tests/performance/response-time/opends.properties
+++ b/opends/tests/performance/response-time/opends.properties
@@ -1,7 +1,7 @@
# opends repository configuration
url.file=index.html
-url.daily=http://builds.opends.org/daily-builds/latest/
-url.weekly=http://builds.opends.org/weekly-builds/latest/
+url.daily=http://www.opends.org/daily-builds/latest/
+url.weekly=http://www.opends.org/promoted-builds/latest/
url=${url.daily}
# opends instance configuration parameters
admin.dn=uid=admin
diff --git a/opends/tests/stress-tests/staf-installer/staf-installer.properties b/opends/tests/stress-tests/staf-installer/staf-installer.properties
index bc5cebb..718176b 100755
--- a/opends/tests/stress-tests/staf-installer/staf-installer.properties
+++ b/opends/tests/stress-tests/staf-installer/staf-installer.properties
@@ -18,7 +18,7 @@
staf.email.to=
daily.build.time=213000
-daily.build.url=http://builds.opends.org/daily-builds/
+daily.build.url=http://www.opends.org/daily-builds/
## TCP port on which to configure staf to listen
## leave as is unless this port is already in use on your test machine
--
Gitblit v1.10.0