build build.sh build.xml

jules_gosnell Mon, 30 Apr 2001 15:27:15 -0700
  User: jules_gosnell
  Date: 01/04/30 15:44:49

  Modified:    jetty/src/build build.sh build.xml
  Log:
  integrate Jetty's new JMX support
  begin working on support for ejb-ref
  
  Revision  Changes    Path
  1.2       +36 -13    contrib/jetty/src/build/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh  2000/11/10 01:10:12     1.1
  +++ build.sh  2001/04/30 22:44:49     1.2
  @@ -1,17 +1,40 @@
   #! /bin/sh
  -# $Id: build.sh,v 1.1 2000/11/10 01:10:12 jules Exp $
  +# $Id: build.sh,v 1.2 2001/04/30 22:44:49 jules_gosnell Exp $
   
  -ABORT=0
  -if [ "X${JBOSS_HOME}" = "X" ] ; then echo "JBOSS_HOME is not set. You need jboss 
2.0PR3+" ; ABORT=1 ; fi
  -if [ "X${JETTY_HOME}" = "X" ] ; then echo "JETTY_HOME is not set. You need jetty 
3.0.0-rc5" ; ABORT=1 ; fi
  -if [ $ABORT = 1 ] ; then echo "Aborting..." ; exit ; fi
  +#!/bin/sh
  +if [ ! -f "$JBOSS_HOME/bin/run.jar" ]
  +then
  +    echo $JBOSS_HOME/bin/run.jar does not exist
  +    echo set JBOSS_HOME to the JBoss dist directory
  +    exit 1
  +fi
   
  -TARGET_CLASSPATH=../../../tomcat/lib/ant.jar:\
  -../../../tomcat/lib/xml.jar:\
  -../../build/classes:\
  -../../../tomcat/lib/javac.jar
  +if [ ! -f "$JETTY_HOME/lib/com.mortbay.jetty.jar" ]
  +then
  +    echo $JETTY_HOME/lib/com.mortbay.jetty.jar does not exist
  +    echo set JETTY_HOME to your Jetty3 directory
  +    exit 1
  +fi
   
  -java -classpath $TARGET_CLASSPATH \
  -     -Djetty.home=$JETTY_HOME \
  -     -Djboss.home=$JBOSS_HOME \
  -     org.apache.tools.ant.Main $*
  +if [ ! -f "$JETTY_EXTRA/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
  +    exit 1
  +fi
  +
  +CLASSPATH=
  +CLASSPATH=$CLASSPATH:../../build/classes
  +CLASSPATH=$CLASSPATH:../../../tomcat/lib/ant.jar
  +CLASSPATH=$CLASSPATH:../../../tomcat/lib/javac.jar
  +CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/crimson.jar
  +CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jaxp.jar
  +CLASSPATH=$CLASSPATH:$JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar
  +
  +exec java\
  +    -Djboss.home="$JBOSS_HOME"\
  +    -Djetty.home="$JETTY_HOME"\
  +    -Djetty.extra="$JETTY_EXTRA"\
  +    -classpath "$CLASSPATH"\
  +    org.apache.tools.ant.Main\
  +    $*
  
  
  
  1.4       +100 -3    contrib/jetty/src/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 2000/11/15 22:35:25     1.3
  +++ build.xml 2001/04/30 22:44:49     1.4
  @@ -1,12 +1,12 @@
   <?xml version="1.0"?>
  -<!-- $Id: build.xml,v 1.3 2000/11/15 22:35:25 jules Exp $ -->
  +<!-- $Id: build.xml,v 1.4 2001/04/30 22:44:49 jules_gosnell Exp $ -->
   
   
   <!-- ======================================================================= -->
   <!-- jetty contrib build file                                               -->
   <!-- ======================================================================= -->
   
  -<project name="jetty-service" default="jar" basedir="../.." verbose="true">
  +<project name="jetty-service" default="jar" basedir="../..">
     <target name="init">
   
       <property name="Name" value="jetty-service"/>
  @@ -26,6 +26,10 @@
        <property name="test.client" value="tomcat-test"/>
   
       <property name="build.compiler" value="classic"/>
  +
  +    <echo message="jboss.home=${jboss.home}" />
  +    <echo message="jetty.home=${jetty.home}" />
  +    <echo message="classpath=${classpath}" />
     </target>
   
   
  @@ -34,7 +38,7 @@
     <!-- =================================================================== -->
     <target name="prepare" depends="init">
       <mkdir dir="${build.dir}"/>
  -    <copyfile src="${src.resources}/jboss-web.dtd" 
dest="${build.classes.dir}/jboss-web.dtd"/>
  +    <copy file="${src.resources}/jboss-web.dtd" 
tofile="${build.classes.dir}/jboss-web.dtd"/>
     </target>
   
   
  @@ -119,4 +123,97 @@
             
includes="${test.client}.jar,${test.client}.war,client.jar,META-INF/application.xml"
        />
     </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- builds a JBoss-Jetty distribution                                   -->
  +  <!-- =================================================================== -->
  +
  +  <target name="dist" depends="init">
  +
  +    <property name="dist.dir" value="${basedir}/dist"/>
  +
  +    <delete dir="${dist.dir}"/>
  +    <mkdir  dir="${dist.dir}"/>
  +
  +    <echo message="copying JBoss from ${jboss.home} to ${dist.dir}/jboss" />
  +    <copy todir="${dist.dir}/jboss"><fileset dir="${jboss.home}"/></copy>
  +    <echo message="copying Jetty from ${jetty.home} to ${dist.dir}/jetty" />
  +    <copy todir="${dist.dir}/jetty"><fileset dir="${jetty.home}"/></copy>
  +    <echo message="copying Jetty Extra from ${jetty.extra} to ${dist.dir}/extra" />
  +    <copy todir="${dist.dir}/extra"><fileset dir="${jetty.extra}"/></copy>
  +
  +    <property name="cfg.src" value="${jboss.home}/conf/default"/>
  +    <property name="cfg.tgt" value="${dist.dir}/jboss/conf/jetty"/>
  +
  +    <property name="conf.src" value="${cfg.src}/jboss.conf"/>
  +    <property name="conf.tgt" value="${cfg.tgt}/jboss.conf"/>
  +
  +    <property name="jcml.src" value="${cfg.src}/jboss.jcml"/>
  +    <property name="jcml.tgt" value="${cfg.tgt}/jboss.jcml"/>
  +
  +    <delete dir="${cfg.tgt}"/>
  +
  +    <echo message="setting up conf directory ${cfg.tgt}" />
  +    <copy todir="${cfg.tgt}">
  +     <fileset dir="${cfg.src}">
  +      <exclude name="**/jetty.xml"/>
  +      <exclude name="**/jetty.properties"/>
  +     </fileset>
  +    </copy>
  +
  +    <echo message="adding ${basedir}/etc/jetty.xml to ${cfg.tgt}" />
  +    <copy todir="${cfg.tgt}" file="${basedir}/etc/jetty.xml"/>
  +    <echo message="adding ${basedir}/jetty.properties to ${cfg.tgt}" />
  +    <copy todir="${cfg.tgt}" file="${basedir}/etc/jetty.properties"/>
  +
  +  <echo>
  +Adding Jetty MLET to jboss.conf
  +  </echo>
  +
  +  <echo append="true" file="${conf.tgt}">
  +&lt;MLET CODE="org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar" 
CODEBASE="../../lib/ext/"&gt;
  + &lt;ARG TYPE="java.lang.String" VALUE="../../../jetty/lib/"&gt;
  + &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="JettyJMX"&gt;
  +&lt;/MLET&gt;
  +  </echo>
  +
  +  <echo>
  +Setting Jetty as WAR Deployer
  +  </echo>
  +
  +  <replace
  +     file="${jcml.tgt}"
  +     token="service=EmbeddedTomcat"
  +     value="service=Jetty"
  +     />
  +
  +  <echo>
  +Adding Jetty mbean to jboss.jcml
  +  </echo>
  +
  +  <replace
  +     file="${jcml.tgt}"
  +     token="&lt;/server&gt;"
  +     >
  +   <replacevalue>
  + &lt;mbean code="org.jboss.jetty.JettyService" 
name="DefaultDomain:service=Jetty"&gt;
  +  &lt;attribute 
name="Configuration"&gt;file:../conf/jetty/jetty.xml&lt;/attribute&gt;
  + &lt;/mbean&gt;
  +
  +&lt;/server&gt;
  +   </replacevalue>
  +
  +  </replace>
  +
  +  <antcall target="install">
  +    <param name="jboss.home" value="${dist.dir}/jboss"/>
  +    <param name="jetty.home" value="${dist.dir}/jetty"/>
  +  </antcall>
  +
  +  </target>
  +
   </project>
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/build build.sh build.xml

Reply via email to
