Changes in / [3fca0f6:8c9ce56]


Ignore:
Files:
43 added
5 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r3fca0f6 r8c9ce56  
    212212   See licenses/LICENSE-GPLv2.txt
    213213
     214   I2PControl
     215   See licenses/LICENSE-Apache2.0.txt
     216   Includes jBCrypt:
     217   Copyright (c) 2006 Damien Miller <djm@mindrot.org>
     218   See licenses/LICENSE-jBCrypt.txt
     219   Includes jsonrpc2 1.38.1 (base) 1.11 (server)
     220   See licenses/LICENSE-Apache2.0.txt
     221
    214222   I2PSnark (i2psnark.jar, i2psnark.war):
    215223   Copyright (C) 2003 Mark J. Wielaard
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    r3fca0f6 r8c9ce56  
    803803                            rewrite = true;
    804804                        }
     805                    } else if (appName.equals("jsonrpc") && enabled == null) {
     806                        // jsonrpc (i2pcontrol) webapp default is false
     807                        props.setProperty(PREFIX + "jsonrpc" + ENABLED, "false");
     808                        rewrite = true;
    805809                    } else if (! "false".equals(enabled)) {
    806810                        try {
  • apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java

    r3fca0f6 r8c9ce56  
    226226           .append("\">")
    227227           .append(nbsp(_t("Email")))
     228           .append("</a>\n");
     229        }
     230
     231        if (pm.isRegistered(PortMapper.SVC_JSONRPC)) {
     232           buf.append("<a href=\"/jsonrpc/\" target=\"_top\" title=\"")
     233           .append(_t("RPC Service"))
     234           .append("\">")
     235           .append(nbsp(_t("I2PControl")))
    228236           .append("</a>\n");
    229237        }
  • build.xml

    r3fca0f6 r8c9ce56  
    287287    <target name="buildclean" depends="distclean, build" />
    288288
    289     <target name="builddep" depends="builddepSmall, buildBOB, buildSAM, buildSusiMail, buildSusiDNS, buildI2PSnark" />
     289    <target name="builddep" depends="builddepSmall, buildBOB, buildSAM, buildSusiMail, buildSusiDNS, buildI2PSnark, buildI2PControl" />
    290290
    291291    <target name="builddepSmall" depends="buildrouter, buildSystray, buildDesktopGui, buildRouterConsole, buildStreaming, buildI2PTunnel, buildAddressbook" />
     
    355355        <ant dir="apps/imagegen" target="build" />
    356356        <copy file="apps/imagegen/imagegen/build/imagegen.war" todir="build/" />
     357    </target>
     358
     359    <target name="buildI2PControl" depends="buildRouter, buildJetty" >
     360        <ant dir="apps/i2pcontrol" target="war" />
     361        <copy file="apps/i2pcontrol/build/jsonrpc.war" todir="build/" />
    357362    </target>
    358363
     
    833838            <group title="BOB Demos" packages="net.i2p.BOB.Demos.echo.echoclient:net.i2p.BOB.Demos.echo.echoserver" />
    834839            <group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
     840            <group title="I2PControl Application" packages="net.i2p.i2pcontrol:net.i2p.i2pcontrol.*:org.mindrot.jbcrypt:com.thetransactioncompany.jsonrpc2:com.thetransactioncompany.jsonrpc2.*" />
    835841            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    836842            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     
    868874                <pathelement location="apps/jrobin/java/src" />
    869875                <pathelement location="installer/java/src" />
     876                <pathelement location="apps/i2pcontrol/java" />
    870877            </sourcepath>
    871878            <classpath>
     
    13191326        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    13201327        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
     1328        <copy file="build/jsonrpc.war" todir="pkg-temp/webapps/" />
    13211329        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    13221330        <copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" />
     
    16541662        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    16551663        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
     1664        <copy file="build/jsonrpc.war" todir="pkg-temp/webapps/" />
    16561665        <!-- as of 0.7.12; last changed in 0.9; removed from update in 0.9.26 -->
    16571666      <!--
     
    21002109            <arg value="build/imagegen.war"/>
    21012110            <arg value="build/jetty-i2p.jar"/>
     2111            <arg value="build/jsonrpc.war"/>
    21022112            <arg value="build/mstreaming.jar"/>
    21032113            <arg value="build/router.jar/"/>
  • core/java/src/net/i2p/util/PortMapper.java

    r3fca0f6 r8c9ce56  
    7979     */
    8080    public static final String SVC_SUSIMAIL = "susimail";
     81    /**
     82     *  To indicate presence, alternative to WebAppStarter.isWebappRunning().
     83     *  For actual base URL, use getConsoleURL()
     84     *  @since 0.9.39
     85     */
     86    public static final String SVC_JSONRPC = "jsonrpc";
    8187
    8288    /** @since 0.9.34 */
Note: See TracChangeset for help on using the changeset viewer.