Diff
Modified: trunk/openejb1/maven.xml (2512 => 2513)
--- trunk/openejb1/maven.xml 2006-02-26 05:23:48 UTC (rev 2512)
+++ trunk/openejb1/maven.xml 2006-02-26 05:53:47 UTC (rev 2513)
@@ -751,12 +751,13 @@
<attainGoal name="delete:tomcat"/>
<attainGoal name="test:tomcat-webapp"/>
<attainGoal name="delete:tomcat"/>
-
- <attainGoal name="tomcat55"/>
- <attainGoal name="test:tomcat"/>
- <attainGoal name="delete:tomcat"/>
- <attainGoal name="test:tomcat-webapp"/>
- <attainGoal name="delete:tomcat"/>
+ <j:if test="${systemScope['java.version'].startsWith('1.5')}">
+ <attainGoal name="tomcat55"/>
+ <attainGoal name="test:tomcat"/>
+ <attainGoal name="delete:tomcat"/>
+ <attainGoal name="test:tomcat-webapp"/>
+ <attainGoal name="delete:tomcat"/>
+ </j:if>
</goal>
<goal name="test:all">
Modified: trunk/openejb1/modules/itests/src/java/org/openejb/test/RemoteTestServer.java (2512 => 2513)
--- trunk/openejb1/modules/itests/src/java/org/openejb/test/RemoteTestServer.java 2006-02-26 05:23:48 UTC (rev 2512)
+++ trunk/openejb1/modules/itests/src/java/org/openejb/test/RemoteTestServer.java 2006-02-26 05:53:47 UTC (rev 2513)
@@ -79,7 +79,7 @@
public void init(Properties props){
properties = props;
- props.put("test.server.class","org.openejb.test.RemoteTestServer");
+// props.put("test.server.class","org.openejb.test.RemoteTestServer");
props.put("java.naming.factory.initial","org.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url","127.0.0.1:4201");
props.put("java.naming.security.principal","testuser");
@@ -97,6 +97,12 @@
if (!connect()) {
try{
System.out.println("[] START SERVER");
+ FileUtils home = SystemInstance.get().getHome();
+
+ System.out.println("OPENEJB_HOME = "+home.getDirectory().getAbsolutePath());
+ String systemInfo = "Java " + System.getProperty("java.version") + "; " + System.getProperty("os.name") + "/" + System.getProperty("os.version");
+ System.out.println("SYSTEM_INFO = "+systemInfo);
+
serverHasAlreadyBeenStarted = false;
String version = null;
@@ -104,7 +110,7 @@
Properties versionInfo = new Properties();
versionInfo.load( new URL( "resource:/openejb-version.properties" ).openConnection().getInputStream() );
version = (String)versionInfo.get( "version" );
- FileUtils home = SystemInstance.get().getHome();
+
File lib = home.getDirectory("lib");
File openejbJar = new File(lib, "openejb-core-" + version + ".jar");
Modified: trunk/openejb1/modules/itests/src/java/org/openejb/test/TestRunner.java (2512 => 2513)
--- trunk/openejb1/modules/itests/src/java/org/openejb/test/TestRunner.java 2006-02-26 05:23:48 UTC (rev 2512)
+++ trunk/openejb1/modules/itests/src/java/org/openejb/test/TestRunner.java 2006-02-26 05:53:47 UTC (rev 2513)
@@ -50,6 +50,8 @@
import java.io.PrintStream;
import java.net.URL;
import java.util.Properties;
+import java.util.Iterator;
+import java.util.Map;
import junit.framework.TestResult;
@@ -113,14 +115,29 @@
TestRunner aTestRunner = new TestRunner();
TestResult r = aTestRunner
.start(new String[] { "org.openejb.test.ClientTestSuite" });
- if (!r.wasSuccessful())
+
+ System.out.println("");
+ System.out.println("_________________________________________________");
+ System.out.println("CLIENT JNDI PROPERTIES");
+ Properties env = TestManager.getServer().getContextEnvironment();
+ for (Iterator iterator = env.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ String key = (String) entry.getKey();
+ Object value = entry.getValue();
+ System.out.println(key+" = "+value);
+ }
+ System.out.println("_________________________________________________");
+
+ if (!r.wasSuccessful())
System.exit(FAILURE_EXIT);
System.exit(SUCCESS_EXIT);
} catch (Exception e) {
System.err.println(e.getMessage());
System.exit(EXCEPTION_EXIT);
}
- }
+
+
+ }
}
private static void runLocalTests() {
Modified: trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java (2512 => 2513)
--- trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java 2006-02-26 05:23:48 UTC (rev 2512)
+++ trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java 2006-02-26 05:53:47 UTC (rev 2513)
@@ -17,9 +17,6 @@
package org.openejb.test;
import org.openejb.client.RemoteInitialContextFactory;
-import org.openejb.util.JarUtils;
-import org.openejb.util.FileUtils;
-import org.openejb.loader.SystemInstance;
import java.io.File;
import java.io.InputStream;
@@ -27,7 +24,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
-import java.net.Socket;
import java.util.Properties;
/**
@@ -43,7 +39,7 @@
public void init(Properties props) {
properties = props;
servletUrl = System.getProperty("remote.serlvet.url", "http://127.0.0.1:8080/openejb/remote");
- props.put("test.server.class", TomcatRemoteTestServer.class.getName());
+// props.put("test.server.class", TomcatRemoteTestServer.class.getName());
props.put("java.naming.factory.initial", RemoteInitialContextFactory.class.getName());
props.put("java.naming.provider.url", servletUrl);
@@ -66,6 +62,11 @@
try{
System.out.println("[] START TOMCAT SERVER");
+ System.out.println("CATALINA_HOME = "+tomcatHome.getAbsolutePath());
+
+ String systemInfo = "Java " + System.getProperty("java.version") + "; " + System.getProperty("os.name") + "/" + System.getProperty("os.version");
+ System.out.println("SYSTEM_INFO = "+systemInfo);
+
serverHasAlreadyBeenStarted = false;
FilePathBuilder tomcat = new FilePathBuilder(tomcatHome);
@@ -83,7 +84,6 @@
} catch (Exception e) {
e.printStackTrace();
}
-
}
public void stop(){
@@ -91,6 +91,8 @@
try{
System.out.println("[] STOP TOMCAT SERVER");
execBootstrap("stop", System.out);
+
+ disconnect(10);
} catch (Exception e){
e.printStackTrace();
}
@@ -120,6 +122,23 @@
return (Properties) properties.clone();
}
+ private boolean disconnect(int tries) {
+ if (connect()){
+ tries--;
+ if (tries < 1) {
+ return false;
+ } else {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ }
+ disconnect(tries);
+ }
+ }
+
+ return true;
+ }
+
private boolean connect() {
return connect(1);
}
@@ -130,7 +149,6 @@
URL url = "" URL(servletUrl);
url.openStream();
} catch (Exception e) {
- System.out.println("Attempting to connect to " + servletUrl);
tries--;
//System.out.println(e.getMessage());
if (tries < 1) {
Modified: trunk/openejb1/modules/webadmin/project.xml (2512 => 2513)
--- trunk/openejb1/modules/webadmin/project.xml 2006-02-26 05:23:48 UTC (rev 2512)
+++ trunk/openejb1/modules/webadmin/project.xml 2006-02-26 05:53:47 UTC (rev 2513)
@@ -100,6 +100,7 @@
<directory>${basedir}/src</directory>
<includes>
<include>htdocs/**</include>
+ <include>META-INF/**</include>
</includes>
</resource>
<resource>
Added: trunk/openejb1/modules/webadmin/src/META-INF/org.openejb.server.ServerService/webadmin (2512 => 2513)
--- trunk/openejb1/modules/webadmin/src/META-INF/org.openejb.server.ServerService/webadmin 2006-02-26 05:23:48 UTC (rev 2512)
+++ trunk/openejb1/modules/webadmin/src/META-INF/org.openejb.server.ServerService/webadmin 2006-02-26 05:53:47 UTC (rev 2513)
@@ -0,0 +1,6 @@
+ server = org.openejb.webadmin.httpd.HttpServer
+ bind = 127.0.0.1
+ port = 4203
+ disabled = false
+ threads = 50
+
