[ThorFramework-devel] SF.net SVN: thorframework: [32] trunk/coretest/WEB-INF
Status: Planning
Brought to you by:
denniskempin
Menu
▾
▴
[ThorFramework-devel] SF.net SVN: thorframework: [32] trunk/coretest/WEB-INF
|
From: <den...@us...> - 2006-02-27 16:25:40
|
Revision: 32 Author: denniskempin Date: 2006-02-27 08:25:14 -0800 (Mon, 27 Feb 2006) ViewCVS: http://svn.sourceforge.net/thorframework/?rev=32&view=rev Log Message: ----------- Modified Paths: -------------- trunk/coretest/WEB-INF/lib/thor.jar trunk/coretest/WEB-INF/thor.xml trunk/coretest/src/org/y2k1/thor/core/test/TestServlet.java Modified: trunk/coretest/WEB-INF/lib/thor.jar =================================================================== (Binary files differ) Modified: trunk/coretest/WEB-INF/thor.xml =================================================================== --- trunk/coretest/WEB-INF/thor.xml 2006-02-27 16:24:45 UTC (rev 31) +++ trunk/coretest/WEB-INF/thor.xml 2006-02-27 16:25:14 UTC (rev 32) @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<config xmlns="http://www.y2k1.org/thor/config" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.y2k1.org/thor/config xsd/config.xsd"> +<config xmlns="http://www.y2k1.org/thor/config"> <import>org.y2k1.thor.core.test</import> <import>org.y2k1.thorx.modules</import> <servlet name="TestServlet" class="TestServlet"> - <mapping>/*</mapping> + <mapping>/coretest/test</mapping> <dependency name="mail" module="MailSender" /> </servlet> Modified: trunk/coretest/src/org/y2k1/thor/core/test/TestServlet.java =================================================================== --- trunk/coretest/src/org/y2k1/thor/core/test/TestServlet.java 2006-02-27 16:24:45 UTC (rev 31) +++ trunk/coretest/src/org/y2k1/thor/core/test/TestServlet.java 2006-02-27 16:25:14 UTC (rev 32) @@ -16,7 +16,6 @@ package org.y2k1.thor.core.test; import java.io.IOException; -import java.util.Map.Entry; import javax.mail.Message; import javax.mail.MessagingException; @@ -28,17 +27,18 @@ import org.y2k1.thor.core.Servlet; import org.y2k1.thor.core.ServletInitializer; import org.y2k1.thor.core.exception.ModuleResolveException; -import org.y2k1.thor.core.exception.ServerRedirectInterrupt; import org.y2k1.thor.core.exception.ServletException; import org.y2k1.thorx.modules.MailSender; public class TestServlet extends Servlet { private MailSender mailSender; + private ServletInitializer initializer; public TestServlet(ServletInitializer initializer) throws ModuleResolveException { super(initializer); + this.initializer = initializer; this.mailSender = getDependency("mail", MailSender.class); } @@ -76,24 +76,47 @@ else if(request.getParameter("serverinfo", null) != null) { response.getWriter().print("Operating System: "); - response.getWriter().print(System.getProperty("os.name")); + response.getWriter().print(request.getSystemInfo().getOSName()); response.getWriter().print(" "); - response.getWriter().print(System.getProperty("os.arch")); + response.getWriter().print(request.getSystemInfo().getOSArch()); response.getWriter().print(" ("); - response.getWriter().print(System.getProperty("os.version")); + response.getWriter().print(request.getSystemInfo().getOSVersion()); response.getWriter().println(")"); response.getWriter().print("Java VM: "); - response.getWriter().print(System.getProperty("java.vm.name")); + response.getWriter().print(request.getSystemInfo().getVMName()); response.getWriter().print(" ("); - response.getWriter().print(System.getProperty("java.vm.version")); + response.getWriter().print(request.getSystemInfo().getVMVersion()); response.getWriter().println(")"); response.getWriter().print("Runtime: "); - response.getWriter().print(System.getProperty("java.runtime.name")); + response.getWriter().print(request.getSystemInfo().getRuntimeName()); response.getWriter().print(" ("); - response.getWriter().print(System.getProperty("java.runtime.version")); + response.getWriter().print(request.getSystemInfo().getRuntimeVersion()); response.getWriter().println(")"); + + response.getWriter().print("Memory: "); + response.getWriter().print(request.getSystemInfo().getFreeMemory()/1024/1024); + response.getWriter().print("MB of "); + response.getWriter().print(request.getSystemInfo().getMaxMemory()/1024/1024); + response.getWriter().print("MB free"); + response.getWriter().print(" ("); + response.getWriter().print(request.getSystemInfo().getTotalMemory()/1024/1024); + response.getWriter().println("MB allocated)"); + + response.getWriter().print("Server: "); + response.getWriter().println(request.getServerInfo().getServerName()); + + response.getWriter().print("Servlet: "); + response.getWriter().print(request.getServerInfo().getServletContextName()); + response.getWriter().print(" ("); + response.getWriter().print(request.getServerInfo().getServletVersion()); + response.getWriter().println(")"); + + response.getWriter().println("Client host: "+request.getClientInfo().getHost()); + response.getWriter().println("Client address: "+request.getClientInfo().getAddress()); + response.getWriter().println("Client user: "+request.getClientInfo().getUser()); + response.getWriter().println("Client user-agent: "+request.getClientInfo().getUserAgent()); } else { @@ -106,69 +129,3 @@ } } } - -/* -java.runtime.name: Java(TM) 2 Runtime Environment, Standard Edition -sun.boot.library.path: C:\Program Files\Java\jre1.5.0_05\bin -java.vm.version: 1.5.0_05-b05 -shared.loader: ${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar -java.vm.vendor: Sun Microsystems Inc. -java.vendor.url: http://java.sun.com/ -path.separator: ; -tomcat.util.buf.StringCache.byte.enabled: true -java.vm.name: Java HotSpot(TM) Client VM -file.encoding.pkg: sun.io -user.country: DE -sun.os.patch.level: Service Pack 2 -java.vm.specification.name: Java Virtual Machine Specification -user.dir: C:\WINDOWS\system32 -java.runtime.version: 1.5.0_05-b05 -java.awt.graphicsenv: sun.awt.Win32GraphicsEnvironment -java.endorsed.dirs: d:\srv\tomcat\common\endorsed -os.arch: x86 -java.io.tmpdir: d:\srv\tomcat\temp -line.separator: - -java.vm.specification.vendor: Sun Microsystems Inc. -java.naming.factory.url.pkgs: org.apache.naming -java.util.logging.manager: org.apache.juli.ClassLoaderLogManager -user.variant: -os.name: Windows XP -sun.jnu.encoding: Cp1252 -java.library.path: d:\srv\tomcat\bin;.;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;d:\net\scp\;C:\Program Files\PostgreSQL Frontend\bin -java.specification.name: Java Platform API Specification -java.class.version: 49.0 -sun.management.compiler: HotSpot Client Compiler -os.version: 5.1 -user.home: C:\ -catalina.useNaming: true -user.timezone: Europe/Berlin -java.awt.printerjob: sun.awt.windows.WPrinterJob -file.encoding: Cp1252 -java.specification.version: 1.5 -catalina.home: d:\srv\tomcat -java.class.path: d:\srv\tomcat\bin\bootstrap.jar -user.name: SYSTEM -java.naming.factory.initial: org.apache.naming.java.javaURLContextFactory -package.definition: sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. -java.vm.specification.version: 1.0 -java.home: C:\Program Files\Java\jre1.5.0_05 -sun.arch.data.model: 32 -user.language: de -java.specification.vendor: Sun Microsystems Inc. -awt.toolkit: sun.awt.windows.WToolkit -java.vm.info: mixed mode -java.version: 1.5.0_05 -java.ext.dirs: C:\Program Files\Java\jre1.5.0_05\lib\ext -sun.boot.class.path: C:\Program Files\Java\jre1.5.0_05\lib\rt.jar;C:\Program Files\Java\jre1.5.0_05\lib\i18n.jar;C:\Program Files\Java\jre1.5.0_05\lib\sunrsasign.jar;C:\Program Files\Java\jre1.5.0_05\lib\jsse.jar;C:\Program Files\Java\jre1.5.0_05\lib\jce.jar;C:\Program Files\Java\jre1.5.0_05\lib\charsets.jar;C:\Program Files\Java\jre1.5.0_05\classes -server.loader: ${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar -java.vendor: Sun Microsystems Inc. -catalina.base: d:\srv\tomcat -file.separator: \ -java.vendor.url.bug: http://java.sun.com/cgi-bin/bugreport.cgi -common.loader: ${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar -sun.io.unicode.encoding: UnicodeLittle -sun.cpu.endian: little -package.access: sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. -sun.desktop: windows -sun.cpu.isalist: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
