[prev in list] [next in list] [prev in thread] [next in thread]
List: openejb-cvs
Subject: [openejb-scm] [2515] trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.
From: dblevins () codehaus ! org
Date: 2006-02-26 22:00:36
Message-ID: 20060226220036.18051.qmail () codehaus ! org
[Download RAW message or body]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; \
font-size: 10pt; } #msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: \
6px; } #msg ul, pre { overflow: auto; }
#patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<title>[2515] trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java: \
Fixed path separator character</title> </head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2515</dd>
<dt>Author</dt> <dd>dblevins</dd>
<dt>Date</dt> <dd>2006-02-26 17:00:34 -0500 (Sun, 26 Feb 2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed path separator character</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenejb1modulesitestssrcjavaorgopenejbtestTomcatRemoteTestServerjav \
a">trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenejb1modulesitestssrcjavaorgopenejbtestTomcatRemoteTestServerjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java \
(2514 => 2515)</h4> <pre class="diff">
<span class="info">--- \
trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java 2006-02-26 \
21:59:53 UTC (rev 2514)
+++ trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java 2006-02-26 \
22:00:34 UTC (rev 2515) </span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> import org.openejb.client.RemoteInitialContextFactory;
</span><span class="cx">
</span><span class="cx"> import java.io.File;
</span><ins>+import java.io.FileOutputStream;
+import java.io.IOException;
</ins><span class="cx"> import java.io.InputStream;
</span><span class="cx"> import java.io.OutputStream;
</span><del>-import java.io.FileOutputStream;
-import java.io.IOException;
</del><span class="cx"> import java.net.URL;
</span><span class="cx"> import java.util.Properties;
</span><span class="cx">
</span><span class="lines">@@ -44,28 +44,28 @@
</span><span class="cx"> props.put("java.naming.provider.url", \
servletUrl); </span><span class="cx">
</span><span class="cx"> String homeProperty = \
System.getProperty("tomcat.home"); </span><del>- if (homeProperty == \
null){ </del><ins>+ if (homeProperty == null) {
</ins><span class="cx"> throw new IllegalStateException("The system \
property tomcat.home must be defined."); </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tomcatHome = new File(homeProperty);
</span><span class="cx">
</span><span class="cx"> if (!tomcatHome.exists()) {
</span><del>- throw new IllegalStateException("The tomcat.home \
directory does not exist: "+tomcatHome.getAbsolutePath()); </del><ins>+ \
throw new IllegalStateException("The tomcat.home directory does not exist: \
" + tomcatHome.getAbsolutePath()); </ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public void start() {
</span><del>- if (connect()){
</del><ins>+ if (connect()) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- try{
</del><ins>+ try {
</ins><span class="cx"> System.out.println("[] START TOMCAT \
SERVER"); </span><del>- System.out.println("CATALINA_HOME = \
"+tomcatHome.getAbsolutePath()); </del><ins>+ \
System.out.println("CATALINA_HOME = " + tomcatHome.getAbsolutePath()); \
</ins><span class="cx"> </span><span class="cx"> String systemInfo = \
"Java " + System.getProperty("java.version") + "; " + \
System.getProperty("os.name") + "/" + \
System.getProperty("os.version"); </span><del>- \
System.out.println("SYSTEM_INFO = "+systemInfo); </del><ins>+ \
System.out.println("SYSTEM_INFO = " + systemInfo); </ins><span \
class="cx"> </span><span class="cx"> serverHasAlreadyBeenStarted = \
false; </span><span class="cx">
</span><span class="lines">@@ -73,9 +73,9 @@
</span><span class="cx"> OutputStream catalinaOut = new \
FileOutputStream(tomcat.l("logs").f("catalina.out")); \
</span><span class="cx"> </span><span class="cx"> \
execBootstrap("start", catalinaOut); </span><del>- } catch \
(Exception e){ </del><ins>+ } catch (Exception e) {
</ins><span class="cx"> e.printStackTrace();
</span><del>- throw new RuntimeException("Cannot start the server: \
"+e.getClass().getName()+": "+e.getMessage(), e); </del><ins>+ \
throw new RuntimeException("Cannot start the server: " + \
e.getClass().getName() + ": " + e.getMessage(), e); </ins><span class="cx"> \
} </span><span class="cx"> connect(10);
</span><span class="cx"> // Wait a wee bit longer for good measure
</span><span class="lines">@@ -86,14 +86,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public void stop(){
- if ( !serverHasAlreadyBeenStarted ) {
- try{
</del><ins>+ public void stop() {
+ if (!serverHasAlreadyBeenStarted) {
+ try {
</ins><span class="cx"> System.out.println("[] STOP TOMCAT \
SERVER"); </span><span class="cx"> \
execBootstrap("stop", System.out); </span><span class="cx">
</span><span class="cx"> disconnect(10);
</span><del>- } catch (Exception e){
</del><ins>+ } catch (Exception e) {
</ins><span class="cx"> e.printStackTrace();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private boolean disconnect(int tries) {
</span><del>- if (connect()){
</del><ins>+ if (connect()) {
</ins><span class="cx"> tries--;
</span><span class="cx"> if (tries < 1) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -170,30 +170,33 @@
</span><span class="cx"> FilePathBuilder tomcat = new \
FilePathBuilder(tomcatHome); </span><span class="cx"> FilePathBuilder \
tomcatBin = tomcat.l("bin"); </span><span class="cx">
</span><ins>+ FilePathBuilder javaHome = new \
FilePathBuilder(System.getProperty("java.home")); </ins><span class="cx"> \
String path = tomcatHome.getAbsolutePath(); </span><span class="cx">
</span><ins>+ String s = File.pathSeparator;
+
</ins><span class="cx"> if (path.indexOf("tomcat-5.5") != -1) {
</span><del>- return new String[]{ "java",
</del><ins>+ return new \
String[]{javaHome.l("bin").s("java"), </ins><span class="cx"> \
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager", \
</span><span class="cx"> \
"-Djava.util.logging.config.file=" + \
tomcat.l("conf").l("logging.properties"), </span><span \
class="cx"> "-Djava.endorsed.dirs=" + \
tomcat.l("common").l("endorsed"), </span><del>- \
"-classpath", tomcatBin.l("bootstrap.jar") +":" + \
tomcatBin.l("commons-logging-api.jar"), </del><ins>+ \
"-classpath", tomcatBin.l("bootstrap.jar") + s + \
tomcatBin.l("commons-logging-api.jar"), </ins><span class="cx"> \
"-Dcatalina.base=" + tomcat, </span><span class="cx"> \
"-Dcatalina.home=" + tomcat, </span><span class="cx"> \
"-Djava.io.tmpdir=" + tomcat.l("temp"), </span><span class="cx"> \
"org.apache.catalina.startup.Bootstrap", command}; </span><span class="cx"> \
} else if (path.indexOf("tomcat-5.0") != -1) { </span><del>- \
return new String[]{ "java", </del><ins>+ return new \
String[]{javaHome.l("bin").s("java"), </ins><span class="cx"> \
"-Djava.endorsed.dirs=" + \
tomcat.l("common").l("endorsed"), </span><del>- \
"-classpath", tomcatBin.l("bootstrap.jar") +":" + \
tomcatBin.l("commons-logging-api.jar"), </del><ins>+ \
"-classpath", tomcatBin.l("bootstrap.jar") + s + \
tomcatBin.l("commons-logging-api.jar") + s + \
javaHome.l("lib").s("tools.jar"), </ins><span class="cx"> \
"-Dcatalina.base=" + tomcat, </span><span class="cx"> \
"-Dcatalina.home=" + tomcat, </span><span class="cx"> \
"-Djava.io.tmpdir=" + tomcat.l("temp"), </span><span class="cx"> \
"org.apache.catalina.startup.Bootstrap", command}; </span><span class="cx"> \
} else if (path.indexOf("tomcat-4.1") != -1) { </span><del>- \
return new String[]{ "java", </del><ins>+ return new \
String[]{javaHome.l("bin").s("java"), </ins><span class="cx"> \
"-Djava.endorsed.dirs=" + \
tomcat.l("common").l("endorsed"), </span><del>- \
"-classpath", tomcatBin.l("bootstrap.jar") +"", \
</del><ins>+ "-classpath", \
tomcatBin.s("bootstrap.jar") + s + \
javaHome.l("lib").s("tools.jar"), </ins><span class="cx"> \
"-Dcatalina.base=" + tomcat, </span><span class="cx"> \
"-Dcatalina.home=" + tomcat, </span><span class="cx"> \
"-Djava.io.tmpdir=" + tomcat.l("temp"), </span><span \
class="lines">@@ -210,14 +213,22 @@ </span><span class="cx"> this.file = \
file; </span><span class="cx"> }
</span><span class="cx">
</span><del>- public FilePathBuilder l(String name){
</del><ins>+ public FilePathBuilder(String filePath) {
+ this.file = new File(filePath);
+ }
+
+ public FilePathBuilder l(String name) {
</ins><span class="cx"> return new FilePathBuilder(f(name));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public File f(String name){
</del><ins>+ public File f(String name) {
</ins><span class="cx"> return new File(file, name);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public String s(String name) {
+ return new File(file, name).getAbsolutePath();
+ }
+
</ins><span class="cx"> public String toString() {
</span><span class="cx"> return file.getAbsolutePath();
</span><span class="cx"> }
</span><span class="lines">@@ -234,22 +245,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public void run() {
</span><del>- try{
</del><ins>+ try {
</ins><span class="cx"> int i = is.read();
</span><del>- out.write( i );
</del><ins>+ out.write(i);
</ins><span class="cx">
</span><del>- while ( i != -1 ){
</del><ins>+ while (i != -1) {
</ins><span class="cx"> i = is.read();
</span><del>- out.write( i );
</del><ins>+ out.write(i);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- } catch (Exception e){
</del><ins>+ } catch (Exception e) {
</ins><span class="cx"> e.printStackTrace();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx">
</span><span class="cx"> 5.5.x startup
</span></pre>
</div>
</div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic