Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

343172 Check package implementor for version 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3084 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-05-06 06:31:21 +00:00
parent 4152e987cd
commit 9b1f8d3889
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,6 +1,7 @@
jetty-7.4.1-SNAPSHOT jetty-7.4.1-SNAPSHOT
+ 340040 Support for a total timeout + 340040 Support for a total timeout
+ 343083 Set nested dispatch type and connection + 343083 Set nested dispatch type and connection
+ 343172 Check package implementor for version
+ 343277 add support for a context white list + 343277 add support for a context white list
+ 343352 make sure that jetty.osgi.boot is activated when a WAB is registered + 343352 make sure that jetty.osgi.boot is activated when a WAB is registered
+ 343482 refactored overlay deployer layout to use WAR layout + 343482 refactored overlay deployer layout to use WAR layout

5
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

@ -53,11 +53,14 @@ public class Server extends HandlerWrapper implements Attributes
private static final String _version; private static final String _version;
static static
{ {
if (Server.class.getPackage()!=null && Server.class.getPackage().getImplementationVersion()!=null) if (Server.class.getPackage()!=null &&
"Eclipse.org - Jetty".equals(Server.class.getPackage().getImplementationVendor()) &&
Server.class.getPackage().getImplementationVersion()!=null)
_version=Server.class.getPackage().getImplementationVersion(); _version=Server.class.getPackage().getImplementationVersion();
else else
_version=System.getProperty("jetty.version","7.x.y-SNAPSHOT"); _version=System.getProperty("jetty.version","7.x.y-SNAPSHOT");
} }
private final Container _container=new Container(); private final Container _container=new Container();
private final AttributesMap _attributes = new AttributesMap(); private final AttributesMap _attributes = new AttributesMap();
private ThreadPool _threadPool; private ThreadPool _threadPool;

5
jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
View File

@ -37,7 +37,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -150,7 +149,9 @@ public class Config
static static
{ {
Package pkg = Config.class.getPackage(); Package pkg = Config.class.getPackage();
if (pkg != null && (pkg.getImplementationVersion() != null)) if (pkg != null &&
"Eclipse.org - Jetty".equals(pkg.getImplementationVendor()) &&
(pkg.getImplementationVersion() != null))
_version = pkg.getImplementationVersion(); _version = pkg.getImplementationVersion();
else else
_version = System.getProperty("jetty.version","Unknown"); _version = System.getProperty("jetty.version","Unknown");