[Smartfrog-checkins] core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/tomcat tomcat.sf,NONE,1.1 TomcatTest.java,1.1,1.2 testTomcat.sf,1.1,1.2

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

Update of /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/tomcat
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1342/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/tomcat

Modified Files:
	TomcatTest.java testTomcat.sf 
Added Files:
	tomcat.sf 
Log Message:
cargo

--- NEW FILE: tomcat.sf ---
/** (C) Copyright 2006 Hewlett-Packard Development Company, LP

Disclaimer of Warranty

The Software is provided "AS IS," without a warranty of any kind. ALL
EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY
EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has
not undergone complete testing and may contain errors and defects. It
may not function properly and is subject to change or withdrawal at
any time. The user must assume the entire risk of using the
Software. No support or maintenance is provided with the Software by
Hewlett-Packard. Do not install the Software if you are not accustomed
to using experimental software.

Limitation of Liability

TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD
OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR
FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR
THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE
SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO
BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY
HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR
ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD.

*/
#include "/org/smartfrog/services/www/cargo/components.sf"
#include "/org/smartfrog/services/www/cargo/test/system/testBase.sf"



Tomcat extends Tomcat5CargoServer {
 port ServerOptions:port;
 logging ServerOptions:logging;
 home PROPERTY runtime.tomcat.home;
}

Index: testTomcat.sf
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/tomcat/testTomcat.sf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testTomcat.sf	9 Mar 2006 22:51:29 -0000	1.1
--- testTomcat.sf	22 May 2006 09:47:22 -0000	1.2
***************
*** 1,13 ****
  
! #include "org/smartfrog/services/www/cargo/components.sf"
  
  
! CargoServerExtension extends Tomcat5CargoServer {
!  port 8080;
!  logging "low";
!  home PROPERTY runtime.tomcat.home;
! }
  
! sfConfig extends CargoServerExtension {
  
  }
\ No newline at end of file
--- 1,41 ----
+ /** (C) Copyright 2006 Hewlett-Packard Development Company, LP
  
! Disclaimer of Warranty
  
+ The Software is provided "AS IS," without a warranty of any kind. ALL
+ EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY
+ EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has
+ not undergone complete testing and may contain errors and defects. It
+ may not function properly and is subject to change or withdrawal at
+ any time. The user must assume the entire risk of using the
+ Software. No support or maintenance is provided with the Software by
+ Hewlett-Packard. Do not install the Software if you are not accustomed
+ to using experimental software.
  
! Limitation of Liability
  
! TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD
! OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR
! FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
! HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
! OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR
! THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN
! ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE
! SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO
! BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY
! HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR
! ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD.
! 
! */
! #include "/org/smartfrog/services/www/cargo/test/system/tomcat/tomcat.sf"
! 
! 
! 
! 
! sfConfig extends AppServerWithWar {
! 
!   server extends Tomcat;
  
  }
\ No newline at end of file

Index: TomcatTest.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/tomcat/TomcatTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TomcatTest.java	9 Mar 2006 22:51:29 -0000	1.1
--- TomcatTest.java	22 May 2006 09:47:22 -0000	1.2
***************
*** 12,16 ****
  
      public void testJBoss4() throws Throwable {
!         deployApp(FILE_BASE + "jboss/testTomcat.sf",
                  "testTomcat"
          );
--- 12,16 ----
  
      public void testJBoss4() throws Throwable {
!         deployApp(FILE_BASE + "tomcat/testTomcat.sf",
                  "testTomcat"
          );