avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager MX4JSystemManager.java
Date Tue, 03 Jun 2003 13:03:40 GMT
bloritsch    2003/06/03 06:03:39

  Modified:    .        build.xml
               src/java/org/apache/avalon/phoenix/components/manager
                        MX4JSystemManager.java
  Log:
  remove spice CLI references
  
  Revision  Changes    Path
  1.251     +2 -39     avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/build.xml,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- build.xml	31 May 2003 00:19:08 -0000	1.250
  +++ build.xml	3 Jun 2003 13:03:38 -0000	1.251
  @@ -102,9 +102,6 @@
       <!-- Invoke 'ant get-beanshell' to get this -->
       <property name="beanshell.jar" value="${repo.dir}/beanshell/bsh-1.2b7.jar"/>
   
  -    <!-- Invoke 'ant get-cli' to get these -->
  -    <property name="cli.jar" value="${repo.dir}/cli/cli-1.0/cli-1.0.jar"/>
  -
       <!-- Invoke ant get-configkit' to get these -->
       <property name="configkit.jar" value="${repo.dir}/spice-configkit/spice-configkit-1.1.2/spice-configkit-1.1.2.jar"/>
       <fileset id="configkit.fileset" dir="${lib.dir}" includes="repo/spice-configkit/spice-configkit-1.1.2/lib/*.jar"/>
  @@ -123,7 +120,6 @@
           <pathelement location="${logkit.jar}"/>
           <pathelement location="${wrapper.jar}"/>
           <pathelement path="${log4j.jar}"/>
  -        <pathelement path="${cli.jar}"/>
           <pathelement path="${configkit.jar}"/>
           <pathelement path="${loggerstore.jar}"/>
           <pathelement path="${classman.jar}"/>
  @@ -414,38 +410,6 @@
       </target>
   
       <!-- =================================================================== -->
  -    <!-- CLI Tasks.                                                          -->
  -    <!-- =================================================================== -->
  -    <target name="check-cli-init" depends="init">
  -        <available property="cli.present" classname="org.realityforge.cli.CLOption">
  -            <classpath refid="project.class.path"/>
  -        </available>
  -    </target>
  -
  -    <target name="check-cli" depends="check-cli-init" unless="cli.present">
  -        <echo>**************************</echo>
  -        <echo>* Please execute target  *</echo>
  -        <echo>* 'get-cli' in the main  *</echo>
  -        <echo>* build.xml build file   *</echo>
  -        <echo>* to download one and    *</echo>
  -        <echo>* a half Mb of Spice CLI *</echo>
  -        <echo>**************************</echo>
  -        <fail message="Spice CLI needed. See above."/>
  -    </target>
  -
  -    <!-- Get the jars from the cli project. -->
  -    <!-- For licensing reasons, we are unable to put these Jars in our CVS or source
distributions. -->
  -    <target name="get-cli" description="Get the Spice CLI distribution from SourceForge.">
  -        <mkdir dir="${repo.dir}/cli"/>
  -        <get src="http://osdn.dl.sourceforge.net/sourceforge/spice/cli-1.0.tar.gz"
  -            dest="${repo.dir}/cli/cli.tar.gz"
  -            verbose="true"
  -            usetimestamp="true"/>
  -        <gunzip src="${repo.dir}/cli/cli.tar.gz" dest="${repo.dir}/cli"/>
  -        <untar src="${repo.dir}/cli/cli.tar" dest="${repo.dir}/cli"/>
  -    </target>
  -
  -    <!-- =================================================================== -->
       <!-- ConfigKit Tasks.                                                    -->
       <!-- =================================================================== -->
       <target name="check-configkit-init" depends="init">
  @@ -559,7 +523,7 @@
   
       <!-- Check requirements of environment -->
       <target name="check-environment"
  -        depends="check-mx4j, check-log4j, check-cli, check-loggerstore,
  +        depends="check-mx4j, check-log4j, check-loggerstore,
                    check-configkit, check-classman, check-wrapper">
           <available property="xerces.present" type="file" file="${xerces.jar}"/>
           <available property="servlet.present" classname="javax.servlet.Servlet">
  @@ -941,7 +905,6 @@
   
           <zip destfile="${target.lib}/mx4j-tools.jar" basedir="${target.mx}"/>
   
  -        <copy file="${cli.jar}" todir="${bin.dist.bin}/lib"/>
           <copy file="${mx4j.jar}" todir="${bin.dist.bin}/lib"/>
           <copy file="${target.lib}/mx4j-tools.jar" todir="${bin.dist.bin}/lib"/>
   
  @@ -1334,7 +1297,7 @@
       </target>
   
       <target name="get-all-dependencies"
  -        depends="get-mx4j,get-log4j,get-cli,get-loggerstore,get-configkit,get-classman,get-wrapper"
  +        depends="get-mx4j,get-log4j,get-loggerstore,get-configkit,get-classman,get-wrapper"
           description="Meta-task to get all optional libaries"/>
   
       &forrest-targets;
  
  
  
  1.30      +7 -4      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
  
  Index: MX4JSystemManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- MX4JSystemManager.java	5 Apr 2003 04:40:08 -0000	1.29
  +++ MX4JSystemManager.java	3 Jun 2003 13:03:39 -0000	1.30
  @@ -138,8 +138,8 @@
           }
   
           /*<user>
  -         <name>user</name>
  -         <password>passwd</password>
  +         �<name>user</name>
  +         �<password>passwd</password>
           </user>*/
           final Configuration userConfig = configuration.getChild( "user" );
           m_username = userConfig.getChild( "name" ).getValue( null );
  @@ -253,8 +253,11 @@
                                                            adaptor );
           // Set the JNDI name with which will be registered
           mbean.setJNDIName( "jrmp" );
  -        mbean.putJNDIProperty( javax.naming.Context.INITIAL_CONTEXT_FACTORY,
  -                               m_namingFactory );
  +
  +        mbean.putNamingProperty( javax.naming.Context.INITIAL_CONTEXT_FACTORY,
  +                                 m_namingFactory);
  +        //mbean.putJNDIProperty( javax.naming.Context.INITIAL_CONTEXT_FACTORY,
  +        //                       m_namingFactory );
           //mbean.putJNDIProperty( javax.naming.Context.PROVIDER_URL, "rmi://localhost:1099"
);
           // Register the JRMP adaptor in JNDI and start it
           mbean.start();
  
  
  

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


Mime
View raw message