From 4fadf671e46c71850bfa6f8626d6874ca046fb1f Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Thu, 22 Mar 2012 17:23:30 +0000
Subject: [PATCH] Remove cut and paste error in functional tests cleanup
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml | 4 ++--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml | 2 +-
17 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml
index e022a49..20a9b4a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_backup-tasks"/>
@@ -112,7 +113,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
index 744fe88..2ec6f10 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_dbparams"/>
@@ -133,7 +134,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml
index 3a18ec6..6525dea 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_export-tasks"/>
@@ -131,7 +132,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml
index ce766a9..558701f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_export"/>
@@ -142,7 +143,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml
index 544ec09..5e48ad9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_import-tasks"/>
@@ -137,7 +138,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml
index def34a6..0d55da7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_import"/>
@@ -138,7 +139,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml
index 036154a..5cca616 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_restore-tasks"/>
@@ -111,7 +112,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml
index f673681..67355e1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="core_psearch"/>
@@ -117,7 +118,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml
index fc8aee8..1d582f5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml
@@ -112,7 +112,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'">
{ 'friendlyName' : __label }
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml
index 48e7a13..9fa9b55 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml
@@ -138,7 +138,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'">
{ 'friendlyName' : __label }
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml
index d431549..0687d32 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml
@@ -130,7 +130,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'">
{ 'friendlyName' : __label }
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml
index e64496b..c5b8c02 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml
@@ -123,7 +123,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<sequence>
<!-- fractional-replication cleanup -->
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml
index 3d62dca..88ab8b3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml
@@ -161,7 +161,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<message>'No Test Suite Cleanup'</message>
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml
index eb19318..deebe91 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml
@@ -126,7 +126,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<message>'No Test Suite Cleanup'</message>
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml
index d2cd407..2d05a7f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml
@@ -127,7 +127,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<message>'No Test Suite Cleanup'</message>
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml
index 4d0b7f3..21c80b5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml
@@ -127,7 +127,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<message>'No Test Suite Cleanup'</message>
<catch exception="'STAFException'">
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
index 2a7883f..993d544 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2011 ForgeRock AS.
+ ! Copyright 2011-2012 ForgeRock AS.
! -->
<stax>
<defaultcall function="main_operations_basic"/>
@@ -116,7 +116,7 @@
<finally>
<sequence>
<!-- Test Suite Cleanup -->
- <message>'Finally: Global Schema Cleanup.'</message>
+ <message>'Finally: Global Cleanup.'</message>
<try>
<call function="'common_cleanup'" />
<catch exception="'STAFException'">
--
Gitblit v1.10.0