Fix tests and remove obsolete ones.

ludovicp

28.52.2010 2ef009229c3b6aff5c044680e398703007490735

 opends/tests/staf-tests/shared/functions/webcontainer.xml

@@ -83,7 +83,7 @@
        <call function="'GetEntry'">
          {
          'location'  : STAXServiceMachine,
          'entry'     : '%s/%sCertificate' % (TMPDIR, WC_TYPE),
          'entry'     : '%s/HttpCertificate' % TMPDIR,
          'attribute' : 'TYPE'
          }
        </call>
@@ -98,9 +98,9 @@
                'command'   : '%s/bin/keytool' % (LOCAL_JAVA_HOME),
                'arguments' : '-genkey -alias %s -keyalg rsa \
                               -dname "cn=%s,O=Sun Microsystems,C=US" \
                               -keystore "%s/%sCertificate" \
                               -keystore "%s/HttpCertificate" \
                               -storepass "changeit" -keypass "changeit" \
                               -storetype JKS ' % (WC_TYPE, WC_TYPE, TMPDIR, WC_TYPE),
                               -storetype JKS ' % (WC_TYPE, WC_TYPE, TMPDIR),
                'path'      : '%s/bin' % (LOCAL_JAVA_HOME),
                'expectedRC': 0
              }
@@ -109,12 +109,12 @@
        </if>
        <!-- copying cert File over -->
        <message>
          'copying %s/%sCertificate to %s/%sCertificate' % (TMPDIR,WC_TYPE,wcPath,WC_TYPE)
          'copying %s/HttpCertificate to %s/HttpCertificate' % (TMPDIR,wcPath)
        </message>
        <call function="'copyFile'">
          { 'location'   : STAXServiceMachine,
            'srcfile'    : '%s/%sCertificate' % (TMPDIR, WC_TYPE),
            'destfile'   : '%s/%sCertificate' % (wcPath, WC_TYPE),
            'srcfile'    : '%s/HttpCertificate' % TMPDIR,
            'destfile'   : '%s/HttpCertificate' % wcPath,
            'remotehost' : mylocation
          }
        </call>
@@ -170,10 +170,10 @@
                &lt;Connector port="%s" protocole="HTTP/1.1" \
                SSLEnabled="true" maxThreads="150" scheme="https" secure="true" \
                clientAuth="false" sslProtocol="SSL" \
                keystoreFile="%s/%sCertificate" \
                keystoreFile="%s/HttpCertificate" \
                keyAlias="%s" \
                keystorePass="changeit" /&gt;' % \
                (WC_SSL_PORT, wcPath, WC_TYPE, WC_TYPE)
                (WC_SSL_PORT, wcPath, WC_TYPE)
              content=sslConnectorRegEx.sub(SSL_CONNECTOR, content)
              serverXmlOutput=open('%s/%s-apache-%s-%s_server.xml' % \
                              (local.temp,STAF_REMOTE_HOSTNAME,WC_TYPE,WC_VERSION),'w')
@@ -205,7 +205,7 @@
            <script>
              # create a glassfish batch command file
              asadminCmds = ["delete-jvm-options -Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.jks",
                            "create-jvm-options -Djavax.net.ssl.keyStore=%s/%sCertificate:-Djavax.net.ssl.keyStorePassword=changeit" % (wcPath,WC_TYPE),
                            "create-jvm-options -Djavax.net.ssl.keyStore=%s/HttpCertificate:-Djavax.net.ssl.keyStorePassword=changeit" % wcPath,
                            "delete-http-listener http-listener-1",
                            "delete-http-listener http-listener-2",
                            "create-http-listener  -e --enabled=true  --listenerport %s --listeneraddress %s --defaultvs server httpListener" % (WC_PORT, STAF_REMOTE_HOSTNAME),
@@ -386,7 +386,7 @@
            ]
            print 'sunwebserver install statefile %s' % '\n'.join(stateFileList)
            silentFilename = 'sunwebserver.statefile'
            silentFd = open(os.path.join(TMPDIR,silentFilename),'w')
            silentFd = open(os.path.join(local.temp,silentFilename),'w')
            silentFd.write('\n'.join(stateFileList))
            silentFd.flush()
            silentFd.close()
@@ -395,7 +395,7 @@
            </script>
            <call function="'copyFile'">
              { 'location'   : STAXServiceMachine,
                'srcfile' : '%s' % os.path.join(TMPDIR,silentFilename),
                'srcfile' : '%s' % os.path.join(local.temp,silentFilename),
                'destfile' : '%s' % silentFilePath,
                'remotehost' : STAF_REMOTE_HOSTNAME,
              }
@@ -437,7 +437,7 @@
            </if>
            <!-- create a wadm passwordfile -->
            <script>
              wadmPwdFilename = os.path.join(TMPDIR,'wadmPwd')
              wadmPwdFilename = os.path.join(local.temp,'wadmPwd')
              wadmPwdFile = open(wadmPwdFilename,'w')
              wadmPwdFile.write('wadm_password=password\n')
              wadmPwdFile.flush()
@@ -458,7 +458,7 @@
                                      '--user=admin', '--password-file=%s' % wadmDestPwdFilename,
                                      '--host=%s' % STAF_REMOTE_HOSTNAME,
                                      '--config=%s' % STAF_REMOTE_HOSTNAME,
                                      '--keystore=%s/%sCertificate' % (wcPath,WC_TYPE), 
                                      '--keystore=%s/HttpCertificate' % wcPath,
                                      '--key-password=changeit', '--keystore-password=changeit'])
            </script>
            <call function="'runCommand'">