User: jules_gosnell
  Date: 01/09/10 16:52:05

  Modified:    jetty/src/build build.xml
  Log:
  jetty repackaging and build script fixes
  
  Revision  Changes    Path
  1.13      +12 -9     contrib/jetty/src/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 2001/08/30 03:12:52     1.12
  +++ build.xml 2001/09/10 23:52:05     1.13
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: build.xml,v 1.12 2001/08/30 03:12:52 mnf999 Exp $ -->
  +<!-- $Id: build.xml,v 1.13 2001/09/10 23:52:05 jules_gosnell Exp $ -->
   
   
   <!-- ======================================================================= -->
  @@ -20,7 +20,7 @@
       <property name="build.dir" value="${basedir}/build"/>
       <property name="build.classes.dir" value="${build.dir}/classes"/>
   
  -    <property name="classpath" 
value="${lib.dir}/xml.jar;${jboss.home}/lib/jmxri.jar;${jboss.home}/lib/ext/log4j.jar;${jboss.home}/lib/ext/jboss.jar;${jboss.home}/lib/ext/ejb.jar;${build.classes.dir};${jetty.home}/lib/javax.servlet.jar;${jetty.home}/lib/org.apache.jasper.jar;${jetty.home}/lib/com.sun.net.ssl.jar;${jetty.home}/lib/com.mortbay.jetty.jar"/>
  +    <property name="classpath" 
value="${lib.dir}/xml.jar;${jboss.home}/lib/jmxri.jar;${jboss.home}/lib/jboss-jaas.jar;${jboss.home}/lib/ext/log4j.jar;${jboss.home}/lib/ext/jboss.jar;${jboss.home}/lib/ext/ejb.jar;${build.classes.dir};${jetty.home}/lib/javax.servlet.jar;${jetty.home}/lib/org.apache.jasper.jar;${jetty.home}/lib/com.sun.net.ssl.jar;${jetty.home}/lib/org.mortbay.jetty.jar;${jetty.jmx}/lib/org.mortbay.jetty.jmx.jar"/>
   
        <property name="jar.file" value="${name}.jar"/>
        <property name="test.client" value="tomcat-test"/>
  @@ -29,6 +29,7 @@
   
       <echo message="jboss.home=${jboss.home}" />
       <echo message="jetty.home=${jetty.home}" />
  +    <echo message="jetty.jmx=${jetty.jmx}" />
       <echo message="classpath=${classpath}" />
     </target>
   
  @@ -38,7 +39,9 @@
     <!-- =================================================================== -->
     <target name="prepare" depends="init">
       <mkdir dir="${build.dir}"/>
  +<!--
       <copy file="${src.resources}/jboss-web.dtd" 
tofile="${build.classes.dir}/jboss-web.dtd"/>
  + -->
     </target>
   
   
  @@ -169,14 +172,14 @@
        </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 message="adding ${basedir}/src/etc/jetty.xml to ${cfg.tgt}" />
  +    <copy todir="${cfg.tgt}" file="${basedir}/src/etc/jetty.xml"/>
  +    <echo message="adding ${basedir}/src/jetty.properties to ${cfg.tgt}" />
  +    <copy todir="${cfg.tgt}" file="${basedir}/src/etc/jetty.properties"/>
       <echo message="installing README file" />
  -    <copy todir="${dist.dir}" file="${basedir}/etc/README"/>
  +    <copy todir="${dist.dir}" file="${basedir}/src/etc/README"/>
       <echo message="installing VERSION file" />
  -    <copy todir="${dist.dir}" file="${basedir}/etc/VERSION"/>
  +    <copy todir="${dist.dir}" file="${basedir}/src/etc/VERSION"/>
   
     <echo>
   Adding Jetty MLET to jboss.conf
  @@ -233,7 +236,7 @@
     <echo>
   Adding run script
     </echo>
  -   <copy todir="${dist.dir}" file="${basedir}/etc/run.sh"/>
  +   <copy todir="${dist.dir}" file="${basedir}/src/bin/run.sh"/>
      <chmod file="${dist.dir}/run.sh" perm="ugo+rx"/>
   
     </target>
  
  
  

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

Reply via email to