avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing Main.java
Date Wed, 07 Aug 2002 13:19:13 GMT
bloritsch    2002/08/07 06:19:13

  Modified:    fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
                        Main.java
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.6       +1 -62     jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Main.java	7 Aug 2002 13:17:48 -0000	1.5
  +++ Main.java	7 Aug 2002 13:19:13 -0000	1.6
  @@ -1,4 +1,3 @@
  -<<<<<<< Main.java
   /*
    * Copyright (C) The Apache Software Foundation. All rights reserved.
    *
  @@ -19,7 +18,6 @@
   import org.apache.excalibur.fortress.ContainerManager;
   import org.apache.excalibur.fortress.DefaultContainerManager;
   import org.apache.excalibur.fortress.util.ContextBuilder;
  -import org.apache.excalibur.fortress.util.ContextManager;
   
   /**
    * Fortress container example.
  @@ -57,62 +55,3 @@
       }
   }
   
  -=======
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  - *
  - * This software is published under the terms of the Apache Software License
  - * version 1.1, a copy of which has been included with this distribution in
  - * the LICENSE.txt file.
  - */
  -package org.apache.excalibur.fortress.examples.swing;
  -
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.avalon.framework.logger.LogKitLogger;
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.excalibur.fortress.Container;
  -import org.apache.excalibur.fortress.ContainerManager;
  -import org.apache.excalibur.fortress.DefaultContainerManager;
  -import org.apache.excalibur.fortress.util.ContextBuilder;
  -
  -/**
  - * Fortress container example.
  - *
  - * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
  - * @version $Id$
  - */
  -public final class Main
  -{
  -    // container reference
  -    private static Container m_container;
  -
  -    /**
  -     * Start the show. Creates a <code>SwingContainer</code>.
  -     *
  -     * @param args a <code>String[]</code> array of command line arguments
  -     * @exception Exception if an error occurs
  -     */
  -    public static void main( String[] args )
  -        throws Exception
  -    {
  -        ContextBuilder contextBuilder = new ContextBuilder();
  -        contextBuilder.setContainerClass( "org.apache.excalibur.fortress.examples.swing.SwingContainer"
);
  -        contextBuilder.setContextDirectory( "./" );
  -        contextBuilder.setWorkDirectory( "./" );
  -        contextBuilder.setContainerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.xconf"
);
  -        contextBuilder.setLoggerManagerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.xlog"
);
  -        contextBuilder.setRoleManagerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.roles"
);
  -        contextBuilder.setInstrumentManagerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.instruments"
);
  -
  -        ContainerManager cm = new DefaultContainerManager( contextBuilder.getContext()
);
  -        cm.initialize();
  -
  -        m_container = ( Container ) cm.getContainer();
  -    }
  -}
  -
  ->>>>>>> 1.4
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message