geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r454011 [1/2] - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/ configs/j2ee-system/ modules/geronimo-system/ modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ modules/geronimo-system/src...
Date Sat, 07 Oct 2006 20:28:46 GMT
Author: jdillon
Date: Sat Oct  7 13:28:45 2006
New Revision: 454011

URL: http://svn.apache.org/viewvc?view=rev&rev=454011
Log:
(GERONIMO-2463) Initial support for condition expressions to be used in the persistent configuration list

Added:
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/condition/
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/condition/JexlConditionParserTest.java   (with props)
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParserTest.java   (with props)
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/configs/j2ee-system/pom.xml
    geronimo/server/trunk/modules/geronimo-system/pom.xml
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
    geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/local-attributes-1.1.xsd
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=454011&r1=454010&r2=454011
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Sat Oct  7 13:28:45 2006
@@ -94,6 +94,14 @@
                                     <artifactId>jline</artifactId>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>commons-jexl</groupId>
+                                    <artifactId>commons-jexl</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>ognl</groupId>
+                                    <artifactId>ognl</artifactId>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>org.apache.geronimo.specs</groupId>
                                     <artifactId>geronimo-qname_1.1_spec</artifactId>
                                 </artifactItem>

Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?view=diff&rev=454011&r1=454010&r2=454011
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Sat Oct  7 13:28:45 2006
@@ -131,6 +131,14 @@
                             <artifactId>xstream</artifactId>
                         </element>
                         <element>
+                            <groupId>commons-jexl</groupId>
+                            <artifactId>commons-jexl</artifactId>
+                        </element>
+                        <element>
+                            <groupId>ognl</groupId>
+                            <artifactId>ognl</artifactId>
+                        </element>
+                        <element>
                             <groupId>backport-util-concurrent</groupId>
                             <artifactId>backport-util-concurrent</artifactId>
                         </element>

Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/pom.xml?view=diff&rev=454011&r1=454010&r2=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat Oct  7 13:28:45 2006
@@ -56,6 +56,16 @@
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>commons-jexl</groupId>
+            <artifactId>commons-jexl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>ognl</groupId>
+            <artifactId>ognl</artifactId>
+        </dependency>
+        
         <!--
         NOTE: Need to include Xerces for tests in case Crimson (or another parser)
               gets picked up that does not support attributes

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java?view=diff&rev=454011&r1=454010&r2=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java Sat Oct  7 13:28:45 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -14,16 +13,20 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.system.configuration;
 
+import org.apache.geronimo.system.configuration.condition.ConditionParser;
+import org.apache.geronimo.system.configuration.condition.JexlConditionParser;
+
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.kernel.repository.Artifact;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Document;
 
-import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -34,8 +37,15 @@
 class ConfigurationOverride {
     private final Artifact name;
     private boolean load;
+    private String condition;
     private final Map gbeans = new LinkedHashMap();
 
+    /**
+     * Cached condition parser; lazy init on the first call to {@link #parseCondition()}
+     * whne {@link #condition} is non-null.
+     */
+    private static ConditionParser parser;
+
     public ConfigurationOverride(Artifact name, boolean load) {
         this.name = name;
         this.load = load;
@@ -44,12 +54,15 @@
     public ConfigurationOverride(ConfigurationOverride base, Artifact name) {
         this.name = name;
         this.load = base.load;
+        this.condition = base.condition;
         this.gbeans.putAll(base.gbeans);
     }
 
     public ConfigurationOverride(Element element) throws InvalidGBeanException {
         name = Artifact.create(element.getAttribute("name"));
-
+        
+        condition = element.getAttribute("condition");
+        
         String loadConfigString = element.getAttribute("load");
         load = !"false".equals(loadConfigString);
 
@@ -65,14 +78,36 @@
         return name;
     }
 
+    public String getCondition() {
+        return condition;
+    }
+    
+    public void setCondition(final String condition) {
+        this.condition = condition;
+    }
+
+    private boolean parseCondition() {
+        if (condition == null) {
+            // no condition means true
+            return true;
+        }
+
+        // Create a parser if one does not already exist
+        if (parser == null) {
+            parser = new JexlConditionParser();
+        }
+        
+        return parser.evaluate(condition);
+    }
+    
     public boolean isLoad() {
-        return load;
+        return load && parseCondition();
     }
 
     public void setLoad(boolean load) {
         this.load = load;
     }
-
+    
     public GBeanOverride getGBean(String gbeanName) {
         return (GBeanOverride) gbeans.get(gbeanName);
     }
@@ -101,9 +136,13 @@
         Element module = doc.createElement("module");
         root.appendChild(module);
         module.setAttribute("name", name.toString());
-        if(!load) {
+        if (!load) {
             module.setAttribute("load", "false");
         }
+        if (condition != null) {
+            module.setAttribute("condition", condition);
+        }
+
         // GBeans
         for (Iterator gb = gbeans.entrySet().iterator(); gb.hasNext();) {
             Map.Entry gbean = (Map.Entry) gb.next();

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.system.configuration.condition;
+
+/**
+ * Provides a simple facility to evaluate condition expressions.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ConditionParser
+{
+    /**
+     * Evaluate a condition expression.
+     *
+     * @param expression    The condition expression to evaluate; must not be null
+     * @return              True if the condition is satisfied
+     *
+     * @throws ConditionParserException     Failed to evaluate condition expression
+     */
+    boolean evaluate(String expression) throws ConditionParserException;
+}

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.system.configuration.condition;
+
+/**
+ * Thrown to indicate a problem related to condition parsing.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ConditionParserException
+    extends RuntimeException
+{
+    public ConditionParserException() {
+        super();
+    }
+
+    public ConditionParserException(final String msg, final Throwable cause) {
+        super(msg, cause);
+    }
+
+    public ConditionParserException(final String msg) {
+        super(msg);
+    }
+
+    public ConditionParserException(final Throwable cause) {
+        super(cause);
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ConditionParserException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.system.configuration.condition;
+
+/**
+ * Provides access to Java version details for use in condition expressions.
+ *
+ * @version $Rev$ $Date$
+ */
+public class JavaVariable
+{
+    public String getVendor() {
+        return SystemUtils.JAVA_VENDOR;
+    }
+
+    public String getVresion() {
+        return SystemUtils.JAVA_VERSION;
+    }
+
+    public String getVmVendor() {
+        return SystemUtils.JAVA_VM_VENDOR;
+    }
+    
+    public String getVmVersion() {
+        return SystemUtils.JAVA_VM_VERSION;
+    }
+
+    public boolean getIs1_1() {
+        return SystemUtils.IS_JAVA_1_1;
+    }
+
+    public boolean getIs1_2() {
+        return SystemUtils.IS_JAVA_1_2;
+    }
+
+    public boolean getIs1_3() {
+        return SystemUtils.IS_JAVA_1_3;
+    }
+
+    public boolean getIs1_4() {
+        return SystemUtils.IS_JAVA_1_4;
+    }
+
+    public boolean getIs1_5() {
+        return SystemUtils.IS_JAVA_1_5;
+    }
+
+    public boolean getIs1_6() {
+        return SystemUtils.IS_JAVA_1_6;
+    }
+
+    public boolean isVersionAtLeast(final float requiredVersion) {
+        return SystemUtils.isJavaVersionAtLeast(requiredVersion);
+    }
+
+    public boolean isVersionAtLeast(final int requiredVersion) {
+        return SystemUtils.isJavaVersionAtLeast(requiredVersion);
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.system.configuration.condition;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.jexl.Expression;
+import org.apache.commons.jexl.ExpressionFactory;
+import org.apache.commons.jexl.JexlContext;
+import org.apache.commons.jexl.JexlHelper;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collections;
+
+/**
+ * Provides a simple facility to evaluate condition expressions using the
+ * <a href="http://jakarta.apache.org/commons/jexl">Jexl</a> language.
+ *
+ * <p>
+ * This class is thread-safe.
+ * </p>
+ *
+ * @version $Rev$ $Date$
+ */
+public class JexlConditionParser
+    implements ConditionParser
+{
+    private static final Log log = LogFactory.getLog(JexlConditionParser.class);
+
+    private final Map vars;
+
+    public JexlConditionParser() {
+        // Setup the default vars
+        vars = new HashMap();
+
+        vars.put("props", Collections.unmodifiableMap(System.getProperties()));
+        vars.put("java", new JavaVariable());
+        vars.put("os", new OsVariable());
+    }
+
+    /**
+     * Evaluate a condition expression.
+     *
+     * @param expression    The condition expression to evaluate; must not be null
+     * @return              True if the condition is satisfied
+     *
+     * @throws org.apache.geronimo.system.configuration.condition.ConditionParserException     Failed to evaluate condition expression
+     */
+    public boolean evaluate(final String expression) throws ConditionParserException {
+        if (expression == null) {
+            throw new IllegalArgumentException("Expression must not be null");
+        }
+
+        // Empty expressions are true
+        if (expression.trim().length() == 0) {
+            log.debug("Expression is empty; skipping evaluation");
+
+            return true;
+        }
+
+        Object result;
+        try {
+            result = doEvaluate(expression);
+        }
+        catch (Exception e) {
+            throw new ConditionParserException("Failed to evaluate expression: " + expression, e);
+        }
+
+        if (result instanceof Boolean) {
+            return ((Boolean)result).booleanValue();
+        }
+        else {
+            throw new ConditionParserException("Expression '" + expression + "' did not evaluate to a boolean value; found: " + result);
+        }
+    }
+
+    private Object doEvaluate(final String expression) throws Exception {
+        assert expression != null;
+
+        boolean debug = log.isDebugEnabled();
+
+        if (debug) {
+            log.debug("Evaluating expression: " + expression);
+        }
+
+        Expression expr = ExpressionFactory.createExpression(expression);
+
+        JexlContext ctx = JexlHelper.createContext();
+        ctx.setVars(vars);
+
+        Object result = expr.evaluate(ctx);
+        if (debug) {
+            log.debug("Result: " + result);
+        }
+
+        return result;
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,112 @@
+/**
+ *  Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.system.configuration.condition;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collections;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import ognl.Ognl;
+import ognl.OgnlContext;
+
+/**
+ * Provides a simple facility to evaluate condition expressions using the
+ * <a href="http://ognl.org">OGNL</a> language.
+ *
+ * <p>
+ * This class is thread-safe.
+ * </p>
+ *
+ * @version $Rev$ $Date$
+ */
+public class OgnlConditionParser
+    implements ConditionParser
+{
+    private static final Log log = LogFactory.getLog(OgnlConditionParser.class);
+    
+    private final Map vars;
+    
+    public OgnlConditionParser() {
+        // Setup the default vars
+        vars = new HashMap();
+
+        vars.put("props", Collections.unmodifiableMap(System.getProperties()));
+        vars.put("java", new JavaVariable());
+        vars.put("os", new OsVariable());
+    }
+    
+    /**
+     * Evaluate a condition expression.
+     *
+     * @param expression    The condition expression to evaluate; must not be null
+     * @return              True if the condition is satisfied
+     *
+     * @throws ConditionParserException     Failed to evaluate condition expression
+     */
+    public boolean evaluate(final String expression) throws ConditionParserException {
+        if (expression == null) {
+            throw new IllegalArgumentException("Expression must not be null");
+        }
+        
+        // Empty expressions are true
+        if (expression.trim().length() == 0) {
+            log.debug("Expression is empty; skipping evaluation");
+            
+            return true;
+        }
+
+        Object result;
+        try {
+            result = doEvaluate(expression);
+        }
+        catch (Exception e) {
+            throw new ConditionParserException("Failed to evaluate expression: " + expression, e);
+        }
+
+        if (result instanceof Boolean) {
+            return ((Boolean)result).booleanValue();
+        }
+        else {
+            throw new ConditionParserException("Expression '" + expression + "' did not evaluate to a boolean value; found: " + result);
+        }
+    }
+    
+    private Object doEvaluate(final String expression) throws Exception {
+        assert expression != null;
+
+        boolean debug = log.isDebugEnabled();
+
+        if (debug) {
+            log.debug("Evaluating expression: " + expression);
+        }
+
+        // Object root;
+        OgnlContext context = new OgnlContext(vars);
+
+        Object expr = Ognl.parseExpression(expression);
+        Object result = Ognl.getValue(expr, context);
+        
+        if (debug) {
+            log.debug("Result: " + result);
+        }
+
+        return result;
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.system.configuration.condition;
+
+/**
+ * Provides access to operating system details for use in condition expressions.
+ *
+ * @version $Rev$ $Date$
+ */
+public class OsVariable
+{
+    public String getArch() {
+        return SystemUtils.OS_ARCH;
+    }
+
+    public String getName() {
+        return SystemUtils.OS_NAME;
+    }
+
+    public String getVersion() {
+        return SystemUtils.OS_VERSION;
+    }
+
+    public boolean getIsAIX() {
+        return SystemUtils.IS_OS_AIX;
+    }
+
+    public boolean getIsHPUX() {
+        return SystemUtils.IS_OS_HP_UX;
+    }
+
+    public boolean getIsIrix() {
+        return SystemUtils.IS_OS_IRIX;
+    }
+
+    public boolean getIsLinux() {
+        return SystemUtils.IS_OS_LINUX;
+    }
+
+    public boolean getIsMac() {
+        return SystemUtils.IS_OS_MAC;
+    }
+
+    public boolean getIsMacOSX() {
+        return SystemUtils.IS_OS_MAC_OSX;
+    }
+
+    public boolean getIsOS2() {
+        return SystemUtils.IS_OS_OS2;
+    }
+
+    public boolean getIsSolaris() {
+        return SystemUtils.IS_OS_SOLARIS;
+    }
+
+    public boolean getIsSunOS() {
+        return SystemUtils.IS_OS_SUN_OS;
+    }
+
+    public boolean getIsUnix() {
+        return SystemUtils.IS_OS_UNIX;
+    }
+
+    public boolean getIsWindows() {
+        return SystemUtils.IS_OS_WINDOWS;
+    }
+
+    public boolean getIsWindows2000() {
+        return SystemUtils.IS_OS_WINDOWS_2000;
+    }
+
+    public boolean getIsWindows95() {
+        return SystemUtils.IS_OS_WINDOWS_95;
+    }
+
+    public boolean getIsWindows98() {
+        return SystemUtils.IS_OS_WINDOWS_98;
+    }
+
+    public boolean getIsWindowsME() {
+        return SystemUtils.IS_OS_WINDOWS_ME;
+    }
+
+    public boolean getIsWindowsNT() {
+        return SystemUtils.IS_OS_WINDOWS_NT;
+    }
+
+    public boolean getIsWindowsXP() {
+        return SystemUtils.IS_OS_WINDOWS_XP;
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OsVariable.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java?view=auto&rev=454011
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java (added)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java Sat Oct  7 13:28:45 2006
@@ -0,0 +1,1357 @@
+/**
+ *  Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.system.configuration.condition;
+
+//
+// NOTE: Lifted from Jakarta commons-lang to avoid needing to pull in all of
+//       commons-lang into the bootstrap classpath.
+//
+//       DO NOT MODIFY ANY CODE BELOW
+//
+
+import java.io.File;
+
+/**
+ * <p>Helpers for <code>java.lang.System</code>.</p>
+ * 
+ * <p>If a system property cannot be read due to security restrictions, 
+ * the corresponding field in this class will be set to <code>null</code>
+ * and a message will be written to <code>System.err</code>.</p>
+ *
+ * @author Based on code from Avalon Excalibur
+ * @author Based on code from Lucene
+ * @author Stephen Colebourne
+ * @author <a href="mailto:sdowney@panix.com">Steve Downey</a>
+ * @author Gary Gregory
+ * @author Michael Becke
+ * @author Tetsuya Kaneuchi
+ * @author Rafal Krupinski
+ * @author Jason Gritman
+ * @since 1.0
+ * @version $Rev$ $Date$
+ */
+public class SystemUtils
+{
+    /**
+     * The prefix String for all Windows OS.
+     */
+    private static final String OS_NAME_WINDOWS_PREFIX = "Windows";
+    
+    // System property constants
+    //-----------------------------------------------------------------------
+    // These MUST be declared first. Other constants depend on this.
+    
+    /**
+     * The System property key for the user home directory.
+     */
+    private static final String USER_HOME_KEY = "user.home";
+
+    /**
+     * The System property key for the user directory.
+     */
+    private static final String USER_DIR_KEY = "user.dir";
+    
+    /**
+     * The System property key for the Java IO temporary directory.
+     */
+    private static final String JAVA_IO_TMPDIR_KEY = "java.io.tmpdir";
+    
+    /**
+     * The System property key for the Java home directory.
+     */
+    private static final String JAVA_HOME_KEY = "java.home";
+    
+    /**
+     * <p>The <code>awt.toolkit</code> System Property.</p>
+     * <p>Holds a class name, on Windows XP this is <code>sun.awt.windows.WToolkit</code>.</p>
+     * <p><b>On platforms without a GUI, this value is <code>null</code>.</b></p>
+     * 
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.1
+     */
+    public static final String AWT_TOOLKIT = getSystemProperty("awt.toolkit");
+
+    /**
+     * <p>The <code>file.encoding</code> System Property.</p>
+     * <p>File encoding, such as <code>Cp1252</code>.</p>
+     * 
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.0
+     * @since Java 1.2
+     */
+    public static final String FILE_ENCODING = getSystemProperty("file.encoding");
+
+    /**
+     * <p>The <code>file.separator</code> System Property.
+     * File separator (<code>&quot;/&quot;</code> on UNIX).</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String FILE_SEPARATOR = getSystemProperty("file.separator");
+
+    /**
+     * <p>The <code>java.awt.fonts</code> System Property.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.1
+     */
+    public static final String JAVA_AWT_FONTS = getSystemProperty("java.awt.fonts");
+
+    /**
+     * <p>The <code>java.awt.graphicsenv</code> System Property.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.1
+     */
+    public static final String JAVA_AWT_GRAPHICSENV = getSystemProperty("java.awt.graphicsenv");
+
+    /**
+     * <p>
+     * The <code>java.awt.headless</code> System Property.
+     * The value of this property is the String <code>"true"</code> or <code>"false"</code>. 
+     * </p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @see #isJavaAwtHeadless()
+     * @since 2.1
+     * @since Java 1.4
+     */
+    public static final String JAVA_AWT_HEADLESS = getSystemProperty("java.awt.headless");
+
+    /**
+     * <p>The <code>java.awt.printerjob</code> System Property.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.1
+     */
+    public static final String JAVA_AWT_PRINTERJOB = getSystemProperty("java.awt.printerjob");
+
+    /**
+     * <p>The <code>java.class.path</code> System Property. Java class path.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String JAVA_CLASS_PATH = getSystemProperty("java.class.path");
+
+    /**
+     * <p>The <code>java.class.version</code> System Property.
+     * Java class format version number.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String JAVA_CLASS_VERSION = getSystemProperty("java.class.version");
+
+    /**
+     * <p>The <code>java.compiler</code> System Property. Name of JIT compiler to use.
+     * First in JDK version 1.2. Not used in Sun JDKs after 1.2.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2. Not used in Sun versions after 1.2.
+     */
+    public static final String JAVA_COMPILER = getSystemProperty("java.compiler");
+
+    /**
+     * <p>The <code>java.endorsed.dirs</code> System Property. Path of endorsed directory
+     * or directories.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.4
+     */
+    public static final String JAVA_ENDORSED_DIRS = getSystemProperty("java.endorsed.dirs");
+
+    /**
+     * <p>The <code>java.ext.dirs</code> System Property. Path of extension directory
+     * or directories.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.3
+     */
+    public static final String JAVA_EXT_DIRS = getSystemProperty("java.ext.dirs");
+
+    /**
+     * <p>The <code>java.home</code> System Property. Java installation directory.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String JAVA_HOME = getSystemProperty(JAVA_HOME_KEY);
+
+    /**
+     * <p>The <code>java.io.tmpdir</code> System Property. Default temp file path.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_IO_TMPDIR = getSystemProperty(JAVA_IO_TMPDIR_KEY);
+
+    /**
+     * <p>The <code>java.library.path</code> System Property. List of paths to search
+     * when loading libraries.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_LIBRARY_PATH = getSystemProperty("java.library.path");
+
+    /**
+     * <p>The <code>java.runtime.name</code> System Property. Java Runtime Environment
+     * name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.0
+     * @since Java 1.3
+     */
+    public static final String JAVA_RUNTIME_NAME = getSystemProperty("java.runtime.name");
+
+    /**
+     * <p>The <code>java.runtime.version</code> System Property. Java Runtime Environment
+     * version.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.0
+     * @since Java 1.3
+     */
+    public static final String JAVA_RUNTIME_VERSION = getSystemProperty("java.runtime.version");
+
+    /**
+     * <p>The <code>java.specification.name</code> System Property. Java Runtime Environment
+     * specification name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_SPECIFICATION_NAME = getSystemProperty("java.specification.name");
+
+    /**
+     * <p>The <code>java.specification.vendor</code> System Property. Java Runtime Environment
+     * specification vendor.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_SPECIFICATION_VENDOR = getSystemProperty("java.specification.vendor");
+
+    /**
+     * <p>The <code>java.specification.version</code> System Property. Java Runtime Environment
+     * specification version.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.3
+     */
+    public static final String JAVA_SPECIFICATION_VERSION = getSystemProperty("java.specification.version");
+
+    /**
+     * <p>The <code>java.util.prefs.PreferencesFactory</code> System Property. A class name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.1
+     * @since Java 1.4
+     */
+    public static final String JAVA_UTIL_PREFS_PREFERENCES_FACTORY = 
+        getSystemProperty("java.util.prefs.PreferencesFactory");
+
+    /**
+     * <p>The <code>java.vendor</code> System Property. Java vendor-specific string.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String JAVA_VENDOR = getSystemProperty("java.vendor");
+
+    /**
+     * <p>The <code>java.vendor.url</code> System Property. Java vendor URL.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+    */
+    public static final String JAVA_VENDOR_URL = getSystemProperty("java.vendor.url");
+
+    /**
+     * <p>The <code>java.version</code> System Property. Java version number.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String JAVA_VERSION = getSystemProperty("java.version");
+
+    /**
+     * <p>The <code>java.vm.info</code> System Property. Java Virtual Machine implementation
+     * info.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.0
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_INFO = getSystemProperty("java.vm.info");
+
+    /**
+     * <p>The <code>java.vm.name</code> System Property. Java Virtual Machine implementation
+     * name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_NAME = getSystemProperty("java.vm.name");
+
+    /**
+     * <p>The <code>java.vm.specification.name</code> System Property. Java Virtual Machine
+     * specification name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_SPECIFICATION_NAME = getSystemProperty("java.vm.specification.name");
+
+    /**
+     * <p>The <code>java.vm.specification.vendor</code> System Property. Java Virtual
+     * Machine specification vendor.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_SPECIFICATION_VENDOR = getSystemProperty("java.vm.specification.vendor");
+
+    /**
+     * <p>The <code>java.vm.specification.version</code> System Property. Java Virtual Machine
+     * specification version.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_SPECIFICATION_VERSION = getSystemProperty("java.vm.specification.version");
+
+    /**
+     * <p>The <code>java.vm.vendor</code> System Property. Java Virtual Machine implementation
+     * vendor.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_VENDOR = getSystemProperty("java.vm.vendor");
+
+    /**
+     * <p>The <code>java.vm.version</code> System Property. Java Virtual Machine
+     * implementation version.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.2
+     */
+    public static final String JAVA_VM_VERSION = getSystemProperty("java.vm.version");
+
+    /**
+     * <p>The <code>line.separator</code> System Property. Line separator
+     * (<code>&quot;\n&quot;</code> on UNIX).</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String LINE_SEPARATOR = getSystemProperty("line.separator");
+
+    /**
+     * <p>The <code>os.arch</code> System Property. Operating system architecture.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String OS_ARCH = getSystemProperty("os.arch");
+
+    /**
+     * <p>The <code>os.name</code> System Property. Operating system name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String OS_NAME = getSystemProperty("os.name");
+
+    /**
+     * <p>The <code>os.version</code> System Property. Operating system version.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String OS_VERSION = getSystemProperty("os.version");
+
+    /**
+     * <p>The <code>path.separator</code> System Property. Path separator
+     * (<code>&quot;:&quot;</code> on UNIX).</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String PATH_SEPARATOR = getSystemProperty("path.separator");
+
+    /**
+     * <p>The <code>user.country</code> or <code>user.region</code> System Property.
+     * User's country code, such as <code>GB</code>. First in JDK version 1.2 as
+     * <code>user.region</code>. Renamed to <code>user.country</code> in 1.4</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.0
+     * @since Java 1.2
+     */
+    public static final String USER_COUNTRY = 
+        getSystemProperty("user.country") == null ?
+            getSystemProperty("user.region") : getSystemProperty("user.country");
+
+    /**
+     * <p>The <code>user.dir</code> System Property. User's current working
+     * directory.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String USER_DIR = getSystemProperty(USER_DIR_KEY);
+
+    /**
+     * <p>The <code>user.home</code> System Property. User's home directory.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String USER_HOME = getSystemProperty(USER_HOME_KEY);
+
+    /**
+     * <p>The <code>user.language</code> System Property. User's language code,
+     * such as <code>"en"</code>.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.0
+     * @since Java 1.2
+     */
+    public static final String USER_LANGUAGE = getSystemProperty("user.language");
+
+    /**
+     * <p>The <code>user.name</code> System Property. User's account name.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since Java 1.1
+     */
+    public static final String USER_NAME = getSystemProperty("user.name");
+
+    /**
+     * <p>The <code>user.timezone</code> System Property. 
+     * For example: <code>"America/Los_Angeles"</code>.</p>
+     *
+     * <p>Defaults to <code>null</code> if the runtime does not have
+     * security access to read this property or the property does not exist.</p>
+     * 
+     * <p>
+     * This value is initialized when the class is loaded. If {@link System#setProperty(String,String)}
+     * or {@link System#setProperties(java.util.Properties)} is called after this class is loaded, the value
+     * will be out of sync with that System property.
+     * </p>
+     * 
+     * @since 2.1
+     */
+    public static final String USER_TIMEZONE = getSystemProperty("user.timezone");
+
+    // Java version
+    //-----------------------------------------------------------------------
+    // This MUST be declared after those above as it depends on the
+    // values being set up
+
+    /**
+     * <p>Gets the Java version as a <code>String</code> trimming leading letters.</p>
+     *
+     * <p>The field will return <code>null</code> if {@link #JAVA_VERSION} is <code>null</code>.</p>
+     * 
+     * @since 2.1
+     */
+    public static final String JAVA_VERSION_TRIMMED = getJavaVersionTrimmed();
+
+    // Java version values
+    //-----------------------------------------------------------------------
+    // These MUST be declared after the trim above as they depend on the
+    // value being set up
+
+    /**
+     * <p>Gets the Java version as a <code>float</code>.</p>
+     *
+     * <p>Example return values:</p>
+     * <ul>
+     *  <li><code>1.2f</code> for JDK 1.2
+     *  <li><code>1.31f</code> for JDK 1.3.1
+     * </ul>
+     *
+     * <p>The field will return zero if {@link #JAVA_VERSION} is <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final float JAVA_VERSION_FLOAT = getJavaVersionAsFloat();
+
+    /**
+     * <p>Gets the Java version as an <code>int</code>.</p>
+     *
+     * <p>Example return values:</p>
+     * <ul>
+     *  <li><code>120</code> for JDK 1.2
+     *  <li><code>131</code> for JDK 1.3.1
+     * </ul>
+     *
+     * <p>The field will return zero if {@link #JAVA_VERSION} is <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final int JAVA_VERSION_INT = getJavaVersionAsInt();
+
+    // Java version checks
+    //-----------------------------------------------------------------------
+    // These MUST be declared after those above as they depend on the
+    // values being set up
+    
+    /**
+     * <p>Is <code>true</code> if this is Java version 1.1 (also 1.1.x versions).</p>
+     *
+     * <p>The field will return <code>false</code> if {@link #JAVA_VERSION} is
+     * <code>null</code>.</p>
+     */
+    public static final boolean IS_JAVA_1_1 = getJavaVersionMatches("1.1");
+
+    /**
+     * <p>Is <code>true</code> if this is Java version 1.2 (also 1.2.x versions).</p>
+     *
+     * <p>The field will return <code>false</code> if {@link #JAVA_VERSION} is
+     * <code>null</code>.</p>
+     */
+    public static final boolean IS_JAVA_1_2 = getJavaVersionMatches("1.2");
+
+    /**
+     * <p>Is <code>true</code> if this is Java version 1.3 (also 1.3.x versions).</p>
+     *
+     * <p>The field will return <code>false</code> if {@link #JAVA_VERSION} is
+     * <code>null</code>.</p>
+     */
+    public static final boolean IS_JAVA_1_3 = getJavaVersionMatches("1.3");
+
+    /**
+     * <p>Is <code>true</code> if this is Java version 1.4 (also 1.4.x versions).</p>
+     *
+     * <p>The field will return <code>false</code> if {@link #JAVA_VERSION} is
+     * <code>null</code>.</p>
+     */
+    public static final boolean IS_JAVA_1_4 = getJavaVersionMatches("1.4");
+
+    /**
+     * <p>Is <code>true</code> if this is Java version 1.5 (also 1.5.x versions).</p>
+     *
+     * <p>The field will return <code>false</code> if {@link #JAVA_VERSION} is
+     * <code>null</code>.</p>
+     */
+    public static final boolean IS_JAVA_1_5 = getJavaVersionMatches("1.5");
+
+    /**
+     * <p>Is <code>true</code> if this is Java version 1.6 (also 1.6.x versions).</p>
+     *
+     * <p>The field will return <code>false</code> if {@link #JAVA_VERSION} is
+     * <code>null</code>.</p>
+     */
+    public static final boolean IS_JAVA_1_6 = getJavaVersionMatches("1.6");
+
+    // Operating system checks
+    //-----------------------------------------------------------------------
+    // These MUST be declared after those above as they depend on the
+    // values being set up
+    // OS names from http://www.vamphq.com/os.html
+    // Selected ones included - please advise commons-dev@jakarta.apache.org
+    // if you want another added or a mistake corrected
+
+    /**
+     * <p>Is <code>true</code> if this is AIX.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_AIX = getOSMatches("AIX");
+
+    /**
+     * <p>Is <code>true</code> if this is HP-UX.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_HP_UX = getOSMatches("HP-UX");
+
+    /**
+     * <p>Is <code>true</code> if this is Irix.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_IRIX = getOSMatches("Irix");
+
+    /**
+     * <p>Is <code>true</code> if this is Linux.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_LINUX = getOSMatches("Linux") || getOSMatches("LINUX");
+
+    /**
+     * <p>Is <code>true</code> if this is Mac.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_MAC = getOSMatches("Mac");
+
+    /**
+     * <p>Is <code>true</code> if this is Mac.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_MAC_OSX = getOSMatches("Mac OS X");
+
+    /**
+     * <p>Is <code>true</code> if this is OS/2.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_OS2 = getOSMatches("OS/2");
+
+    /**
+     * <p>Is <code>true</code> if this is Solaris.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_SOLARIS = getOSMatches("Solaris");
+
+    /**
+     * <p>Is <code>true</code> if this is SunOS.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_SUN_OS = getOSMatches("SunOS");
+
+    /**
+     * <p>Is <code>true</code> if this is a POSIX compilant system,
+     * as in any of AIX, HP-UX, Irix, Linux, MacOSX, Solaris or SUN OS.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.1
+     */
+    public static final boolean IS_OS_UNIX =
+        IS_OS_AIX || IS_OS_HP_UX || IS_OS_IRIX || IS_OS_LINUX ||
+        IS_OS_MAC_OSX || IS_OS_SOLARIS || IS_OS_SUN_OS;
+
+    /**
+     * <p>Is <code>true</code> if this is Windows.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS = getOSMatches(OS_NAME_WINDOWS_PREFIX);
+
+    /**
+     * <p>Is <code>true</code> if this is Windows 2000.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS_2000 = getOSMatches(OS_NAME_WINDOWS_PREFIX, "5.0");
+
+    /**
+     * <p>Is <code>true</code> if this is Windows 95.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS_95 = getOSMatches(OS_NAME_WINDOWS_PREFIX + " 9", "4.0");
+    // JDK 1.2 running on Windows98 returns 'Windows 95', hence the above
+
+    /**
+     * <p>Is <code>true</code> if this is Windows 98.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS_98 = getOSMatches(OS_NAME_WINDOWS_PREFIX + " 9", "4.1");
+    // JDK 1.2 running on Windows98 returns 'Windows 95', hence the above
+
+    /**
+     * <p>Is <code>true</code> if this is Windows ME.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS_ME = getOSMatches(OS_NAME_WINDOWS_PREFIX, "4.9");
+    // JDK 1.2 running on WindowsME may return 'Windows 95', hence the above
+
+    /**
+     * <p>Is <code>true</code> if this is Windows NT.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS_NT = getOSMatches(OS_NAME_WINDOWS_PREFIX + " NT");
+    // Windows 2000 returns 'Windows 2000' but may suffer from same JDK1.2 problem
+
+    /**
+     * <p>Is <code>true</code> if this is Windows XP.</p>
+     *
+     * <p>The field will return <code>false</code> if <code>OS_NAME</code> is
+     * <code>null</code>.</p>
+     * 
+     * @since 2.0
+     */
+    public static final boolean IS_OS_WINDOWS_XP = getOSMatches(OS_NAME_WINDOWS_PREFIX, "5.1");
+
+    //-----------------------------------------------------------------------    
+    /**
+     * <p>SystemUtils instances should NOT be constructed in standard
+     * programming. Instead, the class should be used as
+     * <code>SystemUtils.FILE_SEPARATOR</code>.</p>
+     *
+     * <p>This constructor is public to permit tools that require a JavaBean
+     * instance to operate.</p>
+     */
+    public SystemUtils() {
+        super();
+    }
+    
+    //-----------------------------------------------------------------------    
+    /**
+     * <p>Gets the Java version number as a <code>float</code>.</p>
+     *
+     * <p>Example return values:</p>
+     * <ul>
+     *  <li><code>1.2f</code> for JDK 1.2
+     *  <li><code>1.31f</code> for JDK 1.3.1
+     * </ul>
+     * 
+     * @return the version, for example 1.31f for JDK 1.3.1
+     * @deprecated Use {@link #JAVA_VERSION_FLOAT} instead.
+     *             Method will be removed in Commons Lang 3.0.
+     */
+    public static float getJavaVersion() {
+        return JAVA_VERSION_FLOAT;
+    }
+
+    /**
+     * <p>Gets the Java version number as a <code>float</code>.</p>
+     *
+     * <p>Example return values:</p>
+     * <ul>
+     *  <li><code>1.2f</code> for JDK 1.2
+     *  <li><code>1.31f</code> for JDK 1.3.1
+     * </ul>
+     * 
+     * <p>Patch releases are not reported.
+     * Zero is returned if {@link #JAVA_VERSION_TRIMMED} is <code>null</code>.</p>
+     * 
+     * @return the version, for example 1.31f for JDK 1.3.1
+     */
+    private static float getJavaVersionAsFloat() {
+        if (JAVA_VERSION_TRIMMED == null) {
+            return 0f;
+        }
+        String str = JAVA_VERSION_TRIMMED.substring(0, 3);
+        if (JAVA_VERSION_TRIMMED.length() >= 5) {
+            str = str + JAVA_VERSION_TRIMMED.substring(4, 5);
+        }
+        try {
+            return Float.parseFloat(str);
+        } catch (Exception ex) {
+            return 0;
+        }
+    }
+    
+    /**
+     * <p>Gets the Java version number as an <code>int</code>.</p>
+     *
+     * <p>Example return values:</p>
+     * <ul>
+     *  <li><code>120</code> for JDK 1.2
+     *  <li><code>131</code> for JDK 1.3.1
+     * </ul>
+     * 
+     * <p>Patch releases are not reported.
+     * Zero is returned if {@link #JAVA_VERSION_TRIMMED} is <code>null</code>.</p>
+     * 
+     * @return the version, for example 131 for JDK 1.3.1
+     */
+    private static int getJavaVersionAsInt() {
+        if (JAVA_VERSION_TRIMMED == null) {
+            return 0;
+        }
+        String str = JAVA_VERSION_TRIMMED.substring(0, 1);
+        str = str + JAVA_VERSION_TRIMMED.substring(2, 3);
+        if (JAVA_VERSION_TRIMMED.length() >= 5) {
+            str = str + JAVA_VERSION_TRIMMED.substring(4, 5);
+        } else {
+            str = str + "0";
+        }
+        try {
+            return Integer.parseInt(str);
+        } catch (Exception ex) {
+            return 0;
+        }
+    }
+
+    /**
+     * Trims the text of the java version to start with numbers.
+     * 
+     * @return the trimmed java version
+     */
+    private static String getJavaVersionTrimmed() {
+        if (JAVA_VERSION != null) {
+            for (int i = 0; i < JAVA_VERSION.length(); i++) {
+                char ch = JAVA_VERSION.charAt(i);
+                if (ch >= '0' && ch <= '9') {
+                    return JAVA_VERSION.substring(i);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * <p>Decides if the java version matches.</p>
+     * 
+     * @param versionPrefix  the prefix for the java version
+     * @return true if matches, or false if not or can't determine
+     */
+    private static boolean getJavaVersionMatches(String versionPrefix) {
+        if (JAVA_VERSION_TRIMMED == null) {
+            return false;
+        }
+        return JAVA_VERSION_TRIMMED.startsWith(versionPrefix);
+    }    
+    
+    /**
+     * <p>Decides if the operating system matches.</p>
+     * 
+     * @param osNamePrefix  the prefix for the os name
+     * @return true if matches, or false if not or can't determine
+     */
+    private static boolean getOSMatches(String osNamePrefix) {
+        if (OS_NAME == null) {
+            return false;
+        }
+        return OS_NAME.startsWith(osNamePrefix);
+    }    
+
+    /**
+     * <p>Decides if the operating system matches.</p>
+     * 
+     * @param osNamePrefix  the prefix for the os name
+     * @param osVersionPrefix  the prefix for the version
+     * @return true if matches, or false if not or can't determine
+     */
+    private static boolean getOSMatches(String osNamePrefix, String osVersionPrefix) {
+        if (OS_NAME == null || OS_VERSION == null) {
+            return false;
+        }
+        return OS_NAME.startsWith(osNamePrefix) && OS_VERSION.startsWith(osVersionPrefix);
+    }    
+
+    //-----------------------------------------------------------------------
+    /**
+     * <p>Gets a System property, defaulting to <code>null</code> if the property
+     * cannot be read.</p>
+     *
+     * <p>If a <code>SecurityException</code> is caught, the return
+     * value is <code>null</code> and a message is written to <code>System.err</code>.</p>
+     * 
+     * @param property the system property name
+     * @return the system property value or <code>null</code> if a security problem occurs
+     */
+    private static String getSystemProperty(String property) {
+        try {
+            return System.getProperty(property);
+        } catch (SecurityException ex) {
+            // we are not allowed to look at this property
+            System.err.println(
+                "Caught a SecurityException reading the system property '" + property 
+                + "'; the SystemUtils property value will default to null."
+            );
+            return null;
+        }
+    }
+    
+    /**
+     * <p>Is the Java version at least the requested version.</p>
+     *
+     * <p>Example input:</p>
+     * <ul>
+     *  <li><code>1.2f</code> to test for JDK 1.2</li>
+     *  <li><code>1.31f</code> to test for JDK 1.3.1</li>
+     * </ul>
+     * 
+     * @param requiredVersion  the required version, for example 1.31f
+     * @return <code>true</code> if the actual version is equal or greater
+     *  than the required version
+     */
+    public static boolean isJavaVersionAtLeast(float requiredVersion) {
+        return JAVA_VERSION_FLOAT >= requiredVersion;
+    }
+    
+    /**
+     * <p>Is the Java version at least the requested version.</p>
+     *
+     * <p>Example input:</p>
+     * <ul>
+     *  <li><code>120</code> to test for JDK 1.2 or greater</li>
+     *  <li><code>131</code> to test for JDK 1.3.1 or greater</li>
+     * </ul>
+     * 
+     * @param requiredVersion  the required version, for example 131
+     * @return <code>true</code> if the actual version is equal or greater
+     *  than the required version
+     * @since 2.0
+     */
+    public static boolean isJavaVersionAtLeast(int requiredVersion) {
+        return JAVA_VERSION_INT >= requiredVersion;
+    }
+
+    /**
+     * Returns whether the {@link #JAVA_AWT_HEADLESS} value is <code>true</code>.
+     *  
+     * @return <code>true</code> if <code>JAVA_AWT_HEADLESS</code> is <code>"true"</code>,
+     * <code>false</code> otherwise.
+     * 
+     * @see #JAVA_AWT_HEADLESS
+     * @since 2.1
+     * @since Java 1.4
+     */
+    public static boolean isJavaAwtHeadless() {
+        return JAVA_AWT_HEADLESS != null ? JAVA_AWT_HEADLESS.equals(Boolean.TRUE.toString()) : false;
+    }
+    /**
+     * <p>Gets the Java home directory as a <code>File</code>.</p>
+     * 
+     * @return a directory
+     * @throws  SecurityException  if a security manager exists and its  
+     *             <code>checkPropertyAccess</code> method doesn't allow
+     *              access to the specified system property.
+     * @see System#getProperty(String)
+     * @since 2.1
+     */
+    public static File getJavaHome() {
+        return new File(System.getProperty(JAVA_HOME_KEY));
+    }
+
+    /**
+     * <p>Gets the Java IO temporary directory as a <code>File</code>.</p>
+     * 
+     * @return a directory
+     * @throws  SecurityException  if a security manager exists and its  
+     *             <code>checkPropertyAccess</code> method doesn't allow
+     *              access to the specified system property.
+     * @see System#getProperty(String)
+     * @since 2.1
+     */
+    public static File getJavaIoTmpDir() {
+        return new File(System.getProperty(JAVA_IO_TMPDIR_KEY));
+    }
+
+    /**
+     * <p>Gets the user directory as a <code>File</code>.</p>
+     * 
+     * @return a directory
+     * @throws  SecurityException  if a security manager exists and its  
+     *             <code>checkPropertyAccess</code> method doesn't allow
+     *              access to the specified system property.
+     * @see System#getProperty(String)
+     * @since 2.1
+     */
+    public static File getUserDir() {
+        return new File(System.getProperty(USER_DIR_KEY));
+    }
+
+    /**
+     * <p>Gets the user home directory as a <code>File</code>.</p>
+     * 
+     * @return a directory
+     * @throws  SecurityException  if a security manager exists and its  
+     *             <code>checkPropertyAccess</code> method doesn't allow
+     *              access to the specified system property.
+     * @see System#getProperty(String)
+     * @since 2.1
+     */
+    public static File getUserHome() {
+        return new File(System.getProperty(USER_HOME_KEY));
+    }
+
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/SystemUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message