[JBoss-dev] CVS update: contrib/jetty/src/build build.sh build.xml

[Jules Gosnell]

  User: jules_gosnell
  Date: 01/07/24 17:08:01

  Modified:    jetty/src/build build.sh build.xml
  Log:
  upgrade to latest versions of JBoss and Jetty for new release
  only include JMX support from Jetty3Extra to cut down on release size
  
  Revision  Changes    Path
  1.5       +6 -6      contrib/jetty/src/build/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/build.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.sh  2001/06/10 21:34:22     1.4
  +++ build.sh  2001/07/25 00:08:00     1.5
  @@ -1,5 +1,5 @@
   #! /bin/sh
  -# $Id: build.sh,v 1.4 2001/06/10 21:34:22 jules_gosnell Exp $
  +# $Id: build.sh,v 1.5 2001/07/25 00:08:00 jules_gosnell Exp $
   
   if [ ! -f "$JBOSS_HOME/bin/run.jar" ]
   then
  @@ -15,10 +15,10 @@
       exit 1
   fi
   
  -if [ ! -f "$JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar" ]
  +if [ ! -f "$JETTY_JMX/lib/com.mortbay.jetty.jmx.jar" ]
   then
  -    echo $JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar does not exist
  -    echo set JETTY_EXTRA to your Jetty3Extra directory
  +    echo $JETTY_JMX/lib/com.mortbay.jetty.jmx.jar does not exist
  +    echo set JETTY_JMX to your Jetty3Extra/jmx directory
       exit 1
   fi
   
  @@ -30,12 +30,12 @@
   CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jaxp.jar
   CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jboss-jaas.jar
   CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/ext/jbosssx.jar
  -CLASSPATH=$CLASSPATH:$JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar
  +CLASSPATH=$CLASSPATH:$JETTY_JMX/lib/com.mortbay.jetty.jmx.jar
   
   exec java\
       -Djboss.home="$JBOSS_HOME"\
       -Djetty.home="$JETTY_HOME"\
  -    -Djetty.extra="$JETTY_EXTRA"\
  +    -Djetty.jmx="$JETTY_JMX"\
       -classpath "$CLASSPATH"\
       org.apache.tools.ant.Main\
       $*
  
  
  
  1.10      +4 -4      contrib/jetty/src/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml 2001/07/08 10:39:10     1.9
  +++ build.xml 2001/07/25 00:08:00     1.10
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: build.xml,v 1.9 2001/07/08 10:39:10 jules_gosnell Exp $ -->
  +<!-- $Id: build.xml,v 1.10 2001/07/25 00:08:00 jules_gosnell Exp $ -->
   
   
   <!-- ======================================================================= -->
  @@ -145,8 +145,8 @@
       <echo message="copying Jetty from ${jetty.home} to ${dist.dir}/jetty" />
       <copy todir="${dist.dir}/jetty"><fileset dir="${jetty.home}"/></copy>
       <chmod file="${dist.dir}/jetty/cgi-bin/env.sh" perm="+x"/>
  -    <echo message="copying Jetty Extra from ${jetty.extra} to ${dist.dir}/extra" />
  -    <copy todir="${dist.dir}/extra"><fileset dir="${jetty.extra}"/></copy>
  +    <echo message="copying Jetty JMX from ${jetty.jmx} to ${dist.dir}/jetty-jmx" />
  +    <copy todir="${dist.dir}/jetty-jmx"><fileset dir="${jetty.jmx}"/></copy>
   
       <property name="cfg.src" value="${jboss.home}/conf/default"/>
       <property name="cfg.tgt" value="${dist.dir}/jboss/conf/jetty"/>
  @@ -184,7 +184,7 @@
    &lt;ARG TYPE="java.lang.String" VALUE="Jetty"&gt;
   &lt;/MLET&gt;
   &lt;MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar" 
CODEBASE="../../lib/ext/"&gt;
  -  &lt;ARG TYPE="java.lang.String" VALUE="../../../extra/jmx/lib/"&gt;
  +  &lt;ARG TYPE="java.lang.String" VALUE="../../../jetty-jmx/lib/"&gt;
     &lt;ARG TYPE="java.lang.String" VALUE="JettyJMX"&gt;
   &lt;/MLET&gt;
     </echo>
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development