[ogsa-dai svn] SF.net SVN: ogsa-dai:[1560] test-framework/trunk/ogsadai/suites/ GTServerTestSuite.rb

[<mik...@us...>]

Revision: 1560
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=1560&view=rev
Author:   mikej888
Date:     2010-11-15 18:21:51 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
Applies update to GT tomcat.xml to use cached Java web-app DTD

Modified Paths:
--------------
    test-framework/trunk/ogsadai/suites/GTServerTestSuite.rb

Modified: test-framework/trunk/ogsadai/suites/GTServerTestSuite.rb
===================================================================
--- test-framework/trunk/ogsadai/suites/GTServerTestSuite.rb	2010-11-15 17:59:05 UTC (rev 1559)
+++ test-framework/trunk/ogsadai/suites/GTServerTestSuite.rb	2010-11-15 18:21:51 UTC (rev 1560)
@@ -195,7 +195,6 @@
     @tomcatMLS = Tomcat.new(tomcatMLSDir, tomcatVersion, mlsPort)
     @tomcatMLS.configure
     @logger.log(@tomcatMLS)
-
     tomcatTLSDir = File.join(runOutputDir, "tomcat" + tlsPort.to_s)
     OSUtils.unzip_file_and_rename(tomcatZip, runOutputDir, tomcatTLSDir)
     @tomcatTLS = Tomcat.new(tomcatTLSDir, tomcatVersion, tlsPort, tlsPort + 1, 
@@ -211,16 +210,6 @@
     @gt = GT.new(gtDir, gtMajor, gtMinor)
     @logger.log(@gt)
     #
-    # Deploy GT onto Tomcats.
-    #
-    @logger.log("Deploying GT...")
-    gtBasic = gt.deployTomcat(@tomcatBasic)
-    @logger.log(gtBasic)
-    gtMLS = gt.deployTomcat(@tomcatMLS)
-    @logger.log(gtMLS)
-    gtTLS = gt.deploySecureTomcat(@tomcatTLS)
-    @logger.log(gtTLS)
-    #
     # Get OGSA-DAI.
     #
     @logger.log("Setting up OGSA-DAI...")
@@ -238,6 +227,24 @@
       end
     end # if
     #
+    # Update GT tomcat.xml file.
+    #
+    @logger.log("Updating GT tomcat.xml file...")
+    gtProperties = {"gt.dir" => gtDir}
+    ANTUtils.runANTLogged(@ogsadai.directory, "build.xml", 
+                          "updateGTTomcatXML",
+                          gtProperties, nil)
+    #
+    # Deploy GT onto Tomcats.
+    #
+    @logger.log("Deploying GT...")
+    gtBasic = gt.deployTomcat(@tomcatBasic)
+    @logger.log(gtBasic)
+    gtMLS = gt.deployTomcat(@tomcatMLS)
+    @logger.log(gtMLS)
+    gtTLS = gt.deploySecureTomcat(@tomcatTLS)
+    @logger.log(gtTLS)
+    #
     # Deploy OGSA-DAI onto Tomcat.
     #
     @logger.log("Deploying OGSA-DAI onto Tomcats...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.