Author: nbelaevski Date: 2010-09-01 15:45:20 -0400 (Wed, 01 Sep 2010) New Revision: 19086 Modified: trunk/core/impl/src/main/java/org/richfaces/VersionBean.java Log: https://jira.jboss.org/browse/RF-9268 Modified: trunk/core/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-09-01 18:09:30 UTC (rev 19085) +++ trunk/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-09-01 19:45:20 UTC (rev 19086) @@ -22,16 +22,20 @@ package org.richfaces; import java.io.IOException; +import java.io.InputStream; import java.net.JarURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.security.CodeSource; import java.security.ProtectionDomain; import java.text.MessageFormat; import java.util.jar.Attributes; +import java.util.jar.JarFile; import java.util.jar.JarInputStream; import java.util.jar.Manifest; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; @@ -45,9 +49,6 @@ public static final Version VERSION = new Version(); - private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); - - /** * Class for incapsulate version info. * @@ -56,6 +57,8 @@ */ public static class Version { + private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + private static final String UNKNOWN = ""; private String implementationVendor = UNKNOWN; @@ -125,6 +128,30 @@ if (codeSource != null) { URL url = codeSource.getLocation(); if (url != null) { + InputStream manifestStream = null; + try { + manifestStream = URLToStreamHelper.urlToStream(new URL(url, JarFile.MANIFEST_NAME)); + return new Manifest(manifestStream); + } catch (MalformedURLException e1) { + //that's ok - just log in debug + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(e1.getMessage(), e1); + } + } catch (IOException e) { + //that's ok - just log in debug + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(e.getMessage(), e); + } + } finally { + if (manifestStream != null) { + try { + manifestStream.close(); + } catch (IOException e) { + LOGGER.error(MessageFormat.format("Error closing stream: {0}", e.getMessage()), e); + } + } + } + JarInputStream jis = null; try { URLConnection urlConnection = url.openConnection();