You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by le...@apache.org on 2005/01/06 09:35:58 UTC
svn commit: r124354 - excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl
Author: leif
Date: Thu Jan 6 00:35:56 2005
New Revision: 124354
URL: http://svn.apache.org/viewcvs?view=rev&rev=124354
Log:
Remove the old code which saved the state by creating a Configuration object. Broke the commits out to make it easier to recover this functionality if it is every needed. There is no reason that both could not be possible and this may once again be needed if an application ever wants to gain access to the state as a Configuration object.
Modified:
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java
excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractInstrumentSample.java Thu Jan 6 00:35:56 2005
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.instrument.manager.InstrumentSampleDescriptor;
@@ -630,70 +629,6 @@
}
/**
- * Saves the current state into a Configuration.
- *
- * @return The state as a Configuration. Returns null if the configuration
- * would not contain any information.
- */
- public final Configuration saveState()
- {
- // If this sample is not configured and its lease time is 0, then it
- // is an artifact of a previous state file, so it should not be saved.
- if( ( !isConfigured() ) && ( getLeaseExpirationTime() <= 0 ) )
- {
- return null;
- }
-
- boolean update;
- int value;
- long time;
-
- DefaultConfiguration state = new DefaultConfiguration( "sample", "-" );
- synchronized( this )
- {
- // Always update the sample so its state will be correct when saved.
- long now = System.currentTimeMillis();
- update = update( now, false );
- value = getValueInner();
- time = m_time;
-
- state.setAttribute( "type",
- InstrumentSampleUtils.getInstrumentSampleTypeName( getType() ) );
- state.setAttribute( "interval", Long.toString( m_interval ) );
- state.setAttribute( "size", Integer.toString( m_size ) );
-
- state.setAttribute( "time", Long.toString( m_time ) );
- if( getLeaseExpirationTime() > 0 )
- {
- state.setAttribute( "lease-expiration", Long.toString( getLeaseExpirationTime() ) );
-
- // If the sample is permanent then its description will be set in the configuration
- // file and does not need to be saved here as well.
- state.setAttribute( "description", m_description );
- }
-
- // Let subclasses add additional attributes.
- saveState( state );
-
- String history = getHistoryList();
- if ( history != null )
- {
- // Save the history samples so that the newest is first.
- DefaultConfiguration samples = new DefaultConfiguration( "history", "-" );
- samples.setValue( history );
- state.addChild( samples );
- }
- }
-
- if ( update )
- {
- updateListeners( value, time );
- }
-
- return state;
- }
-
- /**
* Loads the state into the InstrumentSample.
*
* @param state Configuration object to load state from.
@@ -851,15 +786,6 @@
* @param out PrintWriter to write to.
*/
protected void writeStateAttributes( PrintWriter out )
- {
- }
-
- /**
- * Allow subclasses to add information into the saved state.
- *
- * @param state State configuration.
- */
- protected void saveState( DefaultConfiguration state )
{
}
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/AbstractValueInstrumentSample.java Thu Jan 6 00:35:56 2005
@@ -21,7 +21,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.excalibur.instrument.manager.ValueInstrumentListener;
@@ -150,19 +149,6 @@
out.print( "\" last-value=\"" );
out.print( m_lastValue );
out.print( "\"" );
- }
-
- /**
- * Allow subclasses to add information into the saved state.
- *
- * @param state State configuration.
- */
- protected void saveState( DefaultConfiguration state )
- {
- super.saveState( state );
-
- state.setAttribute( "value-count", Integer.toString( m_valueCount ) );
- state.setAttribute( "last-value", Integer.toString( m_lastValue ) );
}
/**
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/DefaultInstrumentManagerImpl.java Thu Jan 6 00:35:56 2005
@@ -36,9 +36,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
@@ -1089,42 +1087,6 @@
// Do the next best thing by flushing to make sure that nothing is left unflushed
// in writer buffers.
out.flush();
-
- /*
- Configuration stateConfig = saveStateToConfiguration();
-
- // Ride on top of the Configuration classes to save the state.
- DefaultConfigurationSerializer serializer = new DefaultConfigurationSerializer();
- serializer.setIndent( true );
- serializer.serialize( os, stateConfig );
- */
- }
-
- /**
- * Returns the Instrument Manager's state as a Configuration object.
- *
- * @return The Instrument Manager's state as a Configuration object.
- */
- public Configuration saveStateToConfiguration()
- {
- DefaultConfiguration state = new DefaultConfiguration( "instrument-manager-state", "-" );
-
- InstrumentableProxy[] instrumentableProxies = m_instrumentableProxyArray;
- if( instrumentableProxies == null )
- {
- instrumentableProxies = updateInstrumentableProxyArray();
- }
-
- for( int i = 0; i < instrumentableProxies.length; i++ )
- {
- Configuration childState = instrumentableProxies[ i ].saveState();
- if ( childState != null )
- {
- state.addChild( childState );
- }
- }
-
- return state;
}
/*---------------------------------------------------------------
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentProxy.java Thu Jan 6 00:35:56 2005
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
@@ -1042,37 +1041,6 @@
// Close the node.
out.println( "</instrument>" );
- }
-
- /**
- * Saves the current state into a Configuration.
- *
- * @return The state as a Configuration. Returns null if the configuration
- * would not contain any information.
- */
- Configuration saveState()
- {
- boolean empty = true;
- DefaultConfiguration state = new DefaultConfiguration( "instrument", "-" );
- state.setAttribute( "name", m_name );
-
- InstrumentSample[] samples = getInstrumentSamples();
- for ( int i = 0; i < samples.length; i++ )
- {
- Configuration childState = samples[i].saveState();
- if ( childState != null )
- {
- state.addChild( childState );
- empty = false;
- }
- }
-
- // Only return a state if it contains information.
- if ( empty )
- {
- state = null;
- }
- return state;
}
/**
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentSample.java Thu Jan 6 00:35:56 2005
@@ -210,14 +210,6 @@
void writeState( PrintWriter out );
/**
- * Saves the current state into a Configuration.
- *
- * @return The state as a Configuration. Returns null if the configuration
- * would not contain any information.
- */
- Configuration saveState();
-
- /**
* Loads the state into the InstrumentSample.
*
* @param state Configuration object to load state from.
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/InstrumentableProxy.java Thu Jan 6 00:35:56 2005
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.instrument.manager.InstrumentableDescriptor;
@@ -714,50 +713,6 @@
// Close the node.
out.println( "</instrumentable>" );
- }
-
- /**
- * Saves the current state into a Configuration.
- *
- * @return The state as a Configuration. Returns null if the configuration
- * would not contain any information.
- */
- Configuration saveState()
- {
- boolean empty = true;
- DefaultConfiguration state = new DefaultConfiguration( "instrumentable", "-" );
- state.setAttribute( "name", m_name );
-
- // Save the child Instrumentables
- InstrumentableProxy[] childProxies = getChildInstrumentableProxies();
- for( int i = 0; i < childProxies.length; i++ )
- {
- Configuration childState = childProxies[ i ].saveState();
- if ( childState != null )
- {
- empty = false;
- state.addChild( childState );
- }
- }
-
- // Save the direct Instruments
- InstrumentProxy[] proxies = getInstrumentProxies();
- for( int i = 0; i < proxies.length; i++ )
- {
- Configuration childState = proxies[ i ].saveState();
- if ( childState != null )
- {
- empty = false;
- state.addChild( childState );
- }
- }
-
- // Only return a state if it contains information.
- if ( empty )
- {
- state = null;
- }
- return state;
}
/**
Modified: excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java
Url: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java?view=diff&rev=124354&p1=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java&r1=124353&p2=excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java&r2=124354
==============================================================================
--- excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java (original)
+++ excalibur/trunk/containerkit/instrument/mgr-impl/src/java/org/apache/excalibur/instrument/manager/impl/MeanValueInstrumentSample.java Thu Jan 6 00:35:56 2005
@@ -21,7 +21,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
@@ -104,18 +103,6 @@
out.print( " value-total=\"" );
out.print( m_valueTotal );
out.print( "\"" );
- }
-
- /**
- * Allow subclasses to add information into the saved state.
- *
- * @param state State configuration.
- */
- protected void saveState( DefaultConfiguration state )
- {
- super.saveState( state );
-
- state.setAttribute( "value-total", Long.toString( m_valueTotal ) );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org