-
Notifications
You must be signed in to change notification settings - Fork 692
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TOMEE-4014 alternative approach that does not touch ServerInfo.proper…
…ties in catalina.jar, and works around the reflection issue with the final modifier
- Loading branch information
1 parent
f08c612
commit 7ce518e
Showing
3 changed files
with
137 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
tomee/apache-tomee/src/patch/java/org/apache/catalina/util/ServerInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.catalina.util; | ||
|
|
||
|
|
||
| import java.io.InputStream; | ||
| import java.util.Properties; | ||
|
|
||
| import org.apache.tomcat.util.ExceptionUtils; | ||
|
|
||
|
|
||
| /** | ||
| * Simple utility module to make it easy to plug in the server identifier | ||
| * when integrating Tomcat. | ||
| * | ||
| * @author Craig R. McClanahan | ||
| */ | ||
| public class ServerInfo { | ||
|
|
||
|
|
||
| // ------------------------------------------------------- Static Variables | ||
|
|
||
|
|
||
| /** | ||
| * The server information String with which we identify ourselves. | ||
| */ | ||
| private static final String serverInfo; | ||
|
|
||
| /** | ||
| * The server built String. | ||
| */ | ||
| private static final String serverBuilt; | ||
|
|
||
| /** | ||
| * The server's version number String. | ||
| */ | ||
| private static final String serverNumber; | ||
|
|
||
| static { | ||
|
|
||
| String info = null; | ||
| String built = null; | ||
| String number = null; | ||
|
|
||
| Properties props = new Properties(); | ||
| try (InputStream is = ServerInfo.class.getResourceAsStream | ||
| ("/org/apache/catalina/util/ServerInfo.properties")) { | ||
| props.load(is); | ||
| info = props.getProperty("server.info"); | ||
| built = props.getProperty("server.built"); | ||
| number = props.getProperty("server.number"); | ||
| } catch (Throwable t) { | ||
| ExceptionUtils.handleThrowable(t); | ||
| } | ||
| if (info == null || info.equals("Apache Tomcat/@VERSION@")) { | ||
| info = "Apache Tomcat/9.0.x-dev"; | ||
| } | ||
| if (built == null || built.equals("@VERSION_BUILT@")) { | ||
| built = "unknown"; | ||
| } | ||
| if (number == null || number.equals("@VERSION_NUMBER@")) { | ||
| number = "9.0.x"; | ||
| } | ||
|
|
||
| try { | ||
| final int slash = info.indexOf('/'); | ||
| Class<?> versionClass = Class.forName("org.apache.openejb.util.OpenEjbVersion"); | ||
| Object instance = versionClass.getDeclaredMethod("get").invoke(null); | ||
| final String tomeeVersion = (String) versionClass.getDeclaredMethod("getVersion").invoke(instance); | ||
|
|
||
| info = info.substring(0, slash) + " (TomEE)" + info.substring(slash) + " (" + tomeeVersion + ")"; | ||
| } catch (Throwable t) { | ||
| // ignore | ||
| t.printStackTrace(); | ||
| } | ||
|
|
||
| serverInfo = info; | ||
| serverBuilt = built; | ||
| serverNumber = number; | ||
| } | ||
|
|
||
|
|
||
| // --------------------------------------------------------- Public Methods | ||
|
|
||
|
|
||
| /** | ||
| * @return the server identification for this version of Tomcat. | ||
| */ | ||
| public static String getServerInfo() { | ||
| return serverInfo; | ||
| } | ||
|
|
||
| /** | ||
| * @return the server built time for this version of Tomcat. | ||
| */ | ||
| public static String getServerBuilt() { | ||
| return serverBuilt; | ||
| } | ||
|
|
||
| /** | ||
| * @return the server's version number. | ||
| */ | ||
| public static String getServerNumber() { | ||
| return serverNumber; | ||
| } | ||
|
|
||
| public static void main(String args[]) { | ||
| System.out.println("Server version: " + getServerInfo()); | ||
| System.out.println("Server built: " + getServerBuilt()); | ||
| System.out.println("Server number: " + getServerNumber()); | ||
| System.out.println("OS Name: " + | ||
| System.getProperty("os.name")); | ||
| System.out.println("OS Version: " + | ||
| System.getProperty("os.version")); | ||
| System.out.println("Architecture: " + | ||
| System.getProperty("os.arch")); | ||
| System.out.println("JVM Version: " + | ||
| System.getProperty("java.runtime.version")); | ||
| System.out.println("JVM Vendor: " + | ||
| System.getProperty("java.vm.vendor")); | ||
| } | ||
|
|
||
| } |
18 changes: 0 additions & 18 deletions
18
tomee/apache-tomee/src/template/patch/java/org/apache/catalina/util/ServerInfo.properties
This file was deleted.
Oops, something went wrong.