Return-Path: 
 <cvs-return-14771-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 77928 invoked by uid 500); 1 Mar 2003 16:32:53 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 77917 invoked by uid 500); 1 Mar 2003 16:32:53 -0000
Received: (qmail 77914 invoked from network); 1 Mar 2003 16:32:53 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 1 Mar 2003 16:32:53 -0000
Received: (qmail 63771 invoked by uid 1233); 1 Mar 2003 16:32:53 -0000
Date: 1 Mar 2003 16:32:53 -0000
Message-ID: <20030301163253.63770.qmail@icarus.apache.org>
From: hammant@apache.org
To: avalon-apps-cvs@apache.org
Subject: cvs commit: avalon-apps/demo/src/xdocs demo-altrmi-helloworld.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

hammant     2003/03/01 08:32:53

  Modified:    demo     build.xml
               demo/src/conf avalon-altrmidemo-assembly.xml
                        avalon-altrmidemo-config.xml
               demo/src/xdocs demo-altrmi-helloworld.xml
  Log:
  Correct build of altrmi demo
  
  Revision  Changes    Path
  1.81      +18 -13    avalon-apps/demo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/build.xml,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- build.xml	1 Mar 2003 11:11:28 -0000	1.80
  +++ build.xml	1 Mar 2003 16:32:52 -0000	1.81
  @@ -39,6 +39,8 @@
       <property name="xdocs.dir" value="${src.dir}/xdocs"/>
       <property name="tools.dir" location="../../avalon/tools"/>
   
  +    <property name="altrmi.ver" value="0.9.1"/>
  +
       <property name="dist.base" value="distributions"/>
   
       <path id="project.class.path">
  @@ -95,10 +97,10 @@
               interfaces="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
               classgendir="${build.dir}/genclasses">
               <classpath>
  -                <pathelement location="../common/lib/altrmi-client-interfaces-0.9.1.jar"/>
  -                <pathelement location="../common/lib/altrmi-client-impl-0.9.1.jar"/>
  -                <pathelement location="../common/lib/altrmi-common-0.9.1.jar"/>
  -                <pathelement location="../common/lib/altrmi-generator-0.9.1.jar"/>
  +                <pathelement location="../common/lib/altrmi-client-interfaces-${altrmi.ver}.jar"/>
  +                <pathelement location="../common/lib/altrmi-client-impl-${altrmi.ver}.jar"/>
  +                <pathelement location="../common/lib/altrmi-common-${altrmi.ver}.jar"/>
  +                <pathelement location="../common/lib/altrmi-generator-${altrmi.ver}.jar"/>
                   <pathelement path="${build.classes}"/>
               </classpath>
           </altrmiproxies>
  @@ -184,9 +186,9 @@
           </jar>
   
           <mkdir dir="${build.dir}/temp"/>
  -        <unzip src="../common/lib/altrmi-common-0.9.1.jar" dest="${build.dir}/temp"/>
  -        <unzip src="../common/lib/altrmi-client-interfaces-0.9.1.jar" dest="${build.dir}/temp"/>
  -        <unzip src="../common/lib/altrmi-client-impl-0.9.1.jar" dest="${build.dir}/temp"/>
  +        <unzip src="../common/lib/altrmi-common-${altrmi.ver}.jar" dest="${build.dir}/temp"/>
  +        <unzip src="../common/lib/altrmi-client-interfaces-${altrmi.ver}.jar" dest="${build.dir}/temp"/>
  +        <unzip src="../common/lib/altrmi-client-impl-${altrmi.ver}.jar" dest="${build.dir}/temp"/>
   
           <jar jarfile="${build.lib}/avalon-altrmidemo-tester.jar" compress="false" manifest="${manifest.dir}/AltrmiHelloWorldTest.mf">
               <fileset dir="${build.dir}/genclasses">
  @@ -280,12 +282,15 @@
               </lib>
   
               <lib dir="../common/lib">
  -                <include name="altrmi-common-0.9.1.jar"/>
  -                <include name="altrmi-server-interfaces-0.9.1.jar"/>
  -                <include name="altrmi-server-impl-0.9.1.jar"/>
  -                <include name="altrmi-generator-0.9.1.jar"/>
  -                <include name="altrmi-blocks-0.9.1.jar"/>
  -                <include name="altrmi-registry-0.9.1.jar"/>
  +                <include name="altrmi-common-${altrmi.ver}.jar"/>
  +                <include name="altrmi-server-interfaces-${altrmi.ver}.jar"/>
  +                <include name="altrmi-server-impl-${altrmi.ver}.jar"/>
  +                <include name="altrmi-generator-${altrmi.ver}.jar"/>
  +                <include name="altrmi-blocks-${altrmi.ver}.jar"/>
  +                <include name="altrmi-registry-${altrmi.ver}.jar"/>
  +                <include name="excalibur-thread*.jar"/>  
  +                <include name="excalibur-pool*.jar"/>
  +                <include name="excalibur-collections*.jar"/>
               </lib>
   
               <fileset dir="${build.lib}">
  
  
  
  1.14      +4 -4      avalon-apps/demo/src/conf/avalon-altrmidemo-assembly.xml
  
  Index: avalon-altrmidemo-assembly.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/src/conf/avalon-altrmidemo-assembly.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- avalon-altrmidemo-assembly.xml	25 Jan 2003 17:01:10 -0000	1.13
  +++ avalon-altrmidemo-assembly.xml	1 Mar 2003 16:32:52 -0000	1.14
  @@ -24,19 +24,19 @@
     <!--                                           -->
   
   
  -  <listener class="org.apache.excalibur.altrmi.blocks.autopublishing.AutoPublisher"
  +  <listener class="org.apache.altrmi.blocks.autopublishing.AutoPublisher"
                     name="altrmification-listener"/>
   
  -  <block class="org.apache.excalibur.altrmi.blocks.authentication.DefaultAuthenticator" 
  +  <block class="org.apache.altrmi.blocks.authentication.DefaultAuthenticator" 
            name="altrmi-authenticator" >
     </block>
   
  -  <block class="org.apache.excalibur.altrmi.blocks.publishing.SocketStreamPublisher" 
  +  <block class="org.apache.altrmi.blocks.publishing.SocketStreamPublisher" 
            name="altrmi-publisher" >
       <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections" 
   	 role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />           
  -    <provide name="altrmi-authenticator" role="org.apache.excalibur.altrmi.server.Authenticator"/>
  +    <provide name="altrmi-authenticator" role="org.apache.altrmi.server.Authenticator"/>
     </block>
   
   
  
  
  
  1.10      +1 -1      avalon-apps/demo/src/conf/avalon-altrmidemo-config.xml
  
  Index: avalon-altrmidemo-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/src/conf/avalon-altrmidemo-config.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- avalon-altrmidemo-config.xml	25 Jan 2003 17:01:10 -0000	1.9
  +++ avalon-altrmidemo-config.xml	1 Mar 2003 16:32:52 -0000	1.10
  @@ -51,7 +51,7 @@
           <connectiontimeout>360000</connectiontimeout>
         </socketObjectStreamHandler>
         <classRetrieverType>jarFile</classRetrieverType>
  -      <socketStreamServerClass>org.apache.excalibur.altrmi.server.impl.socket.PartialSocketObjectStreamServer</socketStreamServerClass>
  +      <socketStreamServerClass>org.apache.altrmi.server.impl.socket.PartialSocketObjectStreamServer</socketStreamServerClass>
         <generatedClassJarURLs>./HelloWorldAltrmiProxy.jar</generatedClassJarURLs>
     </altrmi-publisher>
   
  
  
  
  1.5       +6 -6      avalon-apps/demo/src/xdocs/demo-altrmi-helloworld.xml
  
  Index: demo-altrmi-helloworld.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/src/xdocs/demo-altrmi-helloworld.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- demo-altrmi-helloworld.xml	25 Jan 2003 17:01:10 -0000	1.4
  +++ demo-altrmi-helloworld.xml	1 Mar 2003 16:32:53 -0000	1.5
  @@ -51,19 +51,19 @@
       </p>
   <source>
   (text snipped)
  -  &lt;listener class="org.apache.excalibur.altrmi.blocks.autopublishing.AutoPublisher"
  +  &lt;listener class="org.apache.altrmi.blocks.autopublishing.AutoPublisher"
                     name="altrmification-listener"/&gt;
   
  -  &lt;block class="org.apache.excalibur.altrmi.blocks.authentication.DefaultAuthenticator" 
  +  &lt;block class="org.apache.altrmi.blocks.authentication.DefaultAuthenticator" 
            name="altrmi-authenticator" &gt;
     &lt;/block&gt;
   
  -  &lt;block class="org.apache.excalibur.altrmi.blocks.publishing.SocketStreamPublisher" 
  +  &lt;block class="org.apache.altrmi.blocks.publishing.SocketStreamPublisher" 
            name="altrmi-publisher" &gt;
       &lt;provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/&gt;
       &lt;provide name="connections" 
   	 role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" /&gt;           
  -    &lt;provide name="altrmi-authenticator" role="org.apache.excalibur.altrmi.server.Authenticator"/&gt;
  +    &lt;provide name="altrmi-authenticator" role="org.apache.altrmi.server.Authenticator"/&gt;
     &lt;/block&gt;
   (text snipped)
   </source>
  @@ -84,7 +84,7 @@
           &lt;connectiontimeout&gt;360000&lt;/connectiontimeout&gt;
         &lt;/socketObjectStreamHandler&gt;
         &lt;classRetrieverType&gt;jarFile&lt;/classRetrieverType&gt;
  -      &lt;socketStreamServerClass&gt;org.apache.excalibur.altrmi.server.impl.socket.PartialSocketObjectStreamServer&lt;/socketStreamServerClass&gt;
  +      &lt;socketStreamServerClass&gt;org.apache.altrmi.server.impl.socket.PartialSocketObjectStreamServer&lt;/socketStreamServerClass&gt;
         &lt;generatedClassJarURLs&gt;./HelloWorldAltrmiProxy.jar&lt;/generatedClassJarURLs&gt;
     &lt;/altrmi-publisher&gt;
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org