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

3 files changed, 8 insertions, 3 deletions

diff --git a/VERSION.txt b/VERSION.txt
index e105ffad8f..94ba4f02c0 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,7 @@
 jetty-7.4.1-SNAPSHOT
  + 340040 Support for a total timeout
  + 343083 Set nested dispatch type and connection
+ + 343172 Check package implementor for version
  + 343277 add support for a context white list
  + 343352 make sure that jetty.osgi.boot is activated when a WAB is registered
  + 343482 refactored overlay deployer layout to use WAR layout
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index adee6829f3..1830a9e2ec 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -53,11 +53,14 @@ public class Server extends HandlerWrapper implements Attributes
     private static final String _version;
     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();
         else
             _version=System.getProperty("jetty.version","7.x.y-SNAPSHOT");
     }
+    
     private final Container _container=new Container();
     private final AttributesMap _attributes = new AttributesMap();
     private ThreadPool _threadPool;
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
index 2135e8ab7b..011337f4d9 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
@@ -37,7 +37,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -150,7 +149,9 @@ public class Config
     static
     {
         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();
         else
             _version = System.getProperty("jetty.version","Unknown");