You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/03/12 14:01:38 UTC
cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends CLISetup.java
donaldp 2003/03/12 05:01:38
Modified: . build.xml
src/java/org/apache/avalon/phoenix/frontends CLISetup.java
Removed: lib/container excalibur-cli-1.0.jar
Log:
Remove away from excalibur-cli which has been axed.
Revision Changes Path
1.226 +65 -31 avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-phoenix/build.xml,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- build.xml 12 Mar 2003 12:50:37 -0000 1.225
+++ build.xml 12 Mar 2003 13:01:38 -0000 1.226
@@ -90,19 +90,23 @@
<!-- Invoke 'ant get-wrapper' to get these -->
<property name="wrapper.version" value="3.0.0"/>
<property name="wrapper.jar" value="${repo.dir}/wrapper/bin/wrapper.jar"/>
-
+
<!-- Invoke 'ant get-mx4j' to get these -->
<property name="mx4j.jar" value="${repo.dir}/mx4j/mx4j-1.1.1/lib/mx4j-jmx.jar"/>
<property name="mx4j-tools.jar" value="${repo.dir}/mx4j/mx4j-1.1.1/lib/mx4j-tools.jar"/>
<!-- 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"/>
+
<path id="project.class.path">
<pathelement location="${xerces.jar}"/>
<pathelement location="${framework.jar}"/>
<pathelement location="${logkit.jar}"/>
<pathelement location="${wrapper.jar}"/>
+ <pathelement path="${cli.jar}"/>
<pathelement path="${mx4j.jar}"/>
<pathelement path="${mx4j-tools.jar}"/>
<pathelement path="${beanshell.jar}"/>
@@ -176,20 +180,20 @@
<property name="wrapper.dist.name" value="wrapper_hpux_${wrapper.version}"/>
<property name="dist.name.wrapper" value="${name}_hpux_${version}"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Initialize build. -->
<!-- =================================================================== -->
<target name="init"
depends="init-windows-nt, init-windows-2000, init-windows-xp, init-linux, init-solaris, init-aix, init-hpux">
<echo message="OS='${os.name}'"/>
-
+
<!-- Wrapper filters -->
<filter token="app.name" value="phoenix"/>
<filter token="app.long.name" value="Phoenix Application Server"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Wrapper Tasks. -->
<!-- =================================================================== -->
@@ -197,14 +201,14 @@
<available property="wrapper.present" classname="org.tanukisoftware.wrapper.WrapperManager">
<classpath refid="project.class.path"/>
</available>
-
+
<condition property="wrapper.present.Windows">
<and>
<isset property="wrapper.present"/>
<isset property="is.Windows"/>
</and>
</condition>
-
+
<condition property="wrapper.present.Unix">
<and>
<isset property="wrapper.present"/>
@@ -222,7 +226,7 @@
<echo>* a half Mb of Wrapper *</echo>
<echo>*****************************</echo>
</target>
-
+
<!-- Get the files from the Wrapper project. -->
<target name="get-wrapper-test" depends="init" unless="wrapper.dist.name">
<echo>**********************************************************</echo>
@@ -291,11 +295,11 @@
description="Get the Wrapper distribution from SourceForge.">
<mkdir dir="${repo.dir}/wrapper"/>
</target>
-
+
<target name="dist-lite-wrapper-windows" depends="dist-lite" if="wrapper.present.Windows">
<copy file="${repo.dir}/wrapper/bin/Wrapper.exe" todir="${bin.dist.bin}"/>
<copy file="${repo.dir}/wrapper/bin/Wrapper.dll" todir="${bin.dist.bin}"/>
-
+
<copy file="${repo.dir}/wrapper/bin/${Name}.bat" todir="${bin.dist.bin}"/>
<copy file="${repo.dir}/wrapper/bin/Install${Name}-NT.bat" todir="${bin.dist.bin}"/>
<copy file="${repo.dir}/wrapper/bin/Uninstall${Name}-NT.bat" todir="${bin.dist.bin}"/>
@@ -304,7 +308,7 @@
<copy file="${repo.dir}/wrapper/bin/wrapper" todir="${bin.dist.bin}"/>
<copy file="${repo.dir}/wrapper/bin/realpath" todir="${bin.dist.bin}"/>
<copy file="${repo.dir}/wrapper/bin/libwrapper.so" todir="${bin.dist.bin}"/>
-
+
<copy file="${phoenix-wrapper.sh}" tofile="${bin.dist.bin}/${name}-wrapper.sh"/>
<chmod file="${bin.dist.bin}/*.sh" perm="u+x"/>
<chmod file="${bin.dist.bin}/realpath" perm="u+x"/>
@@ -317,13 +321,13 @@
<copy file="${wrapper.jar}" todir="${bin.dist.bin}"/>
<copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.conf}"/>
<fixcrlf srcdir="${bin.dist.conf}" includes="wrapper.conf" eol="lf"/>
-
+
<fixcrlf srcdir="${bin.dist.dir}" includes="**/*.bat" eol="crlf"/>
<fixcrlf srcdir="${bin.dist.dir}" includes="**/*.sh" eol="lf"/>
<chmod file="${bin.dist.bin}/*.sh" perm="u+x"/>
<chmod file="${bin.dist.bin}/*.bat" perm="u-x"/>
</target>
-
+
<!-- =================================================================== -->
<!-- JMX Tasks. -->
@@ -344,7 +348,7 @@
<echo>**************************</echo>
<fail message="MX4J needed. See above."/>
</target>
-
+
<!-- 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" description="Get the MX4J distribution from SourceForge.">
@@ -356,10 +360,39 @@
<gunzip src="${repo.dir}/mx4j/mx4j.tar.gz" dest="${repo.dir}/mx4j"/>
<untar src="${repo.dir}/mx4j/mx4j.tar" dest="${repo.dir}/mx4j"/>
</target>
-
-
-
-
+
+ <!-- =================================================================== -->
+ <!-- JMX 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 MX4J 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>
+
<!-- Main target -->
<target name="main" depends="dist-lite"
description="generates the Phoenix distribution without the javadocs"/>
@@ -380,7 +413,7 @@
<!-- Check requirements of environment -->
- <target name="check-environment" depends="check-mx4j, check-wrapper">
+ <target name="check-environment" depends="check-mx4j, check-cli, check-wrapper">
<available property="xerces.present" type="file" file="${xerces.jar}"/>
<available property="servlet.present" classname="javax.servlet.Servlet">
<classpath refid="project.class.path"/>
@@ -390,7 +423,7 @@
</available>
</target>
-
+
<!-- Get the jars from the Beanshell project. -->
<!-- For licensing reasons, we are unable to put these Jars in our CVS or source distributions. -->
@@ -401,7 +434,7 @@
dest="${repo.dir}/beanshell/bsh-1.2b7.jar"
verbose="true"
usetimestamp="true"/>
- </target>
+ </target>
<!-- Prepares the build directory -->
<target name="prepare" depends="check-environment">
@@ -742,6 +775,7 @@
<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"/>
@@ -927,7 +961,7 @@
<delete file="${dist.base}/${dist.name}-src.tar"/>
<delete dir="${dist.name}"/>
</target>
-
+
<target name="dist-bin" depends="dist-src">
<mkdir dir="${dist.base}"/>
<delete dir="${dist.name}"/>
@@ -972,43 +1006,43 @@
<!-- Do not delete the temp dir yet as it is needed by the platform specific builds. -->
</target>
-
+
<target name="dist-wrapper-windows" depends="dist-bin, check-wrapper" if="wrapper.present.Windows">
<copy todir="${dist.name.wrapper}">
<fileset dir="${dist.name}"/>
</copy>
-
+
<copy file="${repo.dir}/wrapper/bin/Wrapper.exe" todir="${dist.name.wrapper}/bin"/>
<copy file="${repo.dir}/wrapper/bin/Wrapper.dll" todir="${dist.name.wrapper}/bin"/>
<copy file="${wrapper.jar}" todir="${dist.name.wrapper}/bin"/>
<copy file="${conf.dir}/wrapper.conf" todir="${dist.name.wrapper}/conf"/>
-
+
<copy file="${repo.dir}/wrapper/bin/${Name}.bat" todir="${dist.name.wrapper}/bin"/>
<copy file="${repo.dir}/wrapper/bin/Install${Name}-NT.bat" todir="${dist.name.wrapper}/bin"/>
<copy file="${repo.dir}/wrapper/bin/Uninstall${Name}-NT.bat" todir="${dist.name.wrapper}/bin"/>
-
+
<zip zipfile="${dist.base}/${dist.name.wrapper}-bin.zip">
<fileset dir="${dist.name.wrapper}/..">
<include name="${dist.name.wrapper}/**"/>
<exclude name="${dist.name.wrapper}/lib/bsh*.jar"/>
</fileset>
</zip>
-
+
<delete dir="${dist.name.wrapper}"/>
</target>
<target name="dist-wrapper-unix" depends="dist-bin, check-wrapper" if="wrapper.present.Unix">
<copy todir="${dist.name.wrapper}">
<fileset dir="${dist.name}"/>
</copy>
-
+
<copy file="${repo.dir}/wrapper/bin/wrapper" todir="${dist.name.wrapper}/bin"/>
<copy file="${repo.dir}/wrapper/bin/realpath" todir="${dist.name.wrapper}/bin"/>
<copy file="${repo.dir}/wrapper/bin/libwrapper.so" todir="${dist.name.wrapper}/bin"/>
<copy file="${wrapper.jar}" todir="${dist.name.wrapper}/bin"/>
<copy file="${conf.dir}/wrapper.conf" todir="${dist.name.wrapper}/conf"/>
-
+
<copy file="${phoenix-wrapper.sh}" tofile="${dist.name.wrapper}/bin/${name}-wrapper.sh"/>
-
+
<tar longfile="gnu" tarfile="${dist.base}/${dist.name.wrapper}-bin.tar">
<tarfileset dir="${dist.name.wrapper}/.." mode="755" username="avalon" group="avalon">
<include name="${dist.name.wrapper}/bin/*.sh"/>
@@ -1032,7 +1066,7 @@
</target>
<target name="dist" depends="dist-wrapper-windows, dist-wrapper-unix"
description="generates the Phoenix distribution (src, bin, and bin with wrapper)">
-
+
<delete dir="${dist.name}"/>
</target>
1.22 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java
Index: CLISetup.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CLISetup.java 22 Feb 2003 05:34:46 -0000 1.21
+++ CLISetup.java 12 Mar 2003 13:01:38 -0000 1.22
@@ -8,14 +8,14 @@
package org.apache.avalon.phoenix.frontends;
import java.util.List;
-import org.apache.avalon.excalibur.cli.CLArgsParser;
-import org.apache.avalon.excalibur.cli.CLOption;
-import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
-import org.apache.avalon.excalibur.cli.CLUtil;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.phoenix.interfaces.SystemManager;
+import org.realityforge.cli.CLArgsParser;
+import org.realityforge.cli.CLOption;
+import org.realityforge.cli.CLOptionDescriptor;
+import org.realityforge.cli.CLUtil;
/**
* The class prepare parameters based on input options.
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
Re: cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends
CLISetup.java
Posted by Stephen McConnell <mc...@apache.org>.
This is a reply in part to Leo's email and to the comments from Sefano
on the same subject:
You may be wondering why I issue a veto against the modifications
committed by Peter Donald to the Phoenix code base. I would line to
take this opportunity to express those reasons in more detail, and
invite Peter Donald or any other member of the Avalon community to
present counter arguments.
1. I am opposed to the introduction of an external
dependency within Avalon code when a perfectly valid
solution exists within ASF and published under the ASL.
2. I am opposed to the modification of the Phoenix code
base when the modification is directly in contravention
of an established concensus to migrate to Commons where
possible (and in particular in this case the Commons CLI
application).
Peter Donald is free to respond to the veto as he sees fit. Should
Peter Donald ignore the veto then I would request action from the Avalon
PMC to address the matter should that situation arise. I think it is
appropriate the Peter Donald revert the changes that he made following
which he is welcome to make a proposal to the community concerning the
maintenance of the Excalibur CLI API (or derived work). This difference
here is that it is the responsibility of Peter Donald to make that
proposal and present a sufficiently compelling case to this community
supporting his view. Should Peter Donald prepare such a proposal, I
remain hopeful that he will address the specific issues I've raised
above. I do think that the action taken by Peter Donald with respect to
the modifications to Phoenix without any prior community consultation
are inappropriate but I recognize that these actions are within the
scope of the privileges granted to him by the Avalon PMC within the
established policies and procedures. As such I feel obliged to address
this issue via the veto mechanism - a mechanism available to me in
accordance with the same policy and procedures.
Cheers, Steve.
Leo Simons wrote:
> Steve, vetoes are _not_ how we want to work things out. This is *not*
> productive (see my earlier mail about my view of productivity). Please
> reconsider throwing more annoying vetoes into the party about stuff
> which has not been aptly discussed.
>
> Here's how development works: we interpret were we're moving as a
> project and what we need as a project, and act based on that. If we're
> not sure everyone agrees with those acts, we draft a proposal before
> committing stuff. When we are, we just commit, and things are subject
> to lazy consensus.
>
> If we shouldn't have been sure because there isn't in fact a
> consensus, the thing to do is to bring the actions and commits up for
> discussion. *Not* just throw a veto out without discussion. Vetoes
> make it more difficult to build consensus, and consensus is what we like.
>
> Why don't you retract your veto, take a look at Eung-ju's patch,
> rework it to be fully compliant with the existing phoenix cli options,
> and propose the modified patch as a replacement. Everybody happy.
>
> vetoes -- bleh.
>
> - Leo
>
> Stephen McConnell wrote:
>
>>
>> -1 (veto)
>>
>>> donaldp 2003/03/12 05:01:38
>>>
>>> Modified: . build.xml
>>> src/java/org/apache/avalon/phoenix/frontends
>>> CLISetup.java
>>> Removed: lib/container excalibur-cli-1.0.jar
>>> Log:
>>> Remove away from excalibur-cli which has been axed.
>>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
> For additional commands, e-mail: dev-help@avalon.apache.org
>
>
>
--
Stephen J. McConnell
mailto:mcconnell@apache.org
http://www.osm.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends
CLISetup.java
Posted by Leo Simons <le...@apache.org>.
Steve, vetoes are _not_ how we want to work things out. This is *not*
productive (see my earlier mail about my view of productivity). Please
reconsider throwing more annoying vetoes into the party about stuff
which has not been aptly discussed.
Here's how development works: we interpret were we're moving as a
project and what we need as a project, and act based on that. If we're
not sure everyone agrees with those acts, we draft a proposal before
committing stuff. When we are, we just commit, and things are subject to
lazy consensus.
If we shouldn't have been sure because there isn't in fact a consensus,
the thing to do is to bring the actions and commits up for discussion.
*Not* just throw a veto out without discussion. Vetoes make it more
difficult to build consensus, and consensus is what we like.
Why don't you retract your veto, take a look at Eung-ju's patch, rework
it to be fully compliant with the existing phoenix cli options, and
propose the modified patch as a replacement. Everybody happy.
vetoes -- bleh.
- Leo
Stephen McConnell wrote:
>
> -1 (veto)
>
>> donaldp 2003/03/12 05:01:38
>>
>> Modified: . build.xml
>> src/java/org/apache/avalon/phoenix/frontends CLISetup.java
>> Removed: lib/container excalibur-cli-1.0.jar
>> Log:
>> Remove away from excalibur-cli which has been axed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends
CLISetup.java
Posted by Stephen McConnell <mc...@apache.org>.
-1 (veto)
The Avalon community have taken a decision to migrate from the Excalibur
CLI to the Common CLI package. You changes are inconsistent with that
decision and introduce an unnecessary dependency to a code base outside
the jurisdiction of the ASF. For you reference, a compatibility jar has
been prepared to ensure binary support for the Excalibur CLI API where
required. An acceptable alternative would be to initiate the migration
of Phoenix to the Commons CLI package.
Cheers, Steve.
donaldp@apache.org wrote:
>donaldp 2003/03/12 05:01:38
>
> Modified: . build.xml
> src/java/org/apache/avalon/phoenix/frontends CLISetup.java
> Removed: lib/container excalibur-cli-1.0.jar
> Log:
> Remove away from excalibur-cli which has been axed.
>
> Revision Changes Path
> 1.226 +65 -31 avalon-phoenix/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/avalon-phoenix/build.xml,v
> retrieving revision 1.225
> retrieving revision 1.226
> diff -u -r1.225 -r1.226
> --- build.xml 12 Mar 2003 12:50:37 -0000 1.225
> +++ build.xml 12 Mar 2003 13:01:38 -0000 1.226
> @@ -90,19 +90,23 @@
> <!-- Invoke 'ant get-wrapper' to get these -->
> <property name="wrapper.version" value="3.0.0"/>
> <property name="wrapper.jar" value="${repo.dir}/wrapper/bin/wrapper.jar"/>
> -
> +
> <!-- Invoke 'ant get-mx4j' to get these -->
> <property name="mx4j.jar" value="${repo.dir}/mx4j/mx4j-1.1.1/lib/mx4j-jmx.jar"/>
> <property name="mx4j-tools.jar" value="${repo.dir}/mx4j/mx4j-1.1.1/lib/mx4j-tools.jar"/>
>
> <!-- 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"/>
> +
> <path id="project.class.path">
> <pathelement location="${xerces.jar}"/>
> <pathelement location="${framework.jar}"/>
> <pathelement location="${logkit.jar}"/>
> <pathelement location="${wrapper.jar}"/>
> + <pathelement path="${cli.jar}"/>
> <pathelement path="${mx4j.jar}"/>
> <pathelement path="${mx4j-tools.jar}"/>
> <pathelement path="${beanshell.jar}"/>
> @@ -176,20 +180,20 @@
> <property name="wrapper.dist.name" value="wrapper_hpux_${wrapper.version}"/>
> <property name="dist.name.wrapper" value="${name}_hpux_${version}"/>
> </target>
> -
> +
> <!-- =================================================================== -->
> <!-- Initialize build. -->
> <!-- =================================================================== -->
> <target name="init"
> depends="init-windows-nt, init-windows-2000, init-windows-xp, init-linux, init-solaris, init-aix, init-hpux">
> <echo message="OS='${os.name}'"/>
> -
> +
> <!-- Wrapper filters -->
> <filter token="app.name" value="phoenix"/>
> <filter token="app.long.name" value="Phoenix Application Server"/>
>
> </target>
> -
> +
> <!-- =================================================================== -->
> <!-- Wrapper Tasks. -->
> <!-- =================================================================== -->
> @@ -197,14 +201,14 @@
> <available property="wrapper.present" classname="org.tanukisoftware.wrapper.WrapperManager">
> <classpath refid="project.class.path"/>
> </available>
> -
> +
> <condition property="wrapper.present.Windows">
> <and>
> <isset property="wrapper.present"/>
> <isset property="is.Windows"/>
> </and>
> </condition>
> -
> +
> <condition property="wrapper.present.Unix">
> <and>
> <isset property="wrapper.present"/>
> @@ -222,7 +226,7 @@
> <echo>* a half Mb of Wrapper *</echo>
> <echo>*****************************</echo>
> </target>
> -
> +
> <!-- Get the files from the Wrapper project. -->
> <target name="get-wrapper-test" depends="init" unless="wrapper.dist.name">
> <echo>**********************************************************</echo>
> @@ -291,11 +295,11 @@
> description="Get the Wrapper distribution from SourceForge.">
> <mkdir dir="${repo.dir}/wrapper"/>
> </target>
> -
> +
> <target name="dist-lite-wrapper-windows" depends="dist-lite" if="wrapper.present.Windows">
> <copy file="${repo.dir}/wrapper/bin/Wrapper.exe" todir="${bin.dist.bin}"/>
> <copy file="${repo.dir}/wrapper/bin/Wrapper.dll" todir="${bin.dist.bin}"/>
> -
> +
> <copy file="${repo.dir}/wrapper/bin/${Name}.bat" todir="${bin.dist.bin}"/>
> <copy file="${repo.dir}/wrapper/bin/Install${Name}-NT.bat" todir="${bin.dist.bin}"/>
> <copy file="${repo.dir}/wrapper/bin/Uninstall${Name}-NT.bat" todir="${bin.dist.bin}"/>
> @@ -304,7 +308,7 @@
> <copy file="${repo.dir}/wrapper/bin/wrapper" todir="${bin.dist.bin}"/>
> <copy file="${repo.dir}/wrapper/bin/realpath" todir="${bin.dist.bin}"/>
> <copy file="${repo.dir}/wrapper/bin/libwrapper.so" todir="${bin.dist.bin}"/>
> -
> +
> <copy file="${phoenix-wrapper.sh}" tofile="${bin.dist.bin}/${name}-wrapper.sh"/>
> <chmod file="${bin.dist.bin}/*.sh" perm="u+x"/>
> <chmod file="${bin.dist.bin}/realpath" perm="u+x"/>
> @@ -317,13 +321,13 @@
> <copy file="${wrapper.jar}" todir="${bin.dist.bin}"/>
> <copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.conf}"/>
> <fixcrlf srcdir="${bin.dist.conf}" includes="wrapper.conf" eol="lf"/>
> -
> +
> <fixcrlf srcdir="${bin.dist.dir}" includes="**/*.bat" eol="crlf"/>
> <fixcrlf srcdir="${bin.dist.dir}" includes="**/*.sh" eol="lf"/>
> <chmod file="${bin.dist.bin}/*.sh" perm="u+x"/>
> <chmod file="${bin.dist.bin}/*.bat" perm="u-x"/>
> </target>
> -
> +
>
> <!-- =================================================================== -->
> <!-- JMX Tasks. -->
> @@ -344,7 +348,7 @@
> <echo>**************************</echo>
> <fail message="MX4J needed. See above."/>
> </target>
> -
> +
> <!-- 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" description="Get the MX4J distribution from SourceForge.">
> @@ -356,10 +360,39 @@
> <gunzip src="${repo.dir}/mx4j/mx4j.tar.gz" dest="${repo.dir}/mx4j"/>
> <untar src="${repo.dir}/mx4j/mx4j.tar" dest="${repo.dir}/mx4j"/>
> </target>
> -
> -
> -
> -
> +
> + <!-- =================================================================== -->
> + <!-- JMX 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 MX4J 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>
> +
> <!-- Main target -->
> <target name="main" depends="dist-lite"
> description="generates the Phoenix distribution without the javadocs"/>
> @@ -380,7 +413,7 @@
>
>
> <!-- Check requirements of environment -->
> - <target name="check-environment" depends="check-mx4j, check-wrapper">
> + <target name="check-environment" depends="check-mx4j, check-cli, check-wrapper">
> <available property="xerces.present" type="file" file="${xerces.jar}"/>
> <available property="servlet.present" classname="javax.servlet.Servlet">
> <classpath refid="project.class.path"/>
> @@ -390,7 +423,7 @@
> </available>
> </target>
>
> -
> +
>
> <!-- Get the jars from the Beanshell project. -->
> <!-- For licensing reasons, we are unable to put these Jars in our CVS or source distributions. -->
> @@ -401,7 +434,7 @@
> dest="${repo.dir}/beanshell/bsh-1.2b7.jar"
> verbose="true"
> usetimestamp="true"/>
> - </target>
> + </target>
>
> <!-- Prepares the build directory -->
> <target name="prepare" depends="check-environment">
> @@ -742,6 +775,7 @@
>
> <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"/>
>
> @@ -927,7 +961,7 @@
> <delete file="${dist.base}/${dist.name}-src.tar"/>
> <delete dir="${dist.name}"/>
> </target>
> -
> +
> <target name="dist-bin" depends="dist-src">
> <mkdir dir="${dist.base}"/>
> <delete dir="${dist.name}"/>
> @@ -972,43 +1006,43 @@
>
> <!-- Do not delete the temp dir yet as it is needed by the platform specific builds. -->
> </target>
> -
> +
> <target name="dist-wrapper-windows" depends="dist-bin, check-wrapper" if="wrapper.present.Windows">
> <copy todir="${dist.name.wrapper}">
> <fileset dir="${dist.name}"/>
> </copy>
> -
> +
> <copy file="${repo.dir}/wrapper/bin/Wrapper.exe" todir="${dist.name.wrapper}/bin"/>
> <copy file="${repo.dir}/wrapper/bin/Wrapper.dll" todir="${dist.name.wrapper}/bin"/>
> <copy file="${wrapper.jar}" todir="${dist.name.wrapper}/bin"/>
> <copy file="${conf.dir}/wrapper.conf" todir="${dist.name.wrapper}/conf"/>
> -
> +
> <copy file="${repo.dir}/wrapper/bin/${Name}.bat" todir="${dist.name.wrapper}/bin"/>
> <copy file="${repo.dir}/wrapper/bin/Install${Name}-NT.bat" todir="${dist.name.wrapper}/bin"/>
> <copy file="${repo.dir}/wrapper/bin/Uninstall${Name}-NT.bat" todir="${dist.name.wrapper}/bin"/>
> -
> +
> <zip zipfile="${dist.base}/${dist.name.wrapper}-bin.zip">
> <fileset dir="${dist.name.wrapper}/..">
> <include name="${dist.name.wrapper}/**"/>
> <exclude name="${dist.name.wrapper}/lib/bsh*.jar"/>
> </fileset>
> </zip>
> -
> +
> <delete dir="${dist.name.wrapper}"/>
> </target>
> <target name="dist-wrapper-unix" depends="dist-bin, check-wrapper" if="wrapper.present.Unix">
> <copy todir="${dist.name.wrapper}">
> <fileset dir="${dist.name}"/>
> </copy>
> -
> +
> <copy file="${repo.dir}/wrapper/bin/wrapper" todir="${dist.name.wrapper}/bin"/>
> <copy file="${repo.dir}/wrapper/bin/realpath" todir="${dist.name.wrapper}/bin"/>
> <copy file="${repo.dir}/wrapper/bin/libwrapper.so" todir="${dist.name.wrapper}/bin"/>
> <copy file="${wrapper.jar}" todir="${dist.name.wrapper}/bin"/>
> <copy file="${conf.dir}/wrapper.conf" todir="${dist.name.wrapper}/conf"/>
> -
> +
> <copy file="${phoenix-wrapper.sh}" tofile="${dist.name.wrapper}/bin/${name}-wrapper.sh"/>
> -
> +
> <tar longfile="gnu" tarfile="${dist.base}/${dist.name.wrapper}-bin.tar">
> <tarfileset dir="${dist.name.wrapper}/.." mode="755" username="avalon" group="avalon">
> <include name="${dist.name.wrapper}/bin/*.sh"/>
> @@ -1032,7 +1066,7 @@
> </target>
> <target name="dist" depends="dist-wrapper-windows, dist-wrapper-unix"
> description="generates the Phoenix distribution (src, bin, and bin with wrapper)">
> -
> +
> <delete dir="${dist.name}"/>
> </target>
>
>
>
>
> 1.22 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java
>
> Index: CLISetup.java
> ===================================================================
> RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -r1.21 -r1.22
> --- CLISetup.java 22 Feb 2003 05:34:46 -0000 1.21
> +++ CLISetup.java 12 Mar 2003 13:01:38 -0000 1.22
> @@ -8,14 +8,14 @@
> package org.apache.avalon.phoenix.frontends;
>
> import java.util.List;
> -import org.apache.avalon.excalibur.cli.CLArgsParser;
> -import org.apache.avalon.excalibur.cli.CLOption;
> -import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
> -import org.apache.avalon.excalibur.cli.CLUtil;
> import org.apache.avalon.excalibur.i18n.ResourceManager;
> import org.apache.avalon.excalibur.i18n.Resources;
> import org.apache.avalon.framework.parameters.Parameters;
> import org.apache.avalon.phoenix.interfaces.SystemManager;
> +import org.realityforge.cli.CLArgsParser;
> +import org.realityforge.cli.CLOption;
> +import org.realityforge.cli.CLOptionDescriptor;
> +import org.realityforge.cli.CLUtil;
>
> /**
> * The class prepare parameters based on input options.
>
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
>For additional commands, e-mail: cvs-help@avalon.apache.org
>
>
>
>
>
--
Stephen J. McConnell
mailto:mcconnell@apache.org
http://www.osm.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org