From 07764dd3aee4b8ac519421663e281d6fe0e5e70d Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 17 Mar 2009 09:23:56 +0000
Subject: [PATCH] Move topology files to "shared/topology" folder
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml | 4 ++--
/dev/null | 27 ---------------------------
opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt | 0
opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml | 6 +++---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml | 6 +++---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml | 5 ++---
opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs | 4 ++--
8 files changed, 12 insertions(+), 40 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
index f71fdb0..d728956 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ ! Portions Copyright 2006-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -61,8 +61,8 @@
file="'%s/testcases/replication/replication_setup.xml'
% (TESTS_DIR)"/>
<call function="'replication_setup'">
- { 'topologyFile' : '%s/config/replication/basic_topology.txt'\
- % TESTS_DIR,
+ { 'topologyFile' : '%s/basic_topology.txt' \
+ % TESTS_TOPOLOGY_DIR,
'dataFile' : 'Short_Example.ldif',
'isolateLdapServers' : True,
'enableDebugLogs' : False
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
index 532a6b3..bae786c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -61,8 +61,8 @@
file="'%s/testcases/replication/replication_setup.xml'
% (TESTS_DIR)"/>
<call function="'replication_setup'">
- { 'topologyFile' : '%s/config/replication/3server_topology.txt'\
- % TESTS_DIR,
+ { 'topologyFile' : '%s/3server_topology.txt' \
+ % TESTS_TOPOLOGY_DIR,
'secureReplication': True,
'dataFile' : 'Example.ldif'
}
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
index d5f6d1a..f9dceb1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -59,7 +59,7 @@
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
<call function="'replication_setup'">
- { 'topologyFile' : '%s/config/replication/3server_topology.txt' % TESTS_DIR }
+ { 'topologyFile' : '%s/3server_topology.txt' % TESTS_TOPOLOGY_DIR }
</call>
<script>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
index 4e13b50..c993ef8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -33,8 +33,7 @@
<function-map-args>
<function-arg-def name="topologyFile"
type="optional"
- default="'%s/config/replication/basic_topology.txt'
- % TESTS_DIR">
+ default="'%s/basic_topology.txt' % TESTS_TOPOLOGY_DIR">
<function-arg-description>
Pathname to file describing the topology.
</function-arg-description>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
index cc8b2df..cacee53 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007-2008 Sun Microsystems, Inc.
+# Copyright 2007-2009 Sun Microsystems, Inc.
TEST_OS_STRING = '${os.name}'
TEST_JVM_STRING = '${java.version}(${sun.arch.data.model} bits)'
@@ -37,8 +37,8 @@
TESTS_DIR = '%s/functional-tests' % TESTS_ROOT
TESTS_SHARED_DIR = '%s/shared' % TESTS_DIR
TESTS_FUNCTIONS_DIR = '%s/shared/functions' % TESTS_ROOT
-TESTS_DATA_DIR = '%s/data' % TESTS_SHARED_DIR
TESTS_JAVA_DIR = '%s/shared/java' % TESTS_ROOT
+TESTS_TOPOLOGY_DIR = '%s/shared/topology' % TESTS_ROOT
DIRECTORY_INSTANCE_DN = '${opends.admin.dn}'
DIRECTORY_INSTANCE_PSWD = '${opends.admin.pwd}'
DIRECTORY_INSTANCE_BIN = '%s' % TMPDIR
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt b/opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt
similarity index 100%
rename from opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt
rename to opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt b/opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt
similarity index 100%
rename from opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt
rename to opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt b/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
deleted file mode 100755
index cd521ec..0000000
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Hostname: localhost
-Directory: /tmp/opends-synchro-tests/server1
-Port: 11389
-Adminport: 11444
-Sslport: 11636
-Jmxport: 11689
-RootDn: cn=directory manager
-RootPwd: secret12
-BaseDn: o=example
-Changelogport: 11111
-SynchronizedSuffix: o=example
-ChangelogServer: localhost:11111
-ChangelogServer: localhost:22222
-
-Hostname: localhost
-Directory: /tmp/opends-synchro-tests/server2
-Port: 22389
-Adminport: 22444
-Sslport: 22636
-Jmxport: 22689
-RootDn: cn=directory manager
-RootPwd: secret12
-BaseDn: o=example
-Changelogport: 22222
-SynchronizedSuffix: o=example
-ChangelogServer: localhost:11111
-ChangelogServer: localhost:22222
--
Gitblit v1.10.0