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/time/src/java/org/apache/time TimeProvider.xinfo
Date Sun, 08 Sep 2002 16:10:13 GMT
mcconnell    2002/09/08 09:10:13

  Modified:    enterprise/ins build.xml
               enterprise/ins/src/java/org/apache/ins NamingProvider.xinfo
               enterprise/orb build.xml
               enterprise/orb/src/etc overview.html
               enterprise/orb/src/java/org/apache/orb ORB.java ORB.xinfo
               enterprise/pss build.xml
               enterprise/pss/src/java/org/apache/pss Connector.java
                        ORB.xinfo Session.java
               enterprise/pss/src/java/org/apache/pss/connector
                        ConnectorBase.java
               enterprise/time build.xml
               enterprise/time/src/java/org/apache/time TimeProvider.xinfo
  Log:
  Updates to 1.3 version of the openorb release, sync with general Avalon Apps changes and
enhancements to deployment descriptors.
  
  Revision  Changes    Path
  1.8       +2 -69     jakarta-avalon-apps/enterprise/ins/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/ins/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	11 Jun 2002 04:25:34 -0000	1.7
  +++ build.xml	8 Sep 2002 16:10:12 -0000	1.8
  @@ -83,23 +83,14 @@
           <include name="*.jar" />
         </fileset>
         <fileset dir="${common.lib.path}">
  -        <include name="logkit.jar" />
  -        <include name="avalon-framework.jar" />
  -        <include name="merlin.jar" />
  +        <include name="logkit-1.1.jar" />
  +        <include name="avalon-framework*.jar" />
         </fileset>
         <fileset dir="${pss.dist.path}">
           <include name="*.jar" />
         </fileset>
     </path>
   
  -  <path id="merlin.classpath">
  -      <fileset dir="${common.lib.path}">
  -        <include name="logkit.jar" />
  -        <include name="avalon-framework.jar" />
  -        <include name="merlin.jar" />
  -      </fileset>
  -  </path>
  -
   
     <!-- MAIN TARGETS -->
   
  @@ -299,64 +290,6 @@
   	  <link href="${avalon.href}" />
   	  <link href="${orb.href}" />
       </javadoc>
  -  </target>
  -
  -  <target name="demo" depends="merlin.validation,build" if="merlin.available">
  -
  -    <echo message="Executing ${project.title} demo."/>
  -
  -    <!-- 
  -    After loading jar files declared under a fileset, apply lifecycle
  -    pipeline processing to the class referenced in the target attribute.
  -    -->
  -
  -    <load target="${demo.class}" 
  -      priority="${demo.priority}" disposal="${demo.disposal}" verbose="${demo.verbose}">
  -
  -      <classpath>
  -	    <path refid="merlin.classpath" />
  -	</classpath>
  -
  -      <fileset dir="${dist}">
  -         <include name="*.jar"/>
  -      </fileset>
  -      <fileset dir="${orb.lib.path}">
  -         <include name="*.jar"/>
  -      </fileset>
  -      <fileset dir="${orb.dist.path}">
  -         <include name="*.jar"/>
  -      </fileset>
  -      <fileset dir="${pss.dist.path}">
  -         <include name="*.jar"/>
  -      </fileset>
  -    </load>
  -
  -  </target>
  -
  -  <target name="merlin.context">
  -    <available property="merlin.available" 
  -       classname="org.apache.excalibur.merlin.ant.Load" >
  -       <classpath>
  -          <path refid="merlin.classpath"/>
  -	 </classpath>
  -    </available>
  -  </target>
  -
  -  <target name="merlin.defintion" depends="merlin.context" if="merlin.available">
  -    <taskdef resource="merlin.properties">
  -       <classpath>
  -          <path refid="merlin.classpath"/>
  -	 </classpath>
  -    </taskdef>
  -  </target>
  - 
  -  <target name="merlin.validation" depends="merlin.defintion" unless="merlin.available">
  -    <echo>
  -
  -    Ignoring load task.
  -    Could not locate Merlin in the classpath.
  -
  -    </echo>
     </target>
   
   </project>
  
  
  
  1.4       +11 -82    jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins/NamingProvider.xinfo
  
  Index: NamingProvider.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins/NamingProvider.xinfo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamingProvider.xinfo	15 May 2002 06:54:19 -0000	1.3
  +++ NamingProvider.xinfo	8 Sep 2002 16:10:12 -0000	1.4
  @@ -1,102 +1,31 @@
   <?xml version="1.0"?>
  +<!DOCTYPE type
  +      PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
  +             "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd" >
   
   <!--
    NamingProvider.info
   -->
   
  -<blockinfo>
  +<type>
   
  -  <block>
  +  <component>
       <name>ins</name>
       <version>1.0</version>
  -  </block>
  +  </component>
   
     <services>
  -      <service name="org.omg.CosNaming.NamingContextExt"/>
  +    <service>
  +      <reference type="org.omg.CosNaming.NamingContextExt"/>
  +    </service>
     </services>
   
     <dependencies>
         <dependency>
             <role>orb</role>
  -          <service name="org.apache.orb.ORB" version="2.4"/>
  -          <configuration>
  -            <property name="iiop.port" value="1024" />
  -            <initializer class="org.apache.pss.Initializer" name="pss"/>
  -          </configuration>
  +          <reference type="org.apache.pss.ORB" version="2.4"/>
         </dependency>
     </dependencies>
  -
  -  <configuration>
  -
  -    <!--
  -    Service publication
  -    -->
  -
  -    <ior value="ins.ior"/>
  -
  -    <!--
  -    The PSS configuration.
  -    -->
  -
  -    <pss>
  -
  -      <connector value="file" />
  -
  -      <session>
  -        <parameter name="PSS.File.DataStore.Directory" value="pss" />
  -        <parameter name="PSS.File.DataStore.Name" value="ins" />
  -      </session>
  -
  -      <persistence>
  -        <file>
  -          <storage psdl="PSDL:namingPersistence/NamingContextBase:1.0"
  -            class="file.namingPersistence.NamingContextBase" />
  -          <home psdl="PSDL:namingPersistence/NamingContextHomeBase:1.0"
  -            class="file.namingPersistence.NamingContextHomeBase" />
  -          <storage psdl="PSDL:namingPersistence/NamingObjectBase:1.0"
  -            class="file.namingPersistence.NamingObjectBase" />
  -          <home psdl="PSDL:namingPersistence/NamingObjectHomeBase:1.0"
  -            class="file.namingPersistence.NamingObjectHomeBase" />
  -          <storage psdl="PSDL:namingPersistence/ProxyNamingContextBase:1.0"
  -            class="file.namingPersistence.ProxyNamingContextBase" />
  -          <home psdl="PSDL:namingPersistence/ProxyNamingContextHomeBase:1.0"
  -            class="file.namingPersistence.ProxyNamingContextHomeBase" />
  -        </file>
  -        <memory>
  -          <storage psdl="PSDL:namingPersistence/NamingContextBase:1.0"
  -            class="memory.namingPersistence.NamingContextBase" />
  -          <home psdl="PSDL:namingPersistence/NamingContextHomeBase:1.0"
  -            class="memory.namingPersistence.NamingContextHomeBase" />
  -          <storage psdl="PSDL:namingPersistence/NamingObjectBase:1.0"
  -            class="memory.namingPersistence.NamingObjectBase" />
  -          <home psdl="PSDL:namingPersistence/NamingObjectHomeBase:1.0"
  -            class="memory.namingPersistence.NamingObjectHomeBase" />
  -          <storage psdl="PSDL:namingPersistence/ProxyNamingContextBase:1.0"
  -            class="memory.namingPersistence.ProxyNamingContextBase" />
  -          <home psdl="PSDL:namingPersistence/ProxyNamingContextHomeBase:1.0"
  -            class="memory.namingPersistence.ProxyNamingContextHomeBase" />
  -        </memory>
  -        <database>
  -          <storage psdl="PSDL:namingPersistence/NamingContextBase:1.0"
  -            class="database.namingPersistence.NamingContextBase" />
  -          <home psdl="PSDL:namingPersistence/NamingContextHomeBase:1.0"
  -            class="database.namingPersistence.NamingContextHomeBase" />
  -          <storage psdl="PSDL:namingPersistence/NamingObjectBase:1.0"
  -            class="database.namingPersistence.NamingObjectBase" />
  -          <home psdl="PSDL:namingPersistence/NamingObjectHomeBase:1.0"
  -            class="database.namingPersistence.NamingObjectHomeBase" />
  -          <storage psdl="PSDL:namingPersistence/ProxyNamingContextBase:1.0"
  -            class="database.namingPersistence.ProxyNamingContextBase" />
  -          <home psdl="PSDL:namingPersistence/ProxyNamingContextHomeBase:1.0"
  -            class="database.namingPersistence.ProxyNamingContextHomeBase" />
  -        </database>
  -
  -      </persistence>
  -
  -    </pss>
  -
  -  </configuration>
  -
  -</blockinfo>
  +</type>
   
   
  
  
  
  1.18      +1 -11     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	7 Sep 2002 06:48:14 -0000	1.17
  +++ build.xml	8 Sep 2002 16:10:12 -0000	1.18
  @@ -89,7 +89,6 @@
           <include name="*.jar" />
         </fileset>
         <fileset dir="${excalibur.path}">
  -        <include name="assembly/build/lib/merlin-2.0a.jar" />
           <include name="configuration/build/lib/excalibur-configuration-1.0.jar" />
         </fileset>
     </path>
  @@ -97,7 +96,7 @@
     <!-- MAIN TARGETS -->
   
     <target name="all" depends="clean,dist"/>
  -  <target name="build" depends="merlin.update,orb"/>
  +  <target name="build" depends="orb"/>
     <target name="dist" depends="build,examples,support,javadoc"/>
   
     <target name="clean">
  @@ -286,13 +285,4 @@
         </java>
     </target>
   
  -  <target name="merlin.context">
  -    <available property="merlin.available" file="${assembly.path}/build/lib/merlin-2.0a.jar"/>
  -  </target>
  -
  -  <target name="merlin.update" depends="merlin.context" if="merlin.available">
  -    <echo message="updating merlin"/>
  -    <copy toDir="${common.path}/lib" file="${assembly.path}/build/lib/merlin-2.0a.jar"/>
  -  </target>
  - 
   </project>
  
  
  
  1.3       +0 -6      jakarta-avalon-apps/enterprise/orb/src/etc/overview.html
  
  Index: overview.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/etc/overview.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- overview.html	14 Mar 2002 10:10:30 -0000	1.2
  +++ overview.html	8 Sep 2002 16:10:12 -0000	1.3
  @@ -15,13 +15,7 @@
   combined with formal component semantics.  ORB parameterization equivalent to the classic
   ORB.init() static operation is achieved through configuration of the ORB with a configuration
   instance containing property and initializer declarations.</td></tr>
  -<tr><td width="20%" valign="top"><strong>{@link org.apache.orb.DefaultORBFactory}</strong></td>
  -<td><code>ORBFactory</code> is a utility component that provides support
for the creation 
  -of new ORB instances.</td></tr>
   </table>
   
  -<h4>Related Packages</h4>
  -
  -Related packages and services are available under the <a href="{$docRoot}/../../index.html"
target="_top">Package Index.</a>
   
   </body>
  
  
  
  1.8       +2 -2      jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.java
  
  Index: ORB.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ORB.java	7 Sep 2002 06:48:16 -0000	1.7
  +++ ORB.java	8 Sep 2002 16:10:12 -0000	1.8
  @@ -71,7 +71,7 @@
    */
   public class ORB extends org.openorb.CORBA.ORB
   implements Configurable, Contextualizable, Initializable, Startable, Disposable,
  -POAContext, ServiceManager
  +ServiceManager
   {
   
       //=================================================================
  @@ -390,7 +390,7 @@
       {
           try
           {
  -            return (POA) getORB().resolve_initial_references("RootPOA");
  +            return (POA) resolve_initial_references("RootPOA");
           }
           catch( Throwable e )
           {
  
  
  
  1.7       +1 -4      jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.xinfo
  
  Index: ORB.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/java/org/apache/orb/ORB.xinfo,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ORB.xinfo	7 Sep 2002 06:48:16 -0000	1.6
  +++ ORB.xinfo	8 Sep 2002 16:10:12 -0000	1.7
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   <!DOCTYPE type
         PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
  -             "http://jakarta.apache.org/avalon/type_1_0.dtd" >
  +             "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd" >
   
   <type>
   
  @@ -12,9 +12,6 @@
     <services>
       <service> 
         <reference type="org.apache.orb.ORB" version="2.4"/>
  -    </service> 
  -    <service> 
  -      <reference type="org.apache.orb.POAContext"/>
       </service> 
     </services>
   
  
  
  
  1.10      +2 -2      jakarta-avalon-apps/enterprise/pss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	7 Sep 2002 06:52:35 -0000	1.9
  +++ build.xml	8 Sep 2002 16:10:13 -0000	1.10
  @@ -99,8 +99,8 @@
           <include name="*.jar" />
         </fileset>
         <fileset dir="${common.path}/lib">
  -        <include name="logkit.jar" />
  -        <include name="avalon-framework.jar" />
  +        <include name="logkit-1.1.jar" />
  +        <include name="avalon-framework*.jar" />
           <include name="merlin.jar" />
         </fileset>
     </path>
  
  
  
  1.3       +1 -2      jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Connector.java
  
  Index: Connector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Connector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Connector.java	18 May 2002 13:27:48 -0000	1.2
  +++ Connector.java	8 Sep 2002 16:10:13 -0000	1.3
  @@ -7,7 +7,6 @@
   
   package org.apache.pss;
   
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
   
   /**
  @@ -15,7 +14,7 @@
    *
    * @author Stephen McConnell <mcconnell@osm.net>
    */
  -public interface Connector extends org.omg.CosPersistentState.Connector, Component
  +public interface Connector extends org.omg.CosPersistentState.Connector
   {
   
      /**
  
  
  
  1.6       +3 -6      jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ORB.xinfo
  
  Index: ORB.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/ORB.xinfo,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ORB.xinfo	7 Sep 2002 06:52:35 -0000	1.5
  +++ ORB.xinfo	8 Sep 2002 16:10:13 -0000	1.6
  @@ -17,16 +17,13 @@
   
     <services>
       <service> 
  -      <reference type="org.apache.pss.ORB" version="2.4"/>
  -    </service> 
  -    <service> 
  -      <reference type="org.apache.pss.ConnectorContext"/>
  +      <reference type="org.apache.orb.ORB" version="2.4"/>
       </service> 
       <service> 
  -      <reference type="org.apache.orb.POAContext"/>
  +      <reference type="org.apache.pss.ORB" version="2.4"/>
       </service> 
       <service> 
  -      <reference type="org.apache.orb.ORBContext"/>
  +      <reference type="org.apache.pss.ConnectorContext"/>
       </service> 
     </services>
   
  
  
  
  1.2       +1 -2      jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Session.java
  
  Index: Session.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Session.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Session.java	28 Feb 2002 19:10:50 -0000	1.1
  +++ Session.java	8 Sep 2002 16:10:13 -0000	1.2
  @@ -7,7 +7,6 @@
   
   package org.apache.pss;
   
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.activity.Startable;
   
   /**
  @@ -15,7 +14,7 @@
    *
    * @author Stephen McConnell <mcconnell@osm.net>
    */
  -public interface Session extends org.omg.CosPersistentState.Session, Component, Startable
  +public interface Session extends org.omg.CosPersistentState.Session, Startable
   {
   
   }
  
  
  
  1.3       +0 -1      jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/ConnectorBase.java
  
  Index: ConnectorBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/connector/ConnectorBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConnectorBase.java	12 Mar 2002 22:18:01 -0000	1.2
  +++ ConnectorBase.java	8 Sep 2002 16:10:13 -0000	1.3
  @@ -17,7 +17,6 @@
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.CascadingException;
   import org.apache.avalon.framework.context.Context;
  
  
  
  1.10      +2 -2      jakarta-avalon-apps/enterprise/time/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/time/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	7 Sep 2002 06:53:11 -0000	1.9
  +++ build.xml	8 Sep 2002 16:10:13 -0000	1.10
  @@ -86,8 +86,8 @@
           <include name="*.jar" />
         </fileset>
         <fileset dir="${common.path}/lib">
  -        <include name="logkit.jar" />
  -        <include name="avalon-framework.jar" />
  +        <include name="logkit-1.1.jar" />
  +        <include name="avalon-framework*.jar" />
         </fileset>
     </path>
   
  
  
  
  1.6       +11 -19    jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/TimeProvider.xinfo
  
  Index: TimeProvider.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/TimeProvider.xinfo,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TimeProvider.xinfo	15 May 2002 06:53:04 -0000	1.5
  +++ TimeProvider.xinfo	8 Sep 2002 16:10:13 -0000	1.6
  @@ -1,4 +1,7 @@
   <?xml version="1.0"?>
  +<!DOCTYPE type
  +      PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
  +             "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd" >
   
   <!--
   Copyright (C) The Apache Software Foundation. All rights reserved.
  @@ -10,12 +13,12 @@
   Original contribution by OSM SARL, http://www.osm.net
   -->
   
  -<blockinfo>
  +<type>
   
  -  <block>
  +  <component>
       <name>time</name>
       <version>1.0</version>
  -  </block>
  +  </component>
   
     <!-- 
     The TimeProvider component provides a single service defined by the 
  @@ -23,27 +26,16 @@
     -->
   
     <services>
  -    <service name="org.omg.CosTime.TimeService"/>
  +    <service>
  +      <reference type="org.omg.CosTime.TimeService"/>
  +    </service>
     </services>
   
     <dependencies>
         <dependency>
             <role>poa</role>
  -          <service name="org.apache.orb.POAContext"/>
  +          <reference type="org.apache.orb.POAContext"/>
         </dependency>
     </dependencies>
   
  -  <implementation policy="SINGLETON"/>
  -
  -  <configuration>
  -
  -    <!-- 
  -    The profile element declares the default inaccuracy values 
  -    that will be used by the time server. 
  -    -->
  -
  -    <profile inaccuracy="10000" />
  -
  -  </configuration>
  -
  -</blockinfo>
  +</type>
  
  
  

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