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-excalibur/assembly/src/java/org/apache/excalibur/playground ComplexComponent.xinfo CustomContainer.xinfo DemoManager.xinfo InvalidComponent.xinfo SimpleComponent.xinfo TerminalComponent.xinfo
Date Sun, 08 Sep 2002 16:53:56 GMT
mcconnell    2002/09/08 09:53:55

  Modified:    assembly build.xml default.properties
               assembly/lib orb-2.0.jar
               assembly/src/etc kernel.xml
               assembly/src/etc/activator server.xml
               assembly/src/java/org/apache/excalibur/merlin/kernel
                        DefaultKernel.xinfo
               assembly/src/java/org/apache/excalibur/playground
                        ComplexComponent.xinfo CustomContainer.xinfo
                        DemoManager.xinfo InvalidComponent.xinfo
                        SimpleComponent.xinfo TerminalComponent.xinfo
  Log:
  Sync. with latest updates to the orb and corbaloc packages.
  
  Revision  Changes    Path
  1.56      +26 -10    jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- build.xml	7 Sep 2002 07:27:10 -0000	1.55
  +++ build.xml	8 Sep 2002 16:53:55 -0000	1.56
  @@ -78,6 +78,7 @@
       <target name="deploy" depends="jar">
          <mkdir dir="${extension.dir}"/>
          <copy todir="${extension.dir}" file="${build.lib}/${jar.name}"/>
  +       <copy todir="${extension.dir}" file="${build.lib}/${activation.jar}"/>
          <copy todir="${extension.dir}" file="${logkit.jar}"/>
          <copy todir="${extension.dir}" file="${avalon-framework.jar}"/>
          <copy todir="${extension.dir}" file="${excalibur-i18n.jar}"/>
  @@ -208,6 +209,7 @@
               manifest="${src.dir}/etc/project.mf">
               <exclude name="**/test/**"/>
               <exclude name="**/playground/**"/>
  +            <exclude name="**/activation/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
  @@ -223,6 +225,16 @@
               </zipfileset>
           </jar>
   
  +        <jar jarfile="${build.lib}/${activation.jar}"
  +            basedir="${build.classes}"
  +            compress="${build.compress}"
  +            manifest="${src.dir}/etc/activation.mf">
  +            <include name="**/activation/**"/>
  +            <zipfileset dir="${build.conf}" prefix="META-INF/">
  +                <include name="LICENSE.txt"/>
  +            </zipfileset>
  +        </jar>
  +
       </target>
   
       <!-- Creates all the .sar file -->
  @@ -442,29 +454,33 @@
       </target>
   
     <!--
  -  Update the local copy of the ORB.
  +  Update the local copy of the corbaloc resolver.
     -->
   
  -  <target name="orb.context">
  -    <available property="orb.available" file="${apps.dir}/enterprise/orb/build/orb-2.0.jar"/>
  +  <target name="corbaloc.context">
  +    <available property="corbaloc.available" file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
     </target>
   
  -  <target name="orb.update" depends="orb.context" if="orb.available">
  -    <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/orb/build/orb-2.0.jar"/>
  +  <target name="corbaloc.update" depends="corbaloc.context" if="corbaloc.available">
  +    <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
     </target>
   
     <!--
  -  Update the local copy of the corbaloc resolver.
  +  Update the local copy of the ORB.
     -->
   
  -  <target name="corbaloc.context">
  -    <available property="corbaloc.available" file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
  +  <target name="orb.context">
  +    <available property="orb.available" file="${apps.dir}/enterprise/orb/dist/orb-2.0.jar"/>
     </target>
   
  -  <target name="corbaloc.update" depends="corbaloc.context" if="corbaloc.available">
  -    <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
  +  <target name="orb.update" depends="orb.context" if="orb.available">
  +    <echo message="updating orb"/>
  +    <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/orb/build/orb-2.0.jar"/>
  +    <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/orb/lib/openorb_tools-1.3.0.jar"/>
  +    <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/orb/lib/openorb-1.3.0.jar"/>
     </target>
   
  + 
     <!--
     Misc. utilities.
     -->
  
  
  
  1.12      +3 -0      jakarta-avalon-excalibur/assembly/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/default.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- default.properties	7 Sep 2002 07:27:10 -0000	1.11
  +++ default.properties	8 Sep 2002 16:53:55 -0000	1.12
  @@ -139,6 +139,9 @@
   idl-compiler.jar = ${local-tools.dir}/openorb_tools-1.3.0.jar
   idl.class = org.openorb.compiler.IdlCompiler
   
  +activation.version = 1.0
  +activation.jar = ${name}-activation-${activation.version}.jar
  +
   # avalon apps reference
   excalibur.dir = ./..
   apps.dir = ${excalibur.dir}/../jakarta-avalon-apps
  
  
  
  1.2       +25 -27    jakarta-avalon-excalibur/assembly/lib/orb-2.0.jar
  
  	<<Binary file>>
  
  
  1.42      +6 -0      jakarta-avalon-excalibur/assembly/src/etc/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/kernel.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- kernel.xml	7 Sep 2002 07:27:10 -0000	1.41
  +++ kernel.xml	8 Sep 2002 16:53:55 -0000	1.42
  @@ -53,6 +53,12 @@
         </target>
      </logging>
   
  +   <classpath>
  +     <fileset dir="extensions">
  +       <include name="merlin-activation-1.0.jar"/>
  +     </fileset>
  +   </classpath>
  +
      <!--
      Declaration of installed extension directories and kernel level classpath.
      In this demo we are referencing the Merlin classes in the embedded demo so 
  
  
  
  1.4       +6 -0      jakarta-avalon-excalibur/assembly/src/etc/activator/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/activator/server.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- server.xml	8 Sep 2002 14:36:56 -0000	1.3
  +++ server.xml	8 Sep 2002 16:53:55 -0000	1.4
  @@ -20,6 +20,12 @@
        <category priority="WARN"  name="loader" />
      </categories>
   
  +   <classpath>
  +     <fileset dir="extensions">
  +       <include name="merlin-activation-1.0.jar"/>
  +     </fileset>
  +   </classpath>
  +
      <library dir=".">
        <include name="extensions"/>
      </library>
  
  
  
  1.10      +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.xinfo
  
  Index: DefaultKernel.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.xinfo,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultKernel.xinfo	14 Aug 2002 03:03:35 -0000	1.9
  +++ DefaultKernel.xinfo	8 Sep 2002 16:53:55 -0000	1.10
  @@ -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" >
   
   <!--  
   Copyright (C) The Apache Software Foundation. All rights reserved.
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.xinfo
  
  Index: ComplexComponent.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComplexComponent.xinfo	20 Aug 2002 23:23:08 -0000	1.1
  +++ ComplexComponent.xinfo	8 Sep 2002 16:53:55 -0000	1.2
  @@ -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>
   
  
  
  
  1.3       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/CustomContainer.xinfo
  
  Index: CustomContainer.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/CustomContainer.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CustomContainer.xinfo	7 Sep 2002 07:27:12 -0000	1.2
  +++ CustomContainer.xinfo	8 Sep 2002 16:53:55 -0000	1.3
  @@ -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>
   
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.xinfo
  
  Index: DemoManager.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DemoManager.xinfo	20 Aug 2002 23:23:08 -0000	1.1
  +++ DemoManager.xinfo	8 Sep 2002 16:53:55 -0000	1.2
  @@ -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" >
   
   
   <!--
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/InvalidComponent.xinfo
  
  Index: InvalidComponent.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/InvalidComponent.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InvalidComponent.xinfo	20 Aug 2002 23:23:08 -0000	1.1
  +++ InvalidComponent.xinfo	8 Sep 2002 16:53:55 -0000	1.2
  @@ -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>
   
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.xinfo
  
  Index: SimpleComponent.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleComponent.xinfo	20 Aug 2002 23:23:08 -0000	1.1
  +++ SimpleComponent.xinfo	8 Sep 2002 16:53:55 -0000	1.2
  @@ -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>
   
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/TerminalComponent.xinfo
  
  Index: TerminalComponent.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/TerminalComponent.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TerminalComponent.xinfo	20 Aug 2002 23:23:08 -0000	1.1
  +++ TerminalComponent.xinfo	8 Sep 2002 16:53:55 -0000	1.2
  @@ -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>
   
  
  
  

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