Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog: [4195] trunk/core/components
|
From: <st...@us...> - 2007-05-25 12:44:23
|
Revision: 4195
http://svn.sourceforge.net/smartfrog/?rev=4195&view=rev
Author: steve_l
Date: 2007-05-25 05:44:20 -0700 (Fri, 25 May 2007)
Log Message:
-----------
SFOS-146, getting jetty tests to pass.
Modified Paths:
--------------
trunk/core/components/jetty/build.xml
trunk/core/components/www/build.xml
trunk/core/components/www/doc/www_readme.sxw
trunk/core/components/www/ivy.xml
Added Paths:
-----------
trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java
Removed Paths:
-------------
trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java
trunk/core/components/www/testwar/resources/happy.jsp
Modified: trunk/core/components/jetty/build.xml
===================================================================
--- trunk/core/components/jetty/build.xml 2007-05-25 10:21:37 UTC (rev 4194)
+++ trunk/core/components/jetty/build.xml 2007-05-25 12:44:20 UTC (rev 4195)
@@ -41,6 +41,8 @@
<property name="root.dir" location="../../" />
<property name="ivy.enabled" value="true"/>
<property name="Name.System" value="jetty"/>
+ <!-- System tests turned off to make CC build over them-->
+ <property name="system.tests" value="false" />
<!-- Import common stuff -->
<!--available file="../../common.xml" property="root.dir" value="../.."/-->
<import file="${root.dir}/common.xml"/>
@@ -80,6 +82,13 @@
ignoresystemclasses="false"/>
<property name="verify.fail.message"
value="No Jetty found"/>
+ <available property="jasper.found"
+ classname="org.apache.jasper.servlet.JspServlet"
+ classpathref="tests.run.classpath"
+ ignoresystemclasses="true"/>
+ <echo level="verbose">
+ jasper.found=${jasper.found}
+ </echo>
</target>
<!-- ========================================================== -->
@@ -166,6 +175,7 @@
<fileset dir="${test.classes.dir}">
<include name="**/unit/*Test.class"/>
<include name="**/system/**/*Test.class" />
+ <exclude name="**/system/full/*Test.class" unless="jasper.found" />
</fileset>
</batchtest>
</sf-junit>
Copied: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java (from rev 4193, trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java)
===================================================================
--- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java (rev 0)
+++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java 2007-05-25 12:44:20 UTC (rev 4195)
@@ -0,0 +1,237 @@
+/** (C) Copyright 2004 Hewlett-Packard Development Company, LP
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ For more information: www.smartfrog.org
+
+ */
+
+
+package org.smartfrog.services.www.jetty.test.system.full;
+
+import org.smartfrog.services.filesystem.FileSystem;
+import org.smartfrog.sfcore.prim.Prim;
+import org.smartfrog.test.SmartFrogTestBase;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+
+/**
+ * JUnit test class for test cases related to "jetty" component This test suite
+ * needs jetty to be fully installed somewhere, and the jetty home location
+ * passed down to the program. This can be done by <ol> <li>setting the system
+ * property jetty.home</li> <li>setting the system property
+ * runtime.jetty.home</li> </ol>
+ */
+public class JettyTCPTest
+ extends SmartFrogTestBase {
+
+ private static final String FILES = "org/smartfrog/services/www/jetty/test/system/full/";
+ private static final String JETTY_HOME = "jetty.home";
+ private static final String RUNTIME_JETTY_HOME = "runtime." + JETTY_HOME;
+
+ private static final String ROOT_DOC = "/";//""/jetty/index.html";
+
+ public JettyTCPTest(String s) {
+ super(s);
+ }
+
+ /**
+ * Sets up the fixture, for example, open a network connection. This method
+ * is called before a test is executed.
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ String runtimeJettyHome = System.getProperty(RUNTIME_JETTY_HOME);
+ String jettyHome = System.getProperty(JETTY_HOME);
+ if (jettyHome == null && runtimeJettyHome != null) {
+ System.setProperty(JETTY_HOME, runtimeJettyHome);
+ }
+ if (System.getProperty(JETTY_HOME) == null) {
+ fail("Undefined property " + JETTY_HOME + " or " + RUNTIME_JETTY_HOME);
+ }
+ }
+
+
+ public void testCaseTCPJettyCore() throws Throwable {
+ application = deployExpectingSuccess(FILES + "tcp_jetty_core.sf",
+ "tcp_jetty_core");
+ assertNotNull(application);
+ }
+
+ public void testCaseTCN52() throws Exception {
+ deployExpectingException(FILES + "tcn52.sf",
+ "tcn52",
+ EXCEPTION_LIFECYCLE,
+ "sfStart",
+ EXCEPTION_DEPLOYMENT,
+ "Illegal ClassType");
+ }
+
+
+ public void testCaseTCN53() throws Exception {
+ deployExpectingException(FILES + "tcn53.sf",
+ "tcn53",
+ EXCEPTION_LIFECYCLE,
+ "sfStart",
+ EXCEPTION_DEPLOYMENT,
+ "java.net.UnknownHostException: no-hostname");
+ }
+
+ public void NotestCaseTCN54() throws Exception {
+ deployExpectingException(FILES + "tcn54.sf",
+ "tcn54",
+ EXCEPTION_DEPLOYMENT,
+ "unnamed component",
+ EXCEPTION_RESOLUTION,
+ "java.lang.StackOverflowError");
+ }
+
+ public void testCaseTCN55() throws Exception {
+ deployExpectingException(FILES + "tcn55.sf",
+ "tcn55",
+ EXCEPTION_DEPLOYMENT,
+ "unnamed component",
+ EXCEPTION_RESOLUTION,
+ "non-optional attribute 'jettyhome' is missing");
+ }
+
+ public void testCaseTCN56() throws Exception {
+ deployExpectingException(FILES + "tcn56.sf",
+ "tcn56",
+ EXCEPTION_DEPLOYMENT,
+ "unnamed component",
+ EXCEPTION_RESOLUTION,
+ "error in schema: non-optional attribute 'listenerPort' is missing");
+ }
+
+ public void testCaseTCN57() throws Exception {
+ deployExpectingException(FILES + "tcn57.sf",
+ "tcn57",
+ EXCEPTION_LIFECYCLE,
+ "unnamed component");
+
+/*
+ EXCEPTION_RESOLUTION,
+ "error in schema: wrong class found for attribute 'server', expected: java.lang.String");
+*/
+ }
+
+ public void testCaseTCP19() throws Throwable {
+ Prim application = deployExpectingSuccess(FILES + "tcp19.sf", "tcp19");
+ assertNotNull(application);
+ int port = 0;
+ String hostname = application.sfResolve("serverHost",
+ (String) null,
+ true);
+ port = application.sfResolve("port", port, true);
+ URL url = new URL("http", hostname, port, ROOT_DOC);
+ HttpURLConnection connection = null;
+ connection = (HttpURLConnection) url.openConnection();
+ int errorcode = 0;
+ try {
+ connection.connect();
+ errorcode = connection.getResponseCode();
+ } catch (FileNotFoundException e) {
+ //if this is a 404 error, we have succeeded.
+ errorcode = connection.getResponseCode();
+ }
+ assertEquals("Expected a 404 response from " + url + " but got " + errorcode,
+ HttpURLConnection.HTTP_NOT_FOUND, errorcode);
+ }
+
+ public void testCaseTCP20() throws Throwable {
+ Prim application = deployExpectingSuccess(FILES + "tcp20.sf", "tcp20");
+ assertNotNull(application);
+ Prim server1 = (Prim) application.sfResolveHere("server1");
+ Prim server2 = (Prim) application.sfResolveHere("server2");
+ String hostname1 = server1.sfResolve("serverHost", (String) null, true);
+ Prim listener1 = (Prim) server1.sfResolveHere("listener");
+ int port1 = listener1.sfResolve("listenerPort", 0, true);
+ String hostname2 = server2.sfResolve("serverHost", (String) null, true);
+ Prim listener2 = (Prim) server2.sfResolveHere("listener");
+ int port2 = listener2.sfResolve("listenerPort", 0, true);
+ URL url1 = new URL("http", hostname1, port1, ROOT_DOC);
+ URLConnection urlConnection1 = url1.openConnection();
+ URL url2 = new URL("http", hostname2, port2, ROOT_DOC);
+ URLConnection urlConnection2 = url2.openConnection();
+
+ BufferedReader in1 = null;
+ BufferedReader in2 = null;
+
+ try {
+ in1 = new BufferedReader(
+ new InputStreamReader(
+ urlConnection1.getInputStream()));
+ in2 = new BufferedReader(
+ new InputStreamReader(
+ urlConnection2.getInputStream()));
+ String inputLine1;
+ String inputLine2 = null;
+
+ while ((inputLine1 = in1.readLine()) != null && (inputLine2 = in2.readLine()) != null)
+ {
+ assertEquals(inputLine1, inputLine2);
+ }
+ } finally {
+ FileSystem.close(in1);
+ FileSystem.close(in2);
+ }
+ }
+
+ public void testCaseTCP21() throws Throwable {
+ Prim application = deployExpectingSuccess(FILES + "tcp21.sf", "tcp21");
+ assertNotNull(application);
+ Prim server = (Prim) application.sfResolve("server");
+ String jettyhome = server.sfResolve("jettyhome", (String) null, true);
+ String filename = jettyhome.concat(
+ File.separator + "demo"
+ + File.separator + "webapps"
+ + File.separator + "root"
+ + File.separator + "index.html");
+ File file = new File(filename);
+ File jettyfile = new File(jettyhome);
+
+ assertTrue("Not found" + file, file.exists());
+ assertTrue("Not found" + jettyfile, jettyfile.exists());
+ assertFalse("Shound not be a directory " + file, file.isDirectory());
+ assertTrue("Should be a directory " + jettyfile,
+ jettyfile.isDirectory());
+ }
+
+ public void testCaseTCP22() throws Throwable {
+ Prim application = deployExpectingSuccess(FILES + "tcp22.sf", "tcp22");
+ assertNotNull(application);
+ Prim server = (Prim) application.sfResolve("adminServer");
+ String hostname = server.sfResolve("httpserverHost",
+ (String) null,
+ true);
+ int port = server.sfResolve("listenerPort", 0, true);
+ URL url = new URL("http", hostname, port, "/");
+ HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+ String expectedmessage = "Unauthorized";
+ String actualmessage = urlConnection.getResponseMessage();
+ int expectedcode = 401;
+ int actualcode = urlConnection.getResponseCode();
+ assertEquals(expectedmessage, actualmessage);
+ assertEquals(expectedcode, actualcode);
+ }
+}
Property changes on: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTCPTest.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java
===================================================================
--- trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java 2007-05-25 10:21:37 UTC (rev 4194)
+++ trunk/core/components/jetty/test/org/smartfrog/services/www/jetty/test/system/full/JettyTest.java 2007-05-25 12:44:20 UTC (rev 4195)
@@ -1,237 +0,0 @@
-/** (C) Copyright 2004 Hewlett-Packard Development Company, LP
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- For more information: www.smartfrog.org
-
- */
-
-
-package org.smartfrog.services.www.jetty.test.system.full;
-
-import org.smartfrog.services.filesystem.FileSystem;
-import org.smartfrog.sfcore.prim.Prim;
-import org.smartfrog.test.SmartFrogTestBase;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-
-/**
- * JUnit test class for test cases related to "jetty" component This test suite
- * needs jetty to be fully installed somewhere, and the jetty home location
- * passed down to the program. This can be done by <ol> <li>setting the system
- * property jetty.home</li> <li>setting the system property
- * runtime.jetty.home</li> </ol>
- */
-public class JettyTest
- extends SmartFrogTestBase {
-
- private static final String FILES = "org/smartfrog/services/www/jetty/test/system/full/";
- private static final String JETTY_HOME = "jetty.home";
- private static final String RUNTIME_JETTY_HOME = "runtime." + JETTY_HOME;
-
- private static final String ROOT_DOC = "/";//""/jetty/index.html";
-
- public JettyTest(String s) {
- super(s);
- }
-
- /**
- * Sets up the fixture, for example, open a network connection. This method
- * is called before a test is executed.
- */
- protected void setUp() throws Exception {
- super.setUp();
- String runtimeJettyHome = System.getProperty(RUNTIME_JETTY_HOME);
- String jettyHome = System.getProperty(JETTY_HOME);
- if (jettyHome == null && runtimeJettyHome != null) {
- System.setProperty(JETTY_HOME, runtimeJettyHome);
- }
- if (System.getProperty(JETTY_HOME) == null) {
- fail("Undefined property " + JETTY_HOME + " or " + RUNTIME_JETTY_HOME);
- }
- }
-
-
- public void testCaseTCPJettyCore() throws Throwable {
- application = deployExpectingSuccess(FILES + "tcp_jetty_core.sf",
- "tcp_jetty_core");
- assertNotNull(application);
- }
-
- public void testCaseTCN52() throws Exception {
- deployExpectingException(FILES + "tcn52.sf",
- "tcn52",
- EXCEPTION_LIFECYCLE,
- "sfStart",
- EXCEPTION_DEPLOYMENT,
- "Illegal ClassType");
- }
-
-
- public void testCaseTCN53() throws Exception {
- deployExpectingException(FILES + "tcn53.sf",
- "tcn53",
- EXCEPTION_LIFECYCLE,
- "sfStart",
- EXCEPTION_DEPLOYMENT,
- "java.net.UnknownHostException: no-hostname");
- }
-
- public void NotestCaseTCN54() throws Exception {
- deployExpectingException(FILES + "tcn54.sf",
- "tcn54",
- EXCEPTION_DEPLOYMENT,
- "unnamed component",
- EXCEPTION_RESOLUTION,
- "java.lang.StackOverflowError");
- }
-
- public void testCaseTCN55() throws Exception {
- deployExpectingException(FILES + "tcn55.sf",
- "tcn55",
- EXCEPTION_DEPLOYMENT,
- "unnamed component",
- EXCEPTION_RESOLUTION,
- "non-optional attribute 'jettyhome' is missing");
- }
-
- public void testCaseTCN56() throws Exception {
- deployExpectingException(FILES + "tcn56.sf",
- "tcn56",
- EXCEPTION_DEPLOYMENT,
- "unnamed component",
- EXCEPTION_RESOLUTION,
- "error in schema: non-optional attribute 'listenerPort' is missing");
- }
-
- public void testCaseTCN57() throws Exception {
- deployExpectingException(FILES + "tcn57.sf",
- "tcn57",
- EXCEPTION_LIFECYCLE,
- "unnamed component");
-
-/*
- EXCEPTION_RESOLUTION,
- "error in schema: wrong class found for attribute 'server', expected: java.lang.String");
-*/
- }
-
- public void testCaseTCP19() throws Throwable {
- Prim application = deployExpectingSuccess(FILES + "tcp19.sf", "tcp19");
- assertNotNull(application);
- int port = 0;
- String hostname = application.sfResolve("serverHost",
- (String) null,
- true);
- port = application.sfResolve("port", port, true);
- URL url = new URL("http", hostname, port, ROOT_DOC);
- HttpURLConnection connection = null;
- connection = (HttpURLConnection) url.openConnection();
- int errorcode = 0;
- try {
- connection.connect();
- errorcode = connection.getResponseCode();
- } catch (FileNotFoundException e) {
- //if this is a 404 error, we have succeeded.
- errorcode = connection.getResponseCode();
- }
- assertEquals("Expected a 404 response from " + url + " but got " + errorcode,
- HttpURLConnection.HTTP_NOT_FOUND, errorcode);
- }
-
- public void testCaseTCP20() throws Throwable {
- Prim application = deployExpectingSuccess(FILES + "tcp20.sf", "tcp20");
- assertNotNull(application);
- Prim server1 = (Prim) application.sfResolveHere("server1");
- Prim server2 = (Prim) application.sfResolveHere("server2");
- String hostname1 = server1.sfResolve("serverHost", (String) null, true);
- Prim listener1 = (Prim) server1.sfResolveHere("listener");
- int port1 = listener1.sfResolve("listenerPort", 0, true);
- String hostname2 = server2.sfResolve("serverHost", (String) null, true);
- Prim listener2 = (Prim) server2.sfResolveHere("listener");
- int port2 = listener2.sfResolve("listenerPort", 0, true);
- URL url1 = new URL("http", hostname1, port1, ROOT_DOC);
- URLConnection urlConnection1 = url1.openConnection();
- URL url2 = new URL("http", hostname2, port2, ROOT_DOC);
- URLConnection urlConnection2 = url2.openConnection();
-
- BufferedReader in1 = null;
- BufferedReader in2 = null;
-
- try {
- in1 = new BufferedReader(
- new InputStreamReader(
- urlConnection1.getInputStream()));
- in2 = new BufferedReader(
- new InputStreamReader(
- urlConnection2.getInputStream()));
- String inputLine1;
- String inputLine2 = null;
-
- while ((inputLine1 = in1.readLine()) != null && (inputLine2 = in2.readLine()) != null)
- {
- assertEquals(inputLine1, inputLine2);
- }
- } finally {
- FileSystem.close(in1);
- FileSystem.close(in2);
- }
- }
-
- public void testCaseTCP21() throws Throwable {
- Prim application = deployExpectingSuccess(FILES + "tcp21.sf", "tcp21");
- assertNotNull(application);
- Prim server = (Prim) application.sfResolve("server");
- String jettyhome = server.sfResolve("jettyhome", (String) null, true);
- String filename = jettyhome.concat(
- File.separator + "demo"
- + File.separator + "webapps"
- + File.separator + "root"
- + File.separator + "index.html");
- File file = new File(filename);
- File jettyfile = new File(jettyhome);
-
- assertTrue("Not found" + file, file.exists());
- assertTrue("Not found" + jettyfile, jettyfile.exists());
- assertFalse("Shound not be a directory " + file, file.isDirectory());
- assertTrue("Should be a directory " + jettyfile,
- jettyfile.isDirectory());
- }
-
- public void testCaseTCP22() throws Throwable {
- Prim application = deployExpectingSuccess(FILES + "tcp22.sf", "tcp22");
- assertNotNull(application);
- Prim server = (Prim) application.sfResolve("adminServer");
- String hostname = server.sfResolve("httpserverHost",
- (String) null,
- true);
- int port = server.sfResolve("listenerPort", 0, true);
- URL url = new URL("http", hostname, port, "/");
- HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
- String expectedmessage = "Unauthorized";
- String actualmessage = urlConnection.getResponseMessage();
- int expectedcode = 401;
- int actualcode = urlConnection.getResponseCode();
- assertEquals(expectedmessage, actualmessage);
- assertEquals(expectedcode, actualcode);
- }
-}
Modified: trunk/core/components/www/build.xml
===================================================================
--- trunk/core/components/www/build.xml 2007-05-25 10:21:37 UTC (rev 4194)
+++ trunk/core/components/www/build.xml 2007-05-25 12:44:20 UTC (rev 4195)
@@ -49,9 +49,12 @@
<!-- make the WAR file -->
<target name="war.init" depends="init-standard-output-dirs">
<property name="target.war.name"
- value="sf-testwar-${Version}.war"/>
+ value="sf-testwar-${smartfrog.version}.war"/>
+ <property name="dist.war.dir"
+ location="${dist.dir}/lib"/>
+ <mkdir dir="${dist.war.dir}" />
<property name="testwar.war"
- location="${dist.dir}/${target.war.name}"/>
+ location="${dist.war.dir}/${target.war.name}"/>
<property name="testwar.dir"
location="testwar"/>
<property name="testwar.lib.dir"
@@ -88,30 +91,9 @@
</war>
</target>
- <target name="war-installed"
- depends="war,ivy-publish"
- description="install the war file to the m2 repository"
- xmlns:m2="antlib:org.apache.maven.artifact.ant">
-<!--
- <property name="testwar.pom.file" location="${build.dir}/testwar.pom"/>
- <echo file="${testwar.pom.file}"><![CDATA[<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>${m2.groupID}</groupId>
- <artifactId>testwar</artifactId>
- <packaging>war</packaging>
- <version>0.1-SNAPSHOT</version>
-</project>
-]]></echo>
- <m2:pom id="testwar.pom" file="${testwar.pom.file}"/>
- <m2:install file="${testwar.war}">
- <pom refid="testwar.pom"/>
- </m2:install>
--->
- </target>
- <!-- ========================================================== -->
- <!-- clean -->
- <!-- ========================================================== -->
+ <target name="ready-to-publish-all"
+ depends="common.ready-to-publish-all,war" />
<target name="dist" depends="common.dist,published,jdocs">
<copy todir = "${dist.lib.dir}">
Modified: trunk/core/components/www/doc/www_readme.sxw
===================================================================
(Binary files differ)
Modified: trunk/core/components/www/ivy.xml
===================================================================
--- trunk/core/components/www/ivy.xml 2007-05-25 10:21:37 UTC (rev 4194)
+++ trunk/core/components/www/ivy.xml 2007-05-25 12:44:20 UTC (rev 4195)
@@ -26,7 +26,7 @@
<conf name="redist" description="redistributals excluding smartfrog artifacts"/>
<conf name="runtime" description="runtime but not the artifact"
extends="redist"/>
- <conf name="war" description="compile pathfor the test war"/>
+ <conf name="war" description="compile path for the test war"/>
<conf name="documentation"
description="all documentation artifacts"/>
</configurations>
@@ -36,7 +36,7 @@
<artifact name="sf-www-javadocs" conf="documentation" ext="zip"/>
<artifact name="sf-www-documentation" conf="documentation" ext="zip"/>
<!--the war conf publishes a new artifact-->
-<!-- <artifact name="" conf="war"/>-->
+ <artifact name="sf-testwar" conf="war" type="war"/>
</publications>
<dependencies>
<dependency org="org.smartfrog"
Deleted: trunk/core/components/www/testwar/resources/happy.jsp
===================================================================
--- trunk/core/components/www/testwar/resources/happy.jsp 2007-05-25 10:21:37 UTC (rev 4194)
+++ trunk/core/components/www/testwar/resources/happy.jsp 2007-05-25 12:44:20 UTC (rev 4195)
@@ -1,115 +0,0 @@
-<%@ page import="java.io.IOException" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.DriverManager" %>
-<%@ page import="java.sql.SQLException" %>
-<%@ page import="java.io.StringWriter" %>
-<%@ page import="java.io.PrintWriter" %>
-<%--
-
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%!
- private String property(String propname) {
- return System.getProperty(propname);
-}
-
- public static final String PROP_USER = "db.port";
- public static final String PROP_PASS = "db.passwd";
- public static final String PROP_URL = "db.url";
- public static final String PROP_DRIVER = "db.driver";
-
- public boolean isSet(JspWriter out, String propname) throws IOException {
- String value = property(propname);
- if (value == null) {
- out.println("<p>missing property:" + propname + "<p>");
- return false;
- }
- if (value.length() == 0) {
- out.println("empty property:" + propname + "<p>");
- return false;
- }
- return true;
- }
-
- /*
- * this bit of happiness logic absolutely requires that
- * 1. the db.host param is set
- * 2. the db.passwd param is set
- * 3. the db.port is set
- */
-
- public boolean areDatabasePropsSet(JspWriter out) throws IOException {
- boolean driver = isSet(out, PROP_DRIVER);
- boolean url = isSet(out, PROP_URL);
- boolean pass = isSet(out, PROP_PASS);
- boolean user = isSet(out, PROP_USER);
- return url && pass && user;
- }
-
- private void logThrown(JspWriter out, Throwable thrown) throws IOException {
- out.println("Exception " + thrown.toString());
- StringWriter sw = new StringWriter();
- out.println("<pre>");
- PrintWriter pw = new PrintWriter(sw);
- thrown.printStackTrace(pw);
- pw.flush();
- out.println(sw.toString());
- out.println("</pre>");
- }
-
-
- public boolean checkDatabaseConnection(JspWriter out) throws IOException {
- String url = property(PROP_URL);
- String user = property(PROP_USER);
- String pass = property(PROP_PASS);
- String driver = property(PROP_DRIVER);
- Throwable t = null;
- try {
- Class.forName(driver).newInstance();
- Connection connection;
- connection = DriverManager.getConnection(url, user, pass);
- connection.close();
- return true;
- } catch (ClassNotFoundException e) {
- t = e;
- } catch (SQLException e) {
- t = e;
- } catch (InstantiationException e) {
- t = e;
- } catch (IllegalAccessException e) {
- t = e;
- }
- logThrown(out, t);
- return false;
- }
-%>
-
-<html>
-<head><title>Happiness page</title></head>
-
-<body>
-<h1>Verifying database configuration</h1></body>
-
-<%
- boolean happy = true;
- String message = "<i>The database is configured </i><p>";
- happy = areDatabasePropsSet(out);
-
- if (happy) {
- happy = checkDatabaseConnection(out);
- if (!happy) {
- message = "<i>Unable to connect to the database</i>";
- }
- } else {
- message = "<i>Database configuration parameters are missing</i>";
- }
- if (!happy) {
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- }
- out.write(message);
-
-%>
-
-
-
-</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|