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 Sat, 04 Jan 2003 02:03:28 GMT
mcconnell    2003/01/03 18:03:27

  Modified:    enterprise/corbaloc/src/idl corbaloc.idl
               enterprise/ins build.xml
               enterprise/ins/src/java/org/apache/ins
                        BindingIteratorImpl.java
               enterprise/orb build.properties build.xml
               enterprise/pss build.xml
               enterprise/time build.xml
               enterprise/time/src/java/org/apache/time TimeProvider.xinfo
  Log:
  Fixing up a nuimber of build related errors.
  
  Revision  Changes    Path
  1.4       +3 -6      jakarta-avalon-apps/enterprise/corbaloc/src/idl/corbaloc.idl
  
  Index: corbaloc.idl
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/corbaloc/src/idl/corbaloc.idl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- corbaloc.idl	14 Sep 2002 21:18:09 -0000	1.3
  +++ corbaloc.idl	4 Jan 2003 02:03:27 -0000	1.4
  @@ -8,10 +8,8 @@
   #ifndef _CORBALOC_IDL_
   #define _CORBALOC_IDL_
   
  -module org
  -{
  -module apache
  -{
  +#pragma prefix "apache.org"
  +
   module orb
   {
   module corbaloc
  @@ -269,8 +267,7 @@
           */
           any select( in string reference ) raises ( UnknownReference, InvalidReference,
ServiceRedirection );
       };
  -};
  -};
  +
   };
   };
   
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	8 Sep 2002 16:10:12 -0000	1.8
  +++ build.xml	4 Jan 2003 02:03:27 -0000	1.9
  @@ -53,7 +53,7 @@
     <property name="common.lib.path" value="${common.path}/lib" />
     <property name="orb.path"  value="${enterprise}/orb" />
     <property name="orb.lib.path"  value="${orb.path}/lib" />
  -  <property name="orb.dist.path"  value="${orb.path}/dist" />
  +  <property name="orb.dist.path"  value="${orb.path}/build" />
     <property name="idl.class"  value="org.openorb.compiler.IdlCompiler" />
     <property name="pss.path"  value="${enterprise}/pss" />
     <property name="pss.dist.path"  value="${pss.path}/dist" />
  
  
  
  1.4       +45 -6     jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins/BindingIteratorImpl.java
  
  Index: BindingIteratorImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins/BindingIteratorImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BindingIteratorImpl.java	21 Oct 2002 15:55:40 -0000	1.3
  +++ BindingIteratorImpl.java	4 Jan 2003 02:03:27 -0000	1.4
  @@ -1,7 +1,7 @@
   /* ==================================================================== 
    * The Apache Software License, Version 1.1 
    * 
  - * Copyright (c) 1997-2002 The Apache Software Foundation. All rights 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
    * reserved. 
    * 
    * Redistribution and use in source and binary forms, with or without 
  @@ -52,11 +52,50 @@
    * information on the Apache Software Foundation, please see 
    * <http://www.apache.org/>.
    *
  - * This software is based on original contributions Copyright 2000 (C) 
  - * Intalio Inc. All Rights Reserved.
  + * Portions of this file are derived from the OpenORB Community Project
  + * (see http://openorb.sourceforge.net) - as covered by the following 
  + * license.  Due credit to the OpenORB Community Project and Exolab is
  + * hereby acknowleged.
  + * 
  + * Exolab License
  + * Copyright (C) 1999-2001  Intalio, Inc. All Rights Reserved.
  + *
  + * Redistribution and use of this software and associated documentation
  + * ("Software"), with or without modification, are permitted provided that the
  + * following conditions are met:
  + *
  + * 1. Redistributions of source code must retain copyright statements and
  + * notices. Redistributions must also contain a copy of this document.
  + * 
  + * 2. Redistributions in binary form must reproduce the above copyright notice,
  + * this list of conditions and the following disclaimer in the documentation
  + * and/or other materials provided with the distribution.
  + * 
  + * 3. The name "ExoLab" must not be used to endorse or promote products derived
  + * from this Software without prior written permission of ExoLab Group. For
  + * written permission, please contact info@exolab.org.
  + * 
  + * 4. Products derived from this Software may not be called "ExoLab" nor may
  + * "ExoLab" appear in their names without prior written permission of ExoLab
  + * Group. Exolab is a registered trademark of ExoLab Group.
  + * 
  + * 5. Due credit should be given to the ExoLab Group (http://www.exolab.org).
  + * 
  + * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS ''AS IS'' AND
  + * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  + * ARE DISCLAIMED.
  + * 
  + * IN NO EVENT SHALL INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + * ====================================================================
    */ 
   
  -
   package org.apache.ins;
   
   import org.apache.avalon.framework.logger.LogEnabled;
  @@ -66,9 +105,9 @@
    * This class is the implementation of BindingIterator.
    *
    * @author <a href="mailto:mdaniel@intalio.com">Marina Daniel &lt;mdaniel@intalio.com&gt;</a>
  + * @author <a href="mailto:mcconnell@appache.org">Stephen McConnell &lt;mcconnell@apache.org&gt;</a>
    * @version $Revision$ $Date$ 
    */
  -
   public class BindingIteratorImpl extends org.omg.CosNaming.BindingIteratorPOA
       implements LogEnabled
   {
  
  
  
  1.6       +11 -0     jakarta-avalon-apps/enterprise/orb/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/build.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.properties	12 May 2002 03:29:20 -0000	1.5
  +++ build.properties	4 Jan 2003 02:03:27 -0000	1.6
  @@ -9,9 +9,20 @@
   MINOR=0
   MICRO=1
   
  +#
   # demo configuration
   #
   hello.verbose=false
   hello.priority=debug
   hello.disposal=false
   
  +#
  +# set the openorb.build.src to the OpenORB buils src directory
  +# (default value is the local source directory which is effectively
  +# a useless value)
  +#
  +
  +openorb.build.src= build/orb/src
  +openorb.src=src/java
  +
  +dist = dist
  \ No newline at end of file
  
  
  
  1.20      +0 -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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	22 Sep 2002 18:26:48 -0000	1.19
  +++ build.xml	4 Jan 2003 02:03:27 -0000	1.20
  @@ -257,10 +257,6 @@
         >
           <sourcepath path="${src}/java"/>
           <sourcepath path="${build.dir}/orb/src"/>
  -        <!--
  -        <sourcepath path="${build.dir}/corbaloc"/>
  -        <sourcepath path="${build.dir}/activation"/>
  -        -->
           <sourcepath path="${openorb.src}"/>
           <sourcepath path="${openorb.build.src}"/>
           <classpath>
  
  
  
  1.12      +1 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	14 Sep 2002 00:10:24 -0000	1.11
  +++ build.xml	4 Jan 2003 02:03:27 -0000	1.12
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="pss" default="help" basedir=".">
  +<project name="pss" default="build" basedir=".">
   
     <property file="local.properties"/>
     <property file="build.properties"/>
  @@ -100,7 +100,6 @@
         <fileset dir="${common.path}/lib">
           <include name="logkit-1.1.jar" />
           <include name="avalon-framework*.jar" />
  -        <include name="merlin.jar" />
         </fileset>
     </path>
   
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	14 Sep 2002 21:18:09 -0000	1.11
  +++ build.xml	4 Jan 2003 02:03:27 -0000	1.12
  @@ -3,7 +3,7 @@
   Time Service.
   -->
   
  -<project name="time" default="help" basedir=".">
  +<project name="time" default="build" basedir=".">
   
     <property file="local.properties"/>
     <property file="build.properties"/>
  
  
  
  1.7       +4 -4      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TimeProvider.xinfo	8 Sep 2002 16:10:13 -0000	1.6
  +++ TimeProvider.xinfo	4 Jan 2003 02:03:27 -0000	1.7
  @@ -32,10 +32,10 @@
     </services>
   
     <dependencies>
  -      <dependency>
  -          <role>poa</role>
  -          <reference type="org.apache.orb.POAContext"/>
  -      </dependency>
  +    <dependency>
  +      <role>poa</role>
  +      <reference type="org.apache.orb.POAContext"/>
  +    </dependency>
     </dependencies>
   
   </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