Changeset 4045785


Ignore:
Timestamp:
Jan 14, 2012 10:20:39 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6198739
Parents:
fd6fcda
Message:

bundle jmx

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rfd6fcda r4045785  
    8686              glassfish 2.1: Not used, too old, see Tomcat below.
    8787              jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
     88              jetty-management: Not used by I2P, but only 34KB and could be useful for eepsites, and we bundled it with Jetty 5
    8889              All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
    8990        -->
     
    9495        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
    9596        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
     97        <copy preservelastmodified="true" file="${jetty.base}/lib/management/jetty-management-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
    9698        <copy file="${jetty.base}/lib/jsp-2.1/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
    9799        <delete file="jetty.tar" />
  • build.xml

    rfd6fcda r4045785  
    401401            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    402402            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
    403             <group title="Jetty Logging" packages="org.mortbay.http" />
     403            <group title="Jetty Logging" packages="net.i2p.jetty" />
    404404            <group title="SAM Bridge" packages="net.i2p.sam:net.i2p.sam.client" />
    405405            <group title="SusiDNS Application" packages="i2p.susi.dns" />
     
    707707        <!-- all jetty stuff -->
    708708        <copy todir="pkg-temp/lib" >
    709             <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     709            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
    710710        </copy>
    711711        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
     
    968968    <target name="prepjupdate" depends="prepupdate, buildWEB">
    969969        <copy todir="pkg-temp/lib" >
    970             <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     970            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
    971971        </copy>
    972972        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
  • installer/resources/clients.config

    rfd6fcda r4045785  
    4747## To use local SSL, edit jetty-ssl.xml and use:
    4848#clientApp.3.args="/path/to/jetty.xml" "/path/to/jetty-ssl.xml"
     49## To use local or remote JMX, edit jetty-jmx.xml and use:
     50#clientApp.3.args="/path/to/jetty.xml" "/path/to/jetty-jmx.xml"
    4951clientApp.3.args="eepsite/jetty.xml"
    5052clientApp.3.delay=30
  • installer/resources/deletelist.txt

    rfd6fcda r4045785  
    22# expired cert
    33certificates/r31453.ovh.net
    4 # old jetty 5 libs
    5 lib/org.mortbay.jmx.jar
Note: See TracChangeset for help on using the changeset viewer.