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/12/12 08:39:06 UTC

svn commit: r356199 - in /excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples: swing/Main.java swing/SwingContainer.instruments viewer/ComponentViewer.instruments viewer/Main.java

Author: leif
Date: Sun Dec 11 23:39:02 2005
New Revision: 356199

URL: http://svn.apache.org/viewcvs?rev=356199&view=rev
Log:
Upgrade the examples so they use the HTTP connector for instrumentation as altrmi is no longer supported.

Modified:
    excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java
    excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.instruments
    excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments
    excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java

Modified: excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java?rev=356199&r1=356198&r2=356199&view=diff
==============================================================================
--- excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java (original)
+++ excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java Sun Dec 11 23:39:02 2005
@@ -39,24 +39,24 @@
     public static void main( String[] args )
         throws Exception
     {
-    	
-    	String containerConfig = "resource://org/apache/avalon/fortress/examples/swing/SwingContainer.xconf";
-    	String loggerConfig = "resource://org/apache/avalon/fortress/examples/swing/SwingContainer.xlog";
-    	
-    	if(args.length >= 1)
-    		containerConfig = args[0];
-    	if(args.length >= 2)
-    		loggerConfig = args[1];
-    	
+        
+        String containerConfig = "resource://org/apache/avalon/fortress/examples/swing/SwingContainer.xconf";
+        String loggerConfig = "resource://org/apache/avalon/fortress/examples/swing/SwingContainer.xlog";
+        String instrumentConfig = "resource://org/apache/avalon/fortress/examples/swing/SwingContainer.instruments";
+        
+        if(args.length >= 1)
+            containerConfig = args[0];
+        if(args.length >= 2)
+            loggerConfig = args[1];
+        if(args.length >= 3)
+            instrumentConfig = args[2];
+        
         // Set up all the preferences for Fortress
         final FortressConfig config = new FortressConfig();
         config.setContainerClass( SwingContainer.class );
         config.setContainerConfiguration( containerConfig );
         config.setLoggerManagerConfiguration( loggerConfig );
-
-        // need the altrmi binaries
-
-	//   config.setInstrumentManagerConfiguration( "resource://org/apache/avalon/fortress/examples/swing/SwingContainer.instruments" );
+        config.setInstrumentManagerConfiguration( instrumentConfig );
 
         // Get the root container initialized
         ContainerManager cm = new DefaultContainerManager( config.getContext() );

Modified: excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.instruments
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.instruments?rev=356199&r1=356198&r2=356199&view=diff
==============================================================================
--- excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.instruments (original)
+++ excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.instruments Sun Dec 11 23:39:02 2005
@@ -3,11 +3,11 @@
     <description>Fortress SwingContainer Example</description>
     
     <connectors>
-        <connector class="altrmi" port="15555"/>
+        <connector class="http" port="15080"/>
     </connectors>
     
     <state-file interval="60000" use-compact-samples="true">
-        SwingContainer.sampledata
+        instrument.sampledata
     </state-file>
     
     <instrumentables>
@@ -26,6 +26,13 @@
             
             <instrument name="memory" description="In-Use Memory">
                 <sample type="max" interval="1000" size="600" description="Maximum each second."/>
+            </instrument>
+        </instrumentable>
+        
+        <instrumentable name="translator" description="Translator">
+            <instrument name="translations" description="Translations">
+                <sample type="ctr" interval="1000" size="600" description="Count each second."/>
+                <sample type="ctr" interval="60000" size="1440" description="Count each minute."/>
             </instrument>
         </instrumentable>
     </instrumentables>

Modified: excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments?rev=356199&r1=356198&r2=356199&view=diff
==============================================================================
--- excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments (original)
+++ excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments Sun Dec 11 23:39:02 2005
@@ -3,11 +3,11 @@
     <description>Fortress SwingContainer Example</description>
     
     <connectors>
-        <connector class="altrmi" port="15555"/>
+        <connector class="http" port="15080"/>
     </connectors>
     
     <state-file interval="60000" use-compact-samples="true">
-        SwingContainer.sampledata
+        instrument.sampledata
     </state-file>
     
     <instrumentables>
@@ -26,6 +26,13 @@
             
             <instrument name="memory" description="In-Use Memory">
                 <sample type="max" interval="1000" size="600" description="Maximum each second."/>
+            </instrument>
+        </instrumentable>
+        
+        <instrumentable name="translator" description="Translator">
+            <instrument name="translations" description="Translations">
+                <sample type="ctr" interval="1000" size="600" description="Count each second."/>
+                <sample type="ctr" interval="60000" size="1440" description="Count each minute."/>
             </instrument>
         </instrumentable>
     </instrumentables>

Modified: excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java?rev=356199&r1=356198&r2=356199&view=diff
==============================================================================
--- excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java (original)
+++ excalibur/trunk/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java Sun Dec 11 23:39:02 2005
@@ -47,9 +47,7 @@
             config.setContainerClass( ComponentViewer.class );
             config.setContainerConfiguration( "resource://org/apache/avalon/fortress/examples/viewer/ComponentViewer.xconf" );
             config.setLoggerManagerConfiguration( "resource://org/apache/avalon/fortress/examples/viewer/ComponentViewer.xlog" );
-
-            // needs the altrmi binaries
-	    //   config.setInstrumentManagerConfiguration( "resource://org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments" );
+            config.setInstrumentManagerConfiguration( "resource://org/apache/avalon/fortress/examples/viewer/ComponentViewer.instruments" );
 
             cm = new DefaultContainerManager( config.getContext() );
             org.apache.avalon.framework.container.ContainerUtil.initialize( cm );



---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org