Hi Martin, On Fri, Oct 10, 2008 at 1:59 PM, Martin Ritchie <[EMAIL PROTECTED]> wrote:
> Hi Rafi, > > It would be good if you could update our Notice/License files for the > addition of jline. done. Lahiru > > > Cheers > > Martin > > 2008/10/9 <[EMAIL PROTECTED]>: > > Author: rhs > > Date: Thu Oct 9 14:17:17 2008 > > New Revision: 703262 > > > > URL: http://svn.apache.org/viewvc?rev=703262&view=rev > > Log: > > QPID-1342: fixed qpid-cli build and shell scripts; tests still don't run > properly by default since the expect the java broker to be running > > > > Added: > > incubator/qpid/trunk/qpid/java/lib/jline-0.9.94.jar (with props) > > incubator/qpid/trunk/qpid/java/lib/junit-4.4.jar (with props) > > Removed: > > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/lib/ > > Modified: > > incubator/qpid/trunk/qpid/java/build.deps > > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli > > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml > > > > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java > > incubator/qpid/trunk/qpid/java/module.xml > > > > Modified: incubator/qpid/trunk/qpid/java/build.deps > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.deps?rev=703262&r1=703261&r2=703262&view=diff > > > ============================================================================== > > --- incubator/qpid/trunk/qpid/java/build.deps (original) > > +++ incubator/qpid/trunk/qpid/java/build.deps Thu Oct 9 14:17:17 2008 > > @@ -10,6 +10,9 @@ > > geronimo-jms=lib/geronimo-jms_1.1_spec-1.0.jar > > > > junit=lib/junit-3.8.1.jar > > +junit4=lib/junit-4.4.jar > > + > > +jline=lib/jline-0.9.94.jar > > > > log4j=lib/log4j-1.2.12.jar > > > > @@ -29,8 +32,8 @@ > > > > common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \ > > ${mina-filter-ssl} ${commons-codec} ${commons-lang} > ${commons-collections} \ > > - ${commons-configuration} > > -client.libs=${common.libs} ${geronimo-jms} > > + ${commons-configuration} > > +client.libs=${common.libs} ${geronimo-jms} > > tools.libs=${client.libs} > > broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \ > > ${slf4j-log4j} ${xalan} ${felix.libs} ${build.lib}/${project.name > }-common-${project.version}.jar > > @@ -72,6 +75,7 @@ > > ${ecl-core-runtime-compat-registry} ${ecl-equinox-common} \ > > ${ecl-equinox-prefs} ${ecl-equinox-registry} ${ecl-help} ${ecl-osgi} > \ > > ${ecl-swt} ${ecl-swt-win32} ${ecl-ui} ${ecl-ui-forms} > ${ecl-ui-workbench} > > +management-tools-qpid-cli.libs=${common.libs} ${jline} > > > > common.test.libs=${test.libs} > > broker.test.libs=${test.libs} > > @@ -81,3 +85,4 @@ > > testkit.test.libs=${test.libs} > > management-eclipse-plugin.test.libs=${systests.libs} > > broker-plugins.test.libs=${test.libs} > > +management-tools-qpid-cli.test.libs=${junit4} ${slf4j-log4j} ${log4j} > ${client.libs} > > > > Added: incubator/qpid/trunk/qpid/java/lib/jline-0.9.94.jar > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/jline-0.9.94.jar?rev=703262&view=auto > > > ============================================================================== > > Binary file - no diff available. > > > > Propchange: incubator/qpid/trunk/qpid/java/lib/jline-0.9.94.jar > > > ------------------------------------------------------------------------------ > > svn:mime-type = application/octet-stream > > > > Added: incubator/qpid/trunk/qpid/java/lib/junit-4.4.jar > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/junit-4.4.jar?rev=703262&view=auto > > > ============================================================================== > > Binary file - no diff available. > > > > Propchange: incubator/qpid/trunk/qpid/java/lib/junit-4.4.jar > > > ------------------------------------------------------------------------------ > > svn:mime-type = application/octet-stream > > > > Modified: > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli?rev=703262&r1=703261&r2=703262&view=diff > > > ============================================================================== > > --- incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli > (original) > > +++ incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli > Thu Oct 9 14:17:17 2008 > > @@ -17,21 +17,19 @@ > > # specific language governing permissions and limitations > > # under the License. > > # > > -# set classpath to using jar files > > -for f in $QPID_HOME/lib/*.jar > > -do > > - CLASSPATH=$CLASSPATH:$f > > -done > > -export CLASSPATH > > - > > - > > - > > -export > CLASSPATH=$CLASSPATH:$QPID_HOME/management/tools/qpid-cli/main/classes/ > > - > > - > > - > > - > > -java -classpath $CLASSPATH org.apache.qpid.CommandLineInterpreter $@ > > - > > > > +if [ -z "$QPID_HOME" ]; then > > + export QPID_HOME=$(dirname $(dirname $(readlink -f $0))) > > + export PATH=${PATH}:${QPID_HOME}/bin > > +fi > > + > > +# Set classpath to include Qpid jar with all required jars in manifest > > +QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar > > + > > +# Set other variables used by the qpid-run script before calling > > +export JAVA=java \ > > + JAVA_VM=-server \ > > + JAVA_MEM=-Xmx1024m \ > > + QPID_CLASSPATH=$QPID_LIBS > > > > +. qpid-run org.apache.qpid.CommandLineInterpreter "$@" > > > > Modified: > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml?rev=703262&r1=703261&r2=703262&view=diff > > > ============================================================================== > > --- incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml > (original) > > +++ incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml > Thu Oct 9 14:17:17 2008 > > @@ -18,81 +18,13 @@ > > - under the License. > > - > > --> > > -<project name="lahirugsoc2008"> > > - <import file="../../../module.xml"/> > > - <property name="module.depends" value="common"/> > > - <property name="src.dir" value="src"/> > > - <property name="build.dir" value="${module.build}"/> > > - <property name="build.src.dir" value="${build.dir}/main/"/> > > - <property name="build.test.dir" value="${build.dir}/test/"/> > > - <property name="build.src.classes.dir" > value="${build.src.dir}/classes"/> > > - <property name="build.test.classes.dir" > value="${build.test.dir}/classes"/> > > - <property name="jar.dir" value="${build.dir}/jar"/> > > - <property name="lib.dir" value="lib"/> > > - <property name="test.dir" value="test"/> > > - <property name="dependency1" value="jline-0.9.94.jar"/> > > - <property name="dependency2" value="junit-4.4.jar"/> > > - <property name="project.name" value="qpid-cli"/> > > - <property name="project.version" value="1.0"/> > > - <property name="target.name" value="${project.name > }-${project.version}.jar"/> > > - <property name="target.jar" location="${jar.dir}/${target.name}"/> > > - <property name="build.failed" > location="${build.test.dir}/results/FAILED"/> > > - <property name="test.suite" value="org.apache.qpid.AllTest"/> > > - <property name="test.report.dir" value="${build.test.dir}/reports"/> > > - <target name="init"> > > - <mkdir dir="${build.src.classes.dir}" /> > > - <mkdir dir="${build.test.classes.dir}"/> > > - <mkdir dir="${jar.dir}"/> > > - <copy file="lib/${dependency1}" todir="${project.root}/lib"/> > > - <copy file="lib/${dependency2}" todir="${project.root}/lib"/> > > - <copy file="bin/qpid-cli" todir="${project.root}/bin"/> > > - <copy file="bin/qpid-cli.bat" todir="${project.root}/bin"/> > > - </target> > > - <target name="clean"> > > - <delete dir="${build.src.dir}"/> > > - <delete dir="${build.test.dir}"/> > > - <delete dir="${jar.dir}"/> > > - </target> > > - <target name="compile" depends="init"> > > - <javac srcdir="${src.dir}" > > - destdir="${build.src.classes.dir}"> > > - <classpath> > > - <pathelement path="${lib.dir}/${dependency1}"/> > > - </classpath> > > - </javac> > > - </target> > > - <target name="compile-tests" depends="compile"> > > - <javac srcdir="${test.dir}" > > - destdir="${build.test.classes.dir}" > > - debug="true" > > - includeAntRuntime="true"> > > - <classpath> > > - <pathelement path="${lib.dir}/${dependency2}"/> > > - <pathelement path="${build.src.classes.dir}"/> > > - </classpath> > > - </javac> > > - </target> > > - <target name="jar" depends="compile"> > > - <jar destfile="${target.jar}" duplicate="preserve" > > - compress="true"> > > - <fileset dir="${build.src.classes.dir}"/> > > - </jar> > > - </target> > > - <target name="test" depends="compile-tests"> > > - <junit printsummary="true"> > > - <classpath> > > - <pathelement path="${build.test.classes.dir}"/> > > - <pathelement path="${build.src.classes.dir}"/> > > - <pathelement path="${lib.dir}/${dependency2}"/> > > - </classpath> > > - <formatter type="brief" usefile="false"/> > > - <test name="${test.suite}"/> > > - </junit> > > - </target> > > -</project> > > - > > - > > - > > +<project name="qpid-cli"> > > > > + <property name="module.depends" value="common" /> > > + <property name="module.test.depends" value="common client" /> > > + <property name="module.src" value="src" /> > > + <property name="module.test.src" value="test" /> > > > > + <import file="../../../module.xml"/> > > > > +</project> > > > > Modified: > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java?rev=703262&r1=703261&r2=703262&view=diff > > > ============================================================================== > > --- > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java > (original) > > +++ > incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java > Thu Oct 9 14:17:17 2008 > > @@ -64,8 +64,7 @@ > > mbsc = jmxc.getMBeanServerConnection(); > > > > } catch (IOException e) { > > - e.printStackTrace(); > > - return null; //To change body of catch statement use File | > Settings | File Templates. > > + throw new RuntimeException(e); > > } > > return new Connector(url, jmxc, mbsc); > > } > > > > Modified: incubator/qpid/trunk/qpid/java/module.xml > > URL: > http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=703262&r1=703261&r2=703262&view=diff > > > ============================================================================== > > --- incubator/qpid/trunk/qpid/java/module.xml (original) > > +++ incubator/qpid/trunk/qpid/java/module.xml Thu Oct 9 14:17:17 2008 > > @@ -321,7 +321,7 @@ > > > > <target name="libs" description="copy dependencies into build tree"> > > <copy todir="${build.lib}" failonerror="false" flatten="true"> > > - <fileset dir="${basedir}${file.separator}.." > includes="${module.libs}"/> > > + <fileset dir="${project.root}" includes="${module.libs}"/> > > </copy> > > </target> > > > > > > > > > > > > -- > Martin Ritchie >
