forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 20791 - forrest/trunk/src/java/org/apache/forrest/conf
Date Thu, 03 Jun 2004 18:48:39 GMT
Author: cheche
Date: Thu Jun  3 11:48:38 2004
New Revision: 20791

Modified:
   forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java   (contents, props
changed)
Log:
Allows to display eol native


Modified: forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java
==============================================================================
--- forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java	(original)
+++ forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java	Thu Jun  3 11:48:38
2004
@@ -1,216 +1,216 @@
-/*
- * Copyright 1999-2004 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.forrest.conf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.util.Map;
-
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.DefaultsModule;
-import org.apache.cocoon.components.modules.input.InputModule;
-import org.apache.commons.lang.SystemUtils;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceNotFoundException;
-import org.apache.excalibur.source.SourceResolver;
-
-/**
- * Input module for accessing the base properties used in Forrest. The main
- * values are the locations of the <b>source </b> directories and of the
- * <b>forrest </b> directories. The values are gotten from the
- * 
- * <pre>
- * forrest.properties
- * </pre>
- * 
- * ant property file and resolved relative to the java system properties named
- * 
- * <pre>
- * forrest.home
- * </pre>
- * 
- * and
- * 
- * <pre>
- * project.home
- * </pre>, that the forrest scripts set using the calling directory and the
- * environment variable
- * 
- * <pre>
- * FORREST_HOME
- * </pre>. If Forrest is run from a war, it won't have these properties set, so
- * the directories are resolved relative to the current directory, that in this
- * case is the forrest webapp root.
- */
-public class ForrestConfModule extends DefaultsModule implements InputModule,
-                Initializable, ThreadSafe, Serviceable
-{
-
-    private AntProperties  filteringProperties;
-    private String         forrestHome, projectHome, contextHome;
-    private SourceResolver m_resolver;
-    
-    private final static String defaultHome = "context:/";
-
-    public Object getAttribute(String name, Configuration modeConf,
-                    Map objectModel) throws ConfigurationException {
-        String original = super.getAttributeValues(name, modeConf, objectModel)[0]
-                        .toString();
-        String attributeValue = this.getAttributeValues(name, modeConf,
-                        objectModel)[0].toString();
-
-        if (debugging()) debug(" - Requested:" + name);
-        if (debugging()) debug(" - Unfiltered:" + original);
-        if (debugging()) debug(" - Given:" + attributeValue);
-
-        return attributeValue;
-    }
-
-    public Object[] getAttributeValues(String name, Configuration modeConf,
-                    Map objectModel) throws ConfigurationException {
-        Object[] attributeValues = super.getAttributeValues(name, modeConf,
-                        objectModel);
-        for (int i = 0; i < attributeValues.length; i++) {
-            attributeValues[i] = filteringProperties.filter(attributeValues[i]
-                            .toString());
-        }
-
-        return attributeValues;
-    }
-
-    private final String getSystemProperty(String propertyName){
-
-        //if the property is not set, default to the webapp context
-        String propertyValue = System.getProperty(propertyName, defaultHome);
-
-        if (debugging()) debug("system property " + propertyName + "=" + propertyValue);
-
-        return propertyValue;
-    }
-
-    public void initialize() throws Exception {
-
-        //NOTE: Don't do this:
-        //
-        //        forrestHome = System.getenv("FORREST_HOME");
-        //
-        //      as it will get FORREST_HOME even when the app
-        //      is run as a .war
-        forrestHome = getSystemProperty("forrest.home");
-        projectHome = getSystemProperty("project.home");
-        if(projectHome.equals(defaultHome)) {
-            projectHome = defaultHome + SystemUtils.FILE_SEPARATOR + "/project";
-        }
-        if(forrestHome.equals(defaultHome)) {
-            contextHome = defaultHome;            
-        }else {
-            contextHome = forrestHome + SystemUtils.FILE_SEPARATOR + "/context"; 
-        }
-            
-        
-        filteringProperties = new AntProperties();
-        
-        //add forrest.home and project.home to properties
-        filteringProperties.setProperty("forrest.home", forrestHome);
-        filteringProperties.setProperty("project.home", projectHome);
-        filteringProperties.setProperty("context.home", contextHome);
-      
-        //NOTE: the first values set get precedence, as in AntProperties
-
-        // get forrest.properties and load the values
-        String forrestPropertiesStringURI = projectHome
-                        + SystemUtils.FILE_SEPARATOR + "forrest.properties";
-
-        filteringProperties = 
-            loadAntPropertiesFromURI(filteringProperties,forrestPropertiesStringURI);
-
-        
-        // get default-forrest.properties and load the values
-        String defaultRorrestPropertiesStringURI = contextHome
-                        + SystemUtils.FILE_SEPARATOR
-                        + "default-forrest.properties";
-
-        filteringProperties = 
-            loadAntPropertiesFromURI(filteringProperties,defaultRorrestPropertiesStringURI);
-
-        if (debugging()) debug("Loaded project forrest.properties:" + filteringProperties);
-    }
-
-    /**
-     * @param antPropertiesStringURI
-     * @throws MalformedURLException
-     * @throws IOException
-     * @throws SourceNotFoundException
-     */
-    private AntProperties loadAntPropertiesFromURI(AntProperties precedingProperties, String
antPropertiesStringURI) throws MalformedURLException, IOException, SourceNotFoundException
{
-        
-        Source source = null;
-        InputStream in = null;
-        try {
-           
-            source = m_resolver.resolveURI(antPropertiesStringURI);
-
-            if (debugging()) debug("Searching for forrest.properties in"
-                                                + source.getURI());
-            in = source.getInputStream();
-            filteringProperties = new AntProperties(precedingProperties);
-            filteringProperties.load(in);
-
-            if (debugging()) debug("Loaded:" + antPropertiesStringURI +
-                                           filteringProperties.toString());
-
-        } finally {
-            if (source != null) {
-                m_resolver.release(source);
-            }
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {}
-            }
-        }
-        
-        return filteringProperties;
-    }
-
-    public void service(ServiceManager manager) throws ServiceException {
-        m_resolver = (SourceResolver) manager.lookup(SourceResolver.ROLE);
-    }
-
-    
-    /**
-     * Rocked science
-     */
-    private final boolean debugging() {
-        return getLogger().isDebugEnabled();
-   }
-    
-    /**
-     * Rocked science
-     * @param debugString
-     */
-    private final void debug(String debugString) {
-            getLogger().debug(debugString);
-   }
-    
-}
+/*
+ * Copyright 1999-2004 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.forrest.conf;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.util.Map;
+
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.modules.input.DefaultsModule;
+import org.apache.cocoon.components.modules.input.InputModule;
+import org.apache.commons.lang.SystemUtils;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceNotFoundException;
+import org.apache.excalibur.source.SourceResolver;
+
+/**
+ * Input module for accessing the base properties used in Forrest. The main
+ * values are the locations of the <b>source </b> directories and of the
+ * <b>forrest </b> directories. The values are gotten from the
+ * 
+ * <pre>
+ * forrest.properties
+ * </pre>
+ * 
+ * ant property file and resolved relative to the java system properties named
+ * 
+ * <pre>
+ * forrest.home
+ * </pre>
+ * 
+ * and
+ * 
+ * <pre>
+ * project.home
+ * </pre>, that the forrest scripts set using the calling directory and the
+ * environment variable
+ * 
+ * <pre>
+ * FORREST_HOME
+ * </pre>. If Forrest is run from a war, it won't have these properties set, so
+ * the directories are resolved relative to the current directory, that in this
+ * case is the forrest webapp root.
+ */
+public class ForrestConfModule extends DefaultsModule implements InputModule,
+                Initializable, ThreadSafe, Serviceable
+{
+
+    private AntProperties  filteringProperties;
+    private String         forrestHome, projectHome, contextHome;
+    private SourceResolver m_resolver;
+    
+    private final static String defaultHome = "context:/";
+
+    public Object getAttribute(String name, Configuration modeConf,
+                    Map objectModel) throws ConfigurationException {
+        String original = super.getAttributeValues(name, modeConf, objectModel)[0]
+                        .toString();
+        String attributeValue = this.getAttributeValues(name, modeConf,
+                        objectModel)[0].toString();
+
+        if (debugging()) debug(" - Requested:" + name);
+        if (debugging()) debug(" - Unfiltered:" + original);
+        if (debugging()) debug(" - Given:" + attributeValue);
+
+        return attributeValue;
+    }
+
+    public Object[] getAttributeValues(String name, Configuration modeConf,
+                    Map objectModel) throws ConfigurationException {
+        Object[] attributeValues = super.getAttributeValues(name, modeConf,
+                        objectModel);
+        for (int i = 0; i < attributeValues.length; i++) {
+            attributeValues[i] = filteringProperties.filter(attributeValues[i]
+                            .toString());
+        }
+
+        return attributeValues;
+    }
+
+    private final String getSystemProperty(String propertyName){
+
+        //if the property is not set, default to the webapp context
+        String propertyValue = System.getProperty(propertyName, defaultHome);
+
+        if (debugging()) debug("system property " + propertyName + "=" + propertyValue);
+
+        return propertyValue;
+    }
+
+    public void initialize() throws Exception {
+
+        //NOTE: Don't do this:
+        //
+        //        forrestHome = System.getenv("FORREST_HOME");
+        //
+        //      as it will get FORREST_HOME even when the app
+        //      is run as a .war
+        forrestHome = getSystemProperty("forrest.home");
+        projectHome = getSystemProperty("project.home");
+        if(projectHome.equals(defaultHome)) {
+            projectHome = defaultHome + SystemUtils.FILE_SEPARATOR + "/project";
+        }
+        if(forrestHome.equals(defaultHome)) {
+            contextHome = defaultHome;            
+        }else {
+            contextHome = forrestHome + SystemUtils.FILE_SEPARATOR + "/context"; 
+        }
+            
+        
+        filteringProperties = new AntProperties();
+        
+        //add forrest.home and project.home to properties
+        filteringProperties.setProperty("forrest.home", forrestHome);
+        filteringProperties.setProperty("project.home", projectHome);
+        filteringProperties.setProperty("context.home", contextHome);
+      
+        //NOTE: the first values set get precedence, as in AntProperties
+
+        // get forrest.properties and load the values
+        String forrestPropertiesStringURI = projectHome
+                        + SystemUtils.FILE_SEPARATOR + "forrest.properties";
+
+        filteringProperties = 
+            loadAntPropertiesFromURI(filteringProperties,forrestPropertiesStringURI);
+
+        
+        // get default-forrest.properties and load the values
+        String defaultRorrestPropertiesStringURI = contextHome
+                        + SystemUtils.FILE_SEPARATOR
+                        + "default-forrest.properties";
+
+        filteringProperties = 
+            loadAntPropertiesFromURI(filteringProperties,defaultRorrestPropertiesStringURI);
+
+        if (debugging()) debug("Loaded project forrest.properties:" + filteringProperties);
+    }
+
+    /**
+     * @param antPropertiesStringURI
+     * @throws MalformedURLException
+     * @throws IOException
+     * @throws SourceNotFoundException
+     */
+    private AntProperties loadAntPropertiesFromURI(AntProperties precedingProperties, String
antPropertiesStringURI) throws MalformedURLException, IOException, SourceNotFoundException
{
+        
+        Source source = null;
+        InputStream in = null;
+        try {
+           
+            source = m_resolver.resolveURI(antPropertiesStringURI);
+
+            if (debugging()) debug("Searching for forrest.properties in"
+                                                + source.getURI());
+            in = source.getInputStream();
+            filteringProperties = new AntProperties(precedingProperties);
+            filteringProperties.load(in);
+
+            if (debugging()) debug("Loaded:" + antPropertiesStringURI +
+                                           filteringProperties.toString());
+
+        } finally {
+            if (source != null) {
+                m_resolver.release(source);
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {}
+            }
+        }
+        
+        return filteringProperties;
+    }
+
+    public void service(ServiceManager manager) throws ServiceException {
+        m_resolver = (SourceResolver) manager.lookup(SourceResolver.ROLE);
+    }
+
+    
+    /**
+     * Rocked science
+     */
+    private final boolean debugging() {
+        return getLogger().isDebugEnabled();
+   }
+    
+    /**
+     * Rocked science
+     * @param debugString
+     */
+    private final void debug(String debugString) {
+            getLogger().debug(debugString);
+   }
+    
+}

Mime
View raw message