avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/CORBA/kernel DefaultLoader.java
Date Sat, 02 Mar 2002 17:48:56 GMT
mcconnell    02/03/02 09:48:56

  Modified:    enterprise/orb build.xml
               enterprise/orb/lib openorb-1.2.2.jar
               enterprise/orb/src/examples/hello/java/hello HelloDemo.java
                        HelloInitializer.java HelloProvider.java
               enterprise/orb/src/java/org/apache/orb
                        DefaultORBFactory.java
               enterprise/orb/src/java/org/apache/orb/CORBA/kernel
                        DefaultLoader.java
  Log:
  no message
  
  Revision  Changes    Path
  1.3       +49 -1     jakarta-avalon-apps/enterprise/orb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2 Mar 2002 05:17:28 -0000	1.2
  +++ build.xml	2 Mar 2002 17:48:55 -0000	1.3
  @@ -30,7 +30,8 @@
         build            - invokes the general build target
         dist             - executes build, javadoc and support file creation
         examples         - builds examples
  -      hello            - runs the "hello" embedded orb initializer demo
  +      hello            - runs the "hello" embedded orb initializer demo as a java command
  +      hello-pipeline   - runs the "hello" demo as a component
         
       </echo>
     </target>
  @@ -198,6 +199,53 @@
   	  </classpath>
   	  <arg value="-ORBDebug=0"/>
        </java>
  +  </target>
  +
  +  <target name="pipeline.context">
  +    <available property="pipeline.available" file="${tools.lib.path}/pipeline.jar"/>
  +  </target>
  +
  +  <target name="pipeline.defintion" depends="pipeline.context" if="pipeline.available">
  +    <taskdef name="pipeline" classname="org.apache.avalon.excalibur.service.ant.Pipe">
  +      <classpath>
  +        <pathelement location="${tools.lib.path}/pipeline.jar"/>
  +      </classpath>
  +    </taskdef>
  +  </target>
  + 
  +  <target name="hello-pipeline" depends="pipeline.defintion,examples" if="pipeline.available">
  +
  +    <!-- 
  +    After loading jar files declared under a fileset, apply lifecycle
  +    pipeline processing to the class referenced in the target attribute.
  +    -->
  +
  +    <pipeline target="hello.HelloDemo" priority="DEBUG" disposal="true" verbose="false">
  +
  +      <classpath>
  +         <fileset dir="${tools.lib.path}">
  +             <include name="pipeline.jar"/>
  +             <include name="avalon-framework.jar"/>
  +             <include name="logkit.jar"/>
  +         </fileset>
  +      </classpath>
  +
  +      <!--
  +      For all of the jar files in the fileset, load the jar file
  +      into the classloader. 
  +      -->
  +
  +      <fileset dir="${lib}">
  +         <include name="openorb-1.2.2.jar"/>
  +      </fileset>
  +
  +      <fileset dir="${dist}">
  +         <include name="${orb.manager.jar}"/>
  +         <include name="${orb.examples.jar}"/>
  +      </fileset>
  +
  +    </pipeline>
  +
     </target>
   
     <!-- UTILITY TARGETS -->
  
  
  
  1.4       +241 -245  jakarta-avalon-apps/enterprise/orb/lib/openorb-1.2.2.jar
  
  	<<Binary file>>
  
  
  1.3       +6 -3      jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloDemo.java
  
  Index: HelloDemo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloDemo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HelloDemo.java	2 Mar 2002 05:18:30 -0000	1.2
  +++ HelloDemo.java	2 Mar 2002 17:48:56 -0000	1.3
  @@ -34,7 +34,8 @@
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.orb.CascadingConfiguration;
  +
  +import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
   
   import org.omg.CORBA.ORB;
   
  @@ -97,14 +98,16 @@
               demo.configure( loadDefaultConfiguration() );
               demo.contextualize( new DefaultContext() );
               demo.initialize();
  -            demo.dispose();
  -
           }
           catch( Throwable e )
           {
               final String error = "Internal error while attempt to launch the hello demo";
               System.out.println( error );
               e.printStackTrace();
  +        }
  +        finally
  +        {
  +            demo.dispose();
           }
       }
   
  
  
  
  1.3       +2 -1      jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloInitializer.java
  
  Index: HelloInitializer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloInitializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HelloInitializer.java	2 Mar 2002 05:18:30 -0000	1.2
  +++ HelloInitializer.java	2 Mar 2002 17:48:56 -0000	1.3
  @@ -49,7 +49,8 @@
   
   import org.apache.orb.ORB;
   import org.apache.orb.ORBFactoryService;
  -import org.apache.orb.CascadingConfiguration;
  +
  +import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
   
   
   /**
  
  
  
  1.2       +1 -1      jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloProvider.java
  
  Index: HelloProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelloProvider.java	28 Feb 2002 16:29:37 -0000	1.1
  +++ HelloProvider.java	2 Mar 2002 17:48:56 -0000	1.2
  @@ -50,7 +50,7 @@
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.phoenix.Block;
   
  -import org.apache.orb.CascadingConfiguration;
  +import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
   
   
   /**
  
  
  
  1.2       +2 -0      jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/DefaultORBFactory.java
  
  Index: DefaultORBFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/DefaultORBFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultORBFactory.java	28 Feb 2002 16:29:37 -0000	1.1
  +++ DefaultORBFactory.java	2 Mar 2002 17:48:56 -0000	1.2
  @@ -31,6 +31,8 @@
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
  +import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
  +
   /**
    * The <code>ORBServer</code> class is an Component that provides support for
the
    * creation of an new ORB instance.
  
  
  
  1.4       +1 -1      jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/CORBA/kernel/DefaultLoader.java
  
  Index: DefaultLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/CORBA/kernel/DefaultLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultLoader.java	2 Mar 2002 04:59:32 -0000	1.3
  +++ DefaultLoader.java	2 Mar 2002 17:48:56 -0000	1.4
  @@ -33,7 +33,7 @@
   import org.apache.avalon.framework.CascadingException;
   import org.apache.avalon.framework.activity.Disposable;
   
  -import org.apache.orb.CascadingConfiguration;
  +import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
   
   import org.omg.PortableInterceptor.ORBInitializer;
   import org.omg.CORBA.CompletionStatus;
  
  
  

--
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