[Smartfrog-checkins] SF.net SVN: smartfrog:[8335] trunk/core/components/restlet/test/org/ smartfrog/services/restlet/test/system/testwar/components.sf

[<st...@us...>]

Revision: 8335
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8335&view=rev
Author:   steve_l
Date:     2010-06-14 12:36:32 +0000 (Mon, 14 Jun 2010)

Log Message:
-----------
SFOS-1498 changes in LivenessPageChecker triggered a regression here

Modified Paths:
--------------
    trunk/core/components/restlet/test/org/smartfrog/services/restlet/test/system/testwar/components.sf

Modified: trunk/core/components/restlet/test/org/smartfrog/services/restlet/test/system/testwar/components.sf
===================================================================
--- trunk/core/components/restlet/test/org/smartfrog/services/restlet/test/system/testwar/components.sf	2010-06-14 12:35:45 UTC (rev 8334)
+++ trunk/core/components/restlet/test/org/smartfrog/services/restlet/test/system/testwar/components.sf	2010-06-14 12:36:32 UTC (rev 8335)
@@ -23,78 +23,10 @@
 #include "/org/smartfrog/services/restlet/test/system/testwar/ports.sf"
 #include "/org/smartfrog/services/restlet/test/system/components.sf"
 
-/**
- * These are helper configurations derived from the jetty test suite; we're bringing up the testwar on the
- * system
- */
 
 
-/*
-LocalJettyServer extends Compound {
 
-    sfSyncTerminate true;
-    port test.jetty.port.1;
-    jettyhome test.jetty.home;
 
-    //integrate logging with smartfrog
-    logging extends IntegrateJettyLogging;
-
-    server extends CoreJettyServer {
-
-      jettyhome PARENT:jettyhome;
-
-      port PARENT:port;
-
-    }
-
-    listener extends JettySocketConnector {
-      server LAZY PARENT:server;
-      port PARENT:port;
-    }
-
-}
-
-JettyOnNIO extends LocalJettyServer {
-  listener extends JettySelectChannelConnector {
-    server LAZY PARENT:server;
-  }
-}
-
-
-JettyHTTPS extends LocalJettyServer {
-  port test.jetty.port.https;
-
-  listener extends JettySSLSocketConnector {
-    port PARENT:port;
-    server LAZY PARENT:server;
-  };
-}
-
-
-
-//the war file must be present
-  TestWar extends FileMustExist {
-    filename PROPERTY test.testwar.war;
-  }
-
-
-  TestWarServer extends LocalJettyServer {
-
-    contextPath "/testwar";
-
-    testwar extends TestWar;
-
-    deployedWar extends WebApplication {
-        server LAZY PARENT:server;
-        filename LAZY testwar:absolutePath;
-        contextPath PARENT:contextPath;
-    }
-  }
-
-
-
-*/
-
   WarTest extends TestCompound {
       testTimeout test.timeout;
       contextPath JettyWarServer:contextPath;
@@ -143,8 +75,8 @@
   }
 
 
-LocalErrorGet extends LocalGet {
-      page "error";
+   LocalErrorGet extends LocalGet {
+      page "/error";
       errorCode 419;
       queries [["status",errorCode]];
       maximumResponseCode errorCode;


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