sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Working on the JMF implementation of the media service.

Browse Source 
Added a method for an initial dump of the user environment (if enabled, logs all system properties and their values)
cusax-fix
Emil Ivov 20 years ago
parent d484b75c30
commit 72175cf38d
1 changed files with 92 additions and 96 deletions
Show Stats Download Patch File Download Diff File

188
src/net/java/sip/communicator/impl/configuration/ConfigurationServiceImpl.java
Unescape View File

@ -17,7 +17,6 @@
import net.java.sip.communicator.service.configuration.event.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.xml.*;
import net.java.sip.communicator.util.xml.XMLUtils;
/**
* A straight forward implementation of the ConfigurationService using an xml
@ -123,65 +122,64 @@ public void setProperty(String propertyName, Object property)
* at least one propertychange listener.
*/
public void setProperty(String propertyName, Object property,
boolean isSystem) throws PropertyVetoException
boolean isSystem)
throws PropertyVetoException
{
try{
logger.logEntry();
Object oldValue = getProperty(propertyName);
//first check whether the change is ok with everyone
if (changeEventDispatcher.hasVetoableChangeListeners(propertyName))
changeEventDispatcher.fireVetoableChange(
propertyName, oldValue, property);
Object oldValue = getProperty(propertyName);
//first check whether the change is ok with everyone
if (changeEventDispatcher.hasVetoableChangeListeners(propertyName))
changeEventDispatcher.fireVetoableChange(
propertyName, oldValue, property);
//no exception was thrown - lets change the property and fire a
//change event
//no exception was thrown - lets change the property and fire a
//change event
logger.trace(propertyName+"( oldValue="+oldValue
+", newValue=" + property+".");
logger.trace(propertyName + "( oldValue=" + oldValue
+ ", newValue=" + property + ".");
//once set system, a property remains system event if the user
//specified sth else
//once set system, a property remains system event if the user
//specified sth else
if( isSystem(propertyName) )
isSystem = true;
if (isSystem(propertyName))
isSystem = true;
if (property == null){
properties.remove(propertyName);
if (property == null)
{
properties.remove(propertyName);
if(isSystem){
//we can't remove or nullset a sys prop so let's "empty" it.
System.setProperty(propertyName, "");
}
}
else{
if(isSystem){
//in case this is a system property, we must only store it
//in the System property set and keep only a ref locally.
System.setProperty(propertyName, property.toString());
properties.put(propertyName,
new PropertyReference(propertyName));
}
else{
properties.put(propertyName, property);
}
if (isSystem)
{
//we can't remove or nullset a sys prop so let's "empty" it.
System.setProperty(propertyName, "");
}
if (changeEventDispatcher.hasPropertyChangeListeners(propertyName))
changeEventDispatcher.firePropertyChange(
propertyName, oldValue, property);
try{
storeConfiguration();
}
else
{
if (isSystem)
{
//in case this is a system property, we must only store it
//in the System property set and keep only a ref locally.
System.setProperty(propertyName, property.toString());
properties.put(propertyName,
new PropertyReference(propertyName));
}
catch (IOException ex)
else
{
logger.error("Failed to store configuration after "
+"a property change");
properties.put(propertyName, property);
}
}
finally
if (changeEventDispatcher.hasPropertyChangeListeners(propertyName))
changeEventDispatcher.firePropertyChange(
propertyName, oldValue, property);
try
{
logger.logExit();
storeConfiguration();
}
catch (IOException ex)
{
logger.error("Failed to store configuration after "
+ "a property change");
}
}
@ -361,6 +359,7 @@ void start()
{
try
{
debugPrintSystemProperties();
preloadSystemPropertyFiles();
reloadConfiguration();
}
@ -400,8 +399,6 @@ Map loadConfiguration(File file)
{
try
{
logger.logEntry();
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
@ -444,10 +441,6 @@ Map loadConfiguration(File file)
logger.error("Error finding configuration for default parsers", ex);
return new Hashtable();
}
finally
{
logger.logExit();
}
}
public void storeConfiguration()
@ -488,54 +481,44 @@ private Document createPropertiesDocument()
private void storeConfiguration(File file)
throws IOException
{
try
{
logger.logEntry();
//resolve the properties that were initially in the file - back to
//the document.
//resolve the properties that were initially in the file - back to
//the document.
if (propertiesDocument == null)
propertiesDocument = createPropertiesDocument();
if(propertiesDocument == null)
propertiesDocument = createPropertiesDocument();
Node root = propertiesDocument.getFirstChild();
Node root = propertiesDocument.getFirstChild();
Node currentNode = null;
NodeList children = root.getChildNodes();
for (int i = 0; i < children.getLength(); i++)
{
currentNode = children.item(i);
Node currentNode = null;
NodeList children = root.getChildNodes();
for(int i = 0; i < children.getLength(); i++)
if (currentNode.getNodeType() == Node.ELEMENT_NODE)
{
currentNode = children.item(i);
if(currentNode.getNodeType() == Node.ELEMENT_NODE)
{
StringBuffer propertyNameBuff = new StringBuffer();
propertyNameBuff.append(currentNode.getNodeName());
updateNode(currentNode, propertyNameBuff, properties);
}
StringBuffer propertyNameBuff = new StringBuffer();
propertyNameBuff.append(currentNode.getNodeName());
updateNode(currentNode, propertyNameBuff, properties);
}
}
//create in the document the properties that were added by other
//bundles after the initial property load.
Map newlyAddedProperties = cloneProperties();
//create in the document the properties that were added by other
//bundles after the initial property load.
//remove those that were originally there;
Iterator propNames = fileExtractedProperties.keySet().iterator();
while(propNames.hasNext())
newlyAddedProperties.remove(propNames.next());
Map newlyAddedProperties = cloneProperties();
this.processNewProperties(propertiesDocument,
newlyAddedProperties);
//remove those that were originally there;
Iterator propNames = fileExtractedProperties.keySet().iterator();
while (propNames.hasNext())
newlyAddedProperties.remove(propNames.next());
this.processNewProperties(propertiesDocument,
newlyAddedProperties);
//write the file.
XMLUtils.indentedWriteXML(
propertiesDocument, new FileWriter( getConfigurationFile()));
}
finally
{
logger.logExit();
}
//write the file.
XMLUtils.indentedWriteXML(
propertiesDocument, new FileWriter(getConfigurationFile()));
}
/**
@ -701,8 +684,6 @@ File createConfigurationFile()
{
try
{
logger.logEntry();
//see whether we have a user specified name for the conf file
String pFileName = getSystemProperty(
FILE_NAME_PROPERTY);
@ -772,10 +753,6 @@ File createConfigurationFile()
logger.error("Error creating config file", ex);
return null;
}
finally
{
logger.logExit();
}
}
/**
@ -976,6 +953,25 @@ public void purgeStoredConfiguration()
}
}
/**
* Goes over all system properties and outputs their names and values for
* debug purposes. The method has no effect if the logger is at a log level
* other than DEBUG or TRACE (FINE or FINEST).
*/
private void debugPrintSystemProperties()
{
if(logger.isDebugEnabled())
{
Properties pValues = System.getProperties();
Iterator pNames = pValues.keySet().iterator();
while(pNames.hasNext())
{
String name = (String)pNames.next();
logger.debug(name + "=" + pValues.getProperty(name));
}
}
}
/**
* The method scans the contents of the SYS_PROPS_FILE_NAME_PROPERTY where
* it expects to find a comma separated list of names of files that should

Write Preview
Loading…
Cancel
Save