[jboss-svn-commits] JBoss Common SVN: r3682 - in jboss-logmanager/trunk: src/main/java/org/jboss/logmanager and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-11-12 21:22:36 -0500 (Thu, 12 Nov 2009)
New Revision: 3682

Modified:
   jboss-logmanager/trunk/pom.xml
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/PropertyConfigurator.java
Log:
Add time zone support to the property configurator

Modified: jboss-logmanager/trunk/pom.xml
===================================================================
--- jboss-logmanager/trunk/pom.xml	2009-11-13 02:17:12 UTC (rev 3681)
+++ jboss-logmanager/trunk/pom.xml	2009-11-13 02:22:36 UTC (rev 3682)
@@ -42,7 +42,7 @@
             <groupId>org.jboss</groupId>
             <artifactId>jboss-common-core</artifactId>
             <version>2.2.14.GA</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/PropertyConfigurator.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/PropertyConfigurator.java	2009-11-13 02:17:12 UTC (rev 3681)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/PropertyConfigurator.java	2009-11-13 02:22:36 UTC (rev 3682)
@@ -34,8 +34,10 @@
 import java.util.HashMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.TimeZone;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.nio.charset.Charset;
 import org.jboss.util.StringPropertyReplacer;
 
 import java.util.logging.Filter;
@@ -198,6 +200,10 @@
             argument = Double.valueOf(propValue);
         } else if (paramType == char.class || paramType == Character.class) {
             argument = Character.valueOf(propValue.length() > 0 ? propValue.charAt(0) : 0);
+        } else if (paramType == TimeZone.class) {
+            argument = TimeZone.getTimeZone(propValue);
+        } else if (paramType == Charset.class) {
+            argument = Charset.forName(propValue);
         } else {
             // ???
             throw new IllegalArgumentException("Unknown paramter type for property " + propertyName + " on " + objClass);