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 DefaultORBFactory.java
Date Wed, 29 May 2002 17:52:27 GMT
mcconnell    02/05/29 10:52:27

  Modified:    enterprise/orb build.xml
               enterprise/orb/lib openorb-1.3.0.jar openorb_tools-1.3.0.jar
               enterprise/orb/src/examples/hello/java/hello HelloDemo.java
                        HelloInitializer.java HelloProvider.java
               enterprise/orb/src/java/org/apache/orb
                        DefaultORBFactory.java
  Log:
  no message
  
  Revision  Changes    Path
  1.14      +7 -4      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	18 May 2002 14:21:34 -0000	1.13
  +++ build.xml	29 May 2002 17:52:24 -0000	1.14
  @@ -79,8 +79,11 @@
   
   
     <path id="project.classpath">
  -      <fileset dir="../../common/lib">
  -        <include name="*.jar" />
  +      <fileset dir="${enterprise}/../common/lib">
  +        <include name="avalon-framework.jar" />
  +        <include name="logkit.jar" />
  +        <include name="excalibur-configuration.jar" />
  +        <include name="excalibur-context.jar" />
         </fileset>
         <fileset dir="${lib}">
           <include name="*.jar" />
  @@ -94,9 +97,9 @@
   
     <!-- MAIN TARGETS -->
   
  -  <target name="all" depends="clean,dist,examples,javadoc"/>
  +  <target name="all" depends="clean,dist"/>
     <target name="build" depends="orb"/>
  -  <target name="dist" depends="build,support"/>
  +  <target name="dist" depends="build,examples,support,javadoc"/>
   
     <target name="clean">
        <delete dir="${build.dir}"/>
  
  
  
  1.3       +7390 -7751jakarta-avalon-apps/enterprise/orb/lib/openorb-1.3.0.jar
  
  	<<Binary file>>
  
  
  1.3       +712 -749  jakarta-avalon-apps/enterprise/orb/lib/openorb_tools-1.3.0.jar
  
  	<<Binary file>>
  
  
  1.6       +1 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HelloDemo.java	9 Mar 2002 04:50:20 -0000	1.5
  +++ HelloDemo.java	29 May 2002 17:52:27 -0000	1.6
  @@ -35,7 +35,7 @@
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   
  -import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
  +import org.apache.excalibur.configuration.CascadingConfiguration;
   
   import org.omg.CORBA.ORB;
   
  
  
  
  1.6       +1 -3      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HelloInitializer.java	12 May 2002 13:13:03 -0000	1.5
  +++ HelloInitializer.java	29 May 2002 17:52:27 -0000	1.6
  @@ -43,13 +43,11 @@
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.phoenix.BlockContext;
  -import org.apache.avalon.phoenix.Block;
   
   import org.apache.orb.ORB;
   import org.apache.orb.ORBFactoryService;
   
  -import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
  +import org.apache.excalibur.configuration.CascadingConfiguration;
   
   
   /**
  
  
  
  1.5       +1 -3      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HelloProvider.java	12 May 2002 13:13:03 -0000	1.4
  +++ HelloProvider.java	29 May 2002 17:52:27 -0000	1.5
  @@ -46,10 +46,8 @@
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.phoenix.BlockContext;
  -import org.apache.avalon.phoenix.Block;
   
  -import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
  +import org.apache.excalibur.configuration.CascadingConfiguration;
   
   
   /**
  
  
  
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultORBFactory.java	18 May 2002 14:21:34 -0000	1.4
  +++ DefaultORBFactory.java	29 May 2002 17:52:27 -0000	1.5
  @@ -23,7 +23,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   
  -import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
  +import org.apache.excalibur.configuration.CascadingConfiguration;
   
   /**
    * The <code>ORBServer</code> class is an Component that provides support for
the
  
  
  

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