[Openutils-svn] SF.net SVN: openutils: [434] trunk/openutils-deployment/src/main/java/it/ openutils/deployment/log4j

[<fg...@us...>]

Revision: 434
          http://openutils.svn.sourceforge.net/openutils/?rev=434&view=rev
Author:   fgiust
Date:     2007-09-19 02:47:56 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
also expose ${server.name} to allow usage in log4j config files

Modified Paths:
--------------
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java	2007-09-13 13:53:59 UTC (rev 433)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java	2007-09-19 09:47:56 UTC (rev 434)
@@ -24,17 +24,8 @@
     {
         String[] propertiesLocation = StringUtils.split(commaSeparatedListOfPaths, ',');
 
-        String servername = null;
+        String servername = resolveServerName();
 
-        try
-        {
-            servername = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
-        }
-        catch (UnknownHostException e)
-        {
-            System.err.println(e.getMessage());
-        }
-
         String rootPath = StringUtils.replace(context.getRealPath("/"), "\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$
         String webapp = StringUtils.substringAfterLast(rootPath, "/"); //$NON-NLS-1$
 
@@ -59,7 +50,31 @@
             MessageFormat
                 .format(
                     "No configuration found using location list {0}. [servername] is [{1}], [webapp] is [{2}] and base path is [{3}]", //$NON-NLS-1$
-                    new Object[]{ArrayUtils.toString(propertiesLocation), servername, webapp, rootPath}));
+                    new Object[]{ArrayUtils.toString(propertiesLocation), servername, webapp, rootPath }));
 
     }
+
+    /**
+     * Resolve the current server name.
+     * @return server name, all lowercase, without domain
+     */
+    public static String resolveServerName()
+    {
+        String servername = null;
+
+        try
+        {
+            servername = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
+            if (StringUtils.contains(servername, "."))
+            {
+                servername = StringUtils.substringBefore(servername, ".");
+            }
+
+        }
+        catch (UnknownHostException e)
+        {
+            System.err.println(e.getMessage());
+        }
+        return servername;
+    }
 }

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java	2007-09-13 13:53:59 UTC (rev 433)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java	2007-09-19 09:47:56 UTC (rev 434)
@@ -41,6 +41,12 @@
         if (exposeWebAppRoot(servletContext))
         {
             WebUtils.setWebAppRootSystemProperty(servletContext);
+
+            String servername = DeploymentResolver.resolveServerName();
+            if (servername != null)
+            {
+                System.setProperty("server.name", servername);
+            }
         }
 
         String locationList = servletContext.getInitParameter("log4jConfigLocation");
@@ -65,12 +71,10 @@
             servletContext.log("Initializing Log4J from [" + location + "]");
             try
             {
-                // if (!ResourceUtils.isUrl(location))
-                // {
-                // location = WebUtils.getRealPath(servletContext, location);
-                // }
+
                 String intervalString = servletContext.getInitParameter("log4jRefreshInterval");
                 if (intervalString != null)
+                {
                     try
                     {
                         long refreshInterval = Long.parseLong(intervalString);
@@ -81,6 +85,7 @@
                         throw new IllegalArgumentException("Invalid 'log4jRefreshInterval' parameter: "
                             + ex.getMessage());
                     }
+                }
                 else
                 {
                     Log4jConfigurer.initLogging(location);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.