Changeset d8cff6c3


Ignore:
Timestamp:
Feb 10, 2011 6:09:05 PM (9 years ago)
Author:
mathiasdm <mathiasdm@…>
Branches:
master
Children:
8d15bb4
Parents:
ae9c160 (diff), b43face (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '710537602a9f16aa4235ee5d50f9062658827469'

and 'ebeebe3477f791c404683923ccfaf075de781391'

Location:
apps/i2ptunnel/java
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/build.xml

    rae9c160 rd8cff6c3  
    142142            windowtitle="I2PTunnel" />
    143143    </target>
     144
     145    <target name="compileTest">
     146        <mkdir dir="./build" />
     147        <mkdir dir="./build/obj" />
     148        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" >
     149            <compilerarg line="${javac.compilerargs}" />
     150            <classpath>
     151                <pathelement location="../../../core/java/build/i2p.jar" />
     152                <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
     153            </classpath>
     154        </javac>
     155    </target>
     156    <target name="test" depends="clean, compileTest">
     157        <junit printsummary="on" fork="yes">
     158            <classpath>
     159                <pathelement path="${classpath}" />
     160                <pathelement location="./build/obj" />
     161                <pathelement location="../../../core/java/build/i2p.jar" />
     162            </classpath>
     163            <batchtest>
     164                <fileset dir="./test/">
     165                    <include name="**/*Test.java" />
     166                </fileset>
     167            </batchtest>
     168            <formatter type="xml"/>
     169        </junit>
     170        <mkdir dir="../../../reports/" />
     171        <mkdir dir="../../../reports/i2ptunnel/" />
     172        <mkdir dir="../../../reports/i2ptunnel/junit/" />
     173        <delete>
     174            <fileset dir="../../../reports/i2ptunnel/junit">
     175                <include name="TEST-*.xml"/>
     176            </fileset>
     177        </delete>
     178        <copy todir="../../../reports/i2ptunnel/junit">
     179            <fileset dir=".">
     180                <include name="TEST-*.xml"/>
     181            </fileset>
     182        </copy>
     183        <delete>
     184            <fileset dir=".">
     185                <include name="TEST-*.xml"/>
     186            </fileset>
     187        </delete>
     188    </target>
     189
    144190    <target name="clean">
    145191        <delete dir="./build" />
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

    rae9c160 rd8cff6c3  
    366366    }
    367367
    368     private static String formatHeaders(Map<String, List<String>> headers, StringBuilder command) {
     368    protected static String formatHeaders(Map<String, List<String>> headers, StringBuilder command) {
    369369        StringBuilder buf = new StringBuilder(command.length() + headers.size() * 64);
    370370        buf.append(command.toString().trim()).append("\r\n");
     
    419419    }
    420420
    421     private static Map<String, List<String>> readHeaders(InputStream in, StringBuilder command, String[] skipHeaders, I2PAppContext ctx) throws IOException {
     421    protected static Map<String, List<String>> readHeaders(InputStream in, StringBuilder command, String[] skipHeaders, I2PAppContext ctx) throws IOException {
    422422        HashMap<String, List<String>> headers = new HashMap<String, List<String>>();
    423423        StringBuilder buf = new StringBuilder(128);
Note: See TracChangeset for help on using the changeset viewer.