You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2008/03/06 08:57:09 UTC
svn commit: r634184 - in /openejb/trunk/openejb3/assembly/openejb-tomcat:
openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/
openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/
openejb-tomcat-common/src/main/jav...
Author: dain
Date: Wed Mar 5 23:57:08 2008
New Revision: 634184
URL: http://svn.apache.org/viewvc?rev=634184&view=rev
Log:
Tomcat 5.0 and earlier do not have server.number in ServerInfo.properties
The openejb.provider.default must be set into System properties
Other minor Tomcat fixes
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java?rev=634184&r1=634183&r2=634184&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java Wed Mar 5 23:57:08 2008
@@ -28,6 +28,8 @@
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardServer;
import org.apache.openejb.OpenEJB;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.LogCategory;
import org.apache.openejb.tomcat.installer.Installer;
import org.apache.openejb.tomcat.installer.Paths;
import org.apache.openejb.assembler.classic.WebAppBuilder;
@@ -59,7 +61,7 @@
// Enable System EJBs like the MEJB and DeployerEJB
properties.setProperty("openejb.deployments.classpath", "true");
properties.setProperty("openejb.deployments.classpath.filter.systemapps", "false");
- properties.setProperty("openejb.provider.default", "org.apache.openejb.tomcat");
+ System.setProperty("openejb.provider.default", "org.apache.openejb.tomcat");
// Loader maybe the first thing executed in a new classloader
// so we must attempt to initialize the system instance.
@@ -140,7 +142,10 @@
try {
ServerService serverService = (ServerService) Class.forName("org.apache.openejb.server.cxf.CxfService").newInstance();
serverService.start();
- } catch (Exception ignored) {
+ } catch (ClassNotFoundException ignored) {
+ } catch (Exception e) {
+ Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, getClass());
+ logger.error("Webservices failed to start", e);
}
}
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java?rev=634184&r1=634183&r2=634184&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java Wed Mar 5 23:57:08 2008
@@ -72,6 +72,15 @@
properties.load(classLoader.getResourceAsStream("org/apache/catalina/util/ServerInfo.properties"));
serverNumber = properties.getProperty("server.number");
+ if (serverNumber == null) {
+ // Tomcat 5.0 and earlier only has server.info
+ String serverInfo = properties.getProperty("server.info");
+ if (serverInfo != null) {
+ int slash = serverInfo.indexOf('/');
+ serverNumber = serverInfo.substring(slash + 1);
+ }
+ }
+
serverBuilt = properties.getProperty("server.built");
}
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java?rev=634184&r1=634183&r2=634184&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java Wed Mar 5 23:57:08 2008
@@ -94,7 +94,7 @@
if (catalinaHomeDir == null) return null;
- if (TomcatVersion.v6.equals(TomcatVersion.get())) {
+ if (TomcatVersion.v6.isTheVersion()) {
return new File(catalinaHomeDir, "lib");
} else {
return new File(new File(catalinaHomeDir, "server"), "lib");
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java?rev=634184&r1=634183&r2=634184&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java Wed Mar 5 23:57:08 2008
@@ -63,13 +63,25 @@
try {
Properties tomcatServerInfo = new Properties();
ClassLoader classLoader = TomcatHook.class.getClassLoader();
- properties.load(classLoader.getResourceAsStream("org/apache/catalina/util/ServerInfo.properties"));
+ tomcatServerInfo.load(classLoader.getResourceAsStream("org/apache/catalina/util/ServerInfo.properties"));
- String serverNumber = properties.getProperty("server.number");
- System.setProperty("tomcat.version", serverNumber);
+ String serverNumber = tomcatServerInfo.getProperty("server.number");
+ if (serverNumber == null) {
+ // Tomcat5 only has server.info
+ String serverInfo = tomcatServerInfo.getProperty("server.info");
+ if (serverInfo != null) {
+ int slash = serverInfo.indexOf('/');
+ serverNumber = serverInfo.substring(slash + 1);
+ }
+ }
+ if (serverNumber != null) {
+ System.setProperty("tomcat.version", serverNumber);
+ }
- String serverBuilt = properties.getProperty("server.built");
- System.setProperty("tomcat.built", serverBuilt);
+ String serverBuilt = tomcatServerInfo.getProperty("server.built");
+ if (serverBuilt != null) {
+ System.setProperty("tomcat.built", serverBuilt);
+ }
} catch (Throwable e) {
}