Author: thorsten
Date: Mon Sep 18 00:43:57 2006
New Revision: 447308
URL: http://svn.apache.org/viewvc?view=rev&rev=447308
Log:
white noise - formating changes
Modified:
forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java?view=diff&rev=447308&r1=447307&r2=447308
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Mon
Sep 18 00:43:57 2006
@@ -62,16 +62,16 @@
private SourceResolver m_resolver;
- public Object getAttribute(String name, Configuration modeConf, Map
objectModel)
- throws ConfigurationException {
+ public Object getAttribute(String name, Configuration modeConf,
+ Map objectModel) throws ConfigurationException {
String original;
String attributeValue;
try {
original = super.getAttributeValues(name, modeConf, objectModel)[0]
.toString();
- attributeValue = this.getAttributeValues(name, modeConf,
objectModel)[0]
- .toString();
+ attributeValue = this.getAttributeValues(name, modeConf,
+ objectModel)[0].toString();
} catch (NullPointerException npe) {
original = "(not defined in forrest.xconf)";
attributeValue = filteringProperties.getProperty(name);
@@ -105,11 +105,12 @@
Object[] attributeValues = super.getAttributeValues(name, modeConf,
objectModel);
for (int i = 0; i < attributeValues.length; i++) {
- if (null!=attributeValues[i])
- attributeValues[i] =
filteringProperties.filter(attributeValues[i]
- .toString());
+ if (null != attributeValues[i])
+ attributeValues[i] = filteringProperties
+ .filter(attributeValues[i].toString());
else
- attributeValues[i] =
filteringProperties.filter(filteringProperties.getProperty(name));
+ attributeValues[i] = filteringProperties
+ .filter(filteringProperties.getProperty(name));
}
return attributeValues;
@@ -143,24 +144,25 @@
try {
// get the values from local.forrest.properties.xml
- forrestPropertiesStringURI = projectHome +
SystemUtils.FILE_SEPARATOR
+ forrestPropertiesStringURI = projectHome
+ + SystemUtils.FILE_SEPARATOR
+ "local.forrest.properties.xml";
filteringProperties = loadXMLPropertiesFromURI(filteringProperties,
forrestPropertiesStringURI);
// get the values from project forrest.properties.xml
- forrestPropertiesStringURI = projectHome +
SystemUtils.FILE_SEPARATOR
- + "forrest.properties.xml";
+ forrestPropertiesStringURI = projectHome
+ + SystemUtils.FILE_SEPARATOR + "forrest.properties.xml";
filteringProperties = loadXMLPropertiesFromURI(filteringProperties,
forrestPropertiesStringURI);
// get the values from user forrest.properties.xml
String userHome = filteringProperties.getProperty("user.home");
if (userHome != null) {
- forrestPropertiesStringURI = userHome +
SystemUtils.FILE_SEPARATOR
- + "forrest.properties.xml";
- filteringProperties =
loadXMLPropertiesFromURI(filteringProperties,
- forrestPropertiesStringURI);
+ forrestPropertiesStringURI = userHome
+ + SystemUtils.FILE_SEPARATOR +
"forrest.properties.xml";
+ filteringProperties = loadXMLPropertiesFromURI(
+ filteringProperties, forrestPropertiesStringURI);
}
// get the values from global forrest.properties.xml
@@ -168,12 +170,13 @@
if (globalHome != null) {
forrestPropertiesStringURI = globalHome
+ SystemUtils.FILE_SEPARATOR +
"forrest.properties.xml";
- filteringProperties =
loadXMLPropertiesFromURI(filteringProperties,
- forrestPropertiesStringURI);
+ filteringProperties = loadXMLPropertiesFromURI(
+ filteringProperties, forrestPropertiesStringURI);
}
// get the values from default.forrest.properties.xml
- forrestPropertiesStringURI = contextHome +
SystemUtils.FILE_SEPARATOR
+ forrestPropertiesStringURI = contextHome
+ + SystemUtils.FILE_SEPARATOR
+ "default.forrest.properties.xml";
filteringProperties = loadXMLPropertiesFromURI(filteringProperties,
forrestPropertiesStringURI);
@@ -184,8 +187,8 @@
if (strPluginList != null) {
StringTokenizer st = new StringTokenizer(strPluginList, ",");
while (st.hasMoreTokens()) {
- forrestPropertiesStringURI =
ForrestConfUtils.getPluginDir(st
- .nextToken().trim());
+ forrestPropertiesStringURI = ForrestConfUtils
+ .getPluginDir(st.nextToken().trim());
forrestPropertiesStringURI = forrestPropertiesStringURI
+ SystemUtils.FILE_SEPARATOR
+ "default.plugin.properties.xml";
@@ -225,7 +228,8 @@
for (Enumeration e = System.getProperties().propertyNames(); e
.hasMoreElements();) {
String propName = (String) e.nextElement();
- if (propName.startsWith("forrest.") ||
propName.startsWith("project.")
+ if (propName.startsWith("forrest.")
+ || propName.startsWith("project.")
|| propName.endsWith(".home")) {
String systemPropValue = System.getProperty(propName);
if (systemPropValue != null) {
@@ -255,7 +259,8 @@
try {
source = m_resolver.resolveURI(propertiesStringURI);
if (debugging())
- debug("Searching for forrest.properties.xml in " +
source.getURI());
+ debug("Searching for forrest.properties.xml in "
+ + source.getURI());
if (source.exists()) {
DocumentBuilderFactory factory = DocumentBuilderFactory
@@ -267,8 +272,9 @@
if (nl != null && nl.getLength() > 0) {
for (int i = 0; i < nl.getLength(); i++) {
Element el = (Element) nl.item(i);
-
filteringProperties.setProperty(el.getAttribute("name"), el
- .getAttribute("value"));
+ filteringProperties.setProperty(
+ el.getAttribute("name"), el
+ .getAttribute("value"));
}
}
