[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] contrib/jetty build.xml
From:       Jules Gosnell <jules_gosnell () users ! sourceforge ! net>
Date:       2003-05-31 8:24:54
[Download RAW message or body]

  User: jules_gosnell
  Date: 03/05/31 01:24:54

  Modified:    jetty    build.xml
  Log:
  Jetty now generates MANIFEST.MFs dynamically during build - no longer hardwired
  
  Revision  Changes    Path
  1.87      +42 -32    contrib/jetty/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/build.xml,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- build.xml	17 May 2003 22:53:19 -0000	1.86
  +++ build.xml	31 May 2003 08:24:54 -0000	1.87
  @@ -107,6 +107,9 @@
   
       <property name="RELEASE.MAJOR"  value="4.2"/>
       <property name="RELEASE.MAJOR.MINOR"  value="4.2.10pre0+"/>
  +<!--
  +    <property name="javac.excludes" value="org/mortbay/util/LoggerLogSink.java"/>
  +-->
   
       <!-- Jetty -->
       <property name="module.ext" value="${module.root}/ext"/>
  @@ -140,31 +143,14 @@
       <!-- these are for Jetty jars -->
       <copy todir="${build.classes}">
         <fileset dir="${source.java}">
  +<!--
  +        <exclude name="org/mortbay/util/LoggerLogSink.java"/>
  +-->
            <include name="**/*.properties"/>
            <include name="**/*.dtd"/>
            <include name="**/*.xml"/>
         </fileset>
       </copy>
  -
  -    <copy todir="${build.classes}">
  -      <fileset dir="${source.java}">
  -        <include name="**/MANIFEST.MF" />
  -      </fileset>
  -    </copy>
  -
  -    <replace dir="${build.classes}">
  -      <include name="**/MANIFEST.MF" />
  -      <replacefilter token="RELEASE_MAJOR_MINOR" value="${RELEASE.MAJOR.MINOR}" />
  -      <replacefilter token="RELEASE_MAJOR" value="${RELEASE.MAJOR}" />
  -      <replacefilter token="Class-Path" value="MortBay-StandAlone-ClassPath" />
  -    </replace>
  -
  -    <!-- lose this once the new manifests are rolled into HEAD -->
  -    <touch file="${build.classes}/org/mortbay/jetty/MANIFEST.MF"/>
  -    <touch file="${build.classes}/org/mortbay/util/jmx/MANIFEST.MF"/>
  -    <touch file="${build.classes}/org/mortbay/j2ee/MANIFEST.MF"/>
  -    <touch file="${build.classes}/org/mortbay/j2ee/session/ejb/MANIFEST.MF"/>
  -
     </target>
   
     <!-- Compile EJB with XDoclet -->
  @@ -251,32 +237,58 @@
           <include name="javax/servlet/**"/>
         </fileset>
       </jar>
  -    <jar jarfile="${build.lib}/${jetty.jar}"
  -         manifest="${build.classes}/org/mortbay/jetty/MANIFEST.MF">
  +    <jar jarfile="${build.lib}/${jetty.jar}">
  +       <manifest>
  +         <attribute name="Sealed" value="true"/>
  +         <attribute name="Built-By" value="${user.name}"/>
  +         <attribute name="Specification-Version" value="${RELEASE.MAJOR}"/>
  +         <attribute name="Implementation-Version" value="${RELEASE.MAJOR.MINOR}"/>
  +         <attribute name="Package-Title" value="org.mortbay.http"/>
  +         <attribute name="Implementation-Vendor" value="Mort Bay Consulting, Pty. \
Ltd."/>  +         <attribute name="Implementation-URL" \
value="http://jetty.mortbay.org"/>  +         <attribute name="Main-Class" \
value="org.mortbay.http.HttpServer"/>  +
  +         <section name="org/mortbay/jetty/">
  +           <attribute name="Specification-Title" value="Servlet/2.3"/>
  +           <attribute name="Implementation-Title" value="Jetty/${RELEASE.MAJOR}"/>
  +         </section>
  +
  +         <section name="org/mortbay/http/">
  +           <attribute name="Implementation-Title" value="Mort Bay HTTP Server"/>
  +         </section>
  +
  +         <section name="org/mortbay/util/">
  +           <attribute name="Implementation-Title" value="Mort Bay Misc. \
Utilities"/>  +         </section>
  +
  +       </manifest>
         <fileset dir="${build.classes}">
          <include name="org/mortbay/**"/>
  +       <exclude name="org/mortbay/start/**" />
          <exclude name="**/jmx/**" />
          <exclude name="org/mortbay/j2ee/**"/>
  -       <exclude name="**/MANIFEST.MF" />
  +       <exclude name="**/webdefault.xml" />
         </fileset>
       </jar>
  -    <jar jarfile="${build.lib}/${jmx.jar}"
  -         manifest="${build.classes}/org/mortbay/util/jmx/MANIFEST.MF">
  +    <jar jarfile="${build.lib}/${jmx.jar}">
  +       <manifest>
  +         <attribute name="Main-Class" value="org.mortbay.util.jmx.Main"/>
  +<!--
  +         <attribute name="Class-Path" value="org.mortbay.jetty.jar \
org.mortbay.jetty.jar ../ext/jmxri.jar ../ext/jmxtools.jar"/>  +-->
  +       </manifest>
         <fileset dir="${build.classes}">
          <include name="org/mortbay/**/jmx/**"/>
  -       <exclude name="**/MANIFEST.MF" />
         </fileset>
       </jar>
   
  -    <jar jarfile="${build.lib}/${j2ee.jar}"
  -         manifest="${build.classes}/org/mortbay/j2ee/MANIFEST.MF">
  +    <jar jarfile="${build.lib}/${j2ee.jar}">
         <fileset dir="${build.classes}">
          <include name="org/mortbay/j2ee/**"/>
   <!--
          <exclude name="org/mortbay/j2ee/session/interfaces/**" />
   -->
          <exclude name="org/mortbay/j2ee/session/ejb/**" />
  -       <exclude name="**/MANIFEST.MF" />
         </fileset>
       </jar>
       <!-- Build ${jboss.jetty.jar} -->
  @@ -286,14 +298,12 @@
         </fileset>
       </jar>
       <!-- Build ${jetty.ejb.jar} -->
  -    <jar jarfile="${build.lib}/${jetty.ejb.jar}"
  -         manifest="${build.classes}/org/mortbay/j2ee/session/ejb/MANIFEST.MF">
  +    <jar jarfile="${build.lib}/${jetty.ejb.jar}">
         <fileset dir="${build.classes}">
           <include name="org/mortbay/j2ee/session/ejb/*.class"/>
   <!--
           <include name="org/mortbay/j2ee/session/interfaces/*.class"/>
   -->
  -        <exclude name="**/MANIFEST.MF" />
         </fileset>
         <fileset dir="${module.output}">
           <include name="META-INF/*.xml"/>
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits


[prev in list] [next in list] [prev in thread] [next in thread]