avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager MBeanScripter.java
Date Sat, 01 Mar 2003 02:56:54 GMT
donaldp     2003/02/28 18:56:54

  Modified:    .        build.xml
               src/java/org/apache/avalon/phoenix/components/manager
                        MBeanScripter.java
  Removed:     lib/container excalibur-converter-1.0.jar
  Log:
  Move from excalibur converter to the converter in spice
  
  Revision  Changes    Path
  1.207     +38 -7     avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/build.xml,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- build.xml	1 Mar 2003 02:34:39 -0000	1.206
  +++ build.xml	1 Mar 2003 02:56:54 -0000	1.207
  @@ -59,6 +59,7 @@
       <property name="conf.dir" value="${src.dir}/conf"/>
       <property name="script.dir" value="${src.dir}/script"/>
       <property name="lib.dir" value="lib"/>
  +    <property name="repo.dir" value="${lib.dir}/repo"/>
       <property name="tools.dir" value="../avalon/tools"/>
       <property name="phoenix.tools.dir" value="tools"/>
   
  @@ -85,8 +86,9 @@
       <property name="status2changes" value="${phoenix.tools.dir}/status2changes.xsl"/>
   
       <!-- Invoke 'ant get-mx4j' to get these -->
  -    <property name="mx4j.jar" value="mx4j/mx4j-1.1.1/lib/mx4j-jmx.jar"/>
  -    <property name="mx4j-tools.jar" value="mx4j/mx4j-1.1.1/lib/mx4j-tools.jar"/>
  +    <property name="mx4j.jar" value="${repo.dir}/mx4j-1.1.1/lib/mx4j-jmx.jar"/>
  +    <property name="mx4j-tools.jar" value="${repo.dir}/mx4j-1.1.1/lib/mx4j-tools.jar"/>
  +    <property name="converter.jar" value="${repo.dir}/converter-0.9.1/converter-0.9.1.jar"/>
   
       <path id="project.class.path">
           <pathelement location="${xerces.jar}"/>
  @@ -94,6 +96,7 @@
           <pathelement location="${logkit.jar}"/>
           <pathelement location="${sandbox-info.jar}"/>
           <pathelement location="${wrapper.jar}"/>
  +        <pathelement path="${converter.jar}"/>
           <pathelement path="${mx4j.jar}"/>
           <pathelement path="${mx4j-tools.jar}"/>
           <pathelement path="${java.class.path}" />
  @@ -145,8 +148,26 @@
           <fail message="MX4J needed. See above."/>
       </target>
   
  +    <target name="check-converter">
  +        <available property="converter.present" classname="org.realityforge.converter.Converter">
  +            <classpath refid="project.class.path"/>
  +        </available>
  +        <antcall target="check-converter2"/>
  +    </target>
  +    <target name="check-converter2" unless="converter.present">
  +        <echo>**************************</echo>
  +        <echo>* Please execute target  *</echo>
  +        <echo>* 'get-converter' in the *</echo>
  +        <echo>* main target.xml build  *</echo>
  +        <echo>* file to download one   *</echo>
  +        <echo>* and a half Mb of       *</echo>
  +        <echo>* converter              *</echo>
  +        <echo>**************************</echo>
  +        <fail message="Converter needed. See above."/>
  +    </target>
  +
       <!-- Check requirements of environment -->
  -    <target name="check-environment" depends="check-mx4j">
  +    <target name="check-environment" depends="check-mx4j, check-converter">
           <available property="xerces.present" type="file" file="${xerces.jar}"/>
           <available property="servlet.present" classname="javax.servlet.Servlet">
               <classpath refid="project.class.path"/>
  @@ -162,13 +183,22 @@
       <!-- Get the jars from the MX4J project. -->
       <!-- For licensing reasons, we are unable to put these Jars in our CVS or source
distributions. -->
       <target name="get-mx4j">
  -        <mkdir  dir="mx4j"/>
  +        <mkdir dir="${repo.dir}"/>
           <get src="http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz"
  -            dest="mx4j/mx4j.tar.gz"
  +            dest="${repo.dir}/mx4j.tar.gz"
  +            verbose="true"
  +            usetimestamp="true"/>
  +        <gunzip src="${repo.dir}/mx4j.tar.gz" dest="${repo.dir}"/>
  +        <untar src="${repo.dir}/mx4j.tar" dest="${repo.dir}"/>
  +    </target>
  +
  +    <target name="get-converter">
  +        <mkdir dir="${repo.dir}"/>
  +        <get src="http://unc.dl.sourceforge.net/sourceforge/spice/converter-0.9.1.zip"
  +            dest="${repo.dir}/converter.zip"
               verbose="true"
               usetimestamp="true"/>
  -        <gunzip src="mx4j/mx4j.tar.gz" dest="mx4j" />
  -        <untar src="mx4j/mx4j.tar" dest="mx4j"/>
  +        <unzip src="${repo.dir}/converter.zip" dest="${repo.dir}"/>
       </target>
   
       <!-- Prepares the build directory -->
  @@ -451,6 +481,7 @@
           <copy file="${target.lib}/phoenix-client.jar" todir="${bin.dist.lib}/"/>
           <copy file="${target.lib}/phoenix-loader.jar" todir="${bin.dist.bin}/"/>
           <copy file="${target.lib}/phoenix-engine.jar" todir="${bin.dist.container.lib}"/>
  +        <copy file="${converter.jar}" todir="${bin.dist.container.lib}"/>
   
           <copy file="${logkit.jar}" todir="${bin.dist.lib}"/>
           <copy file="${framework.jar}" todir="${bin.dist.lib}"/>
  
  
  
  1.5       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanScripter.java
  
  Index: MBeanScripter.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanScripter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MBeanScripter.java	22 Feb 2003 05:34:45 -0000	1.4
  +++ MBeanScripter.java	1 Mar 2003 02:56:54 -0000	1.5
  @@ -13,8 +13,8 @@
   import javax.management.ObjectName;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.excalibur.converter.Converter;
  -import org.apache.excalibur.converter.lib.SimpleMasterConverter;
  +import org.realityforge.converter.Converter;
  +import org.realityforge.converter.lib.SimpleMasterConverter;
   
   /**
    * Support JMX MBean lifecycle.
  
  
  

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


Mime
View raw message