Clean of use of data and temp data in functional tests

Gary Williams

16.28.2011 da40de5b860952ec063b246545632642d00ba0bf

 opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Portions Copyright 2006-2009 Sun Microsystems, Inc.
 !      Portions Copyright 2011 ForgeRock AS.
 ! -->
<stax>

@@ -77,7 +78,6 @@
            server2Host = server2.getHostname()
            server1Path = '%s/%s' % (server1.getDir(), OPENDSNAME)
            server2Path = '%s/%s' % (server2.getDir(), OPENDSNAME)
            server2DataDir = '%s/%s' % (server2.getDir(),remote.reldatadir)
            server1name = '%s:%s' % (server1Host, server1.getPort())
            server2name = '%s:%s' % (server2Host, server2.getPort())