echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2psnark: Fix standalone configuration for Jetty 9

Browse Source 
Context: Fix ClientAppManagerImpl in AppContext,
required for transmission.war in standalone i2psnark
This commit is contained in:
zzz
2017-04-02 18:48:03 +00:00
parent f390831835
commit bfc04178a6
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/i2psnark/jetty-i2psnark.xml
View File

@ -22,15 +22,24 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
<New class="org.eclipse.jetty.server.ServerConnector">
<Arg><Ref id="Server" /></Arg>
<Arg type="int">1</Arg> <!-- number of acceptors -->
<Arg type="int">0</Arg> <!-- default number of selectors -->
<Arg>
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <!-- varargs so we need an array -->
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg>
<New class="org.eclipse.jetty.server.HttpConfiguration" />
</Arg>
</New>
</Item>
</Array>
</Arg>
<Set name="host">127.0.0.1</Set>
<Set name="port">8002</Set>
<Set name="maxIdleTime">600000</Set>
<Set name="Acceptors">1</Set>
<Set name="statsOn">false</Set>
<Set name="lowResourcesConnections">5000</Set>
<Set name="lowResourcesMaxIdleTime">5000</Set>
<Set name="useDirectBuffers">false</Set>
<Set name="idleTimeout">600000</Set>
</New>
</Arg>
</Call>
@ -96,7 +105,7 @@
<Ref id="DeploymentManager">
<Call name="addAppProvider">
<Arg>
<New class="org.eclipse.jetty.deploy.providers.ContextProvider">
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName">./contexts</Set>
<Set name="scanInterval">0</Set>
</New>

2
core/java/src/net/i2p/I2PAppContext.java
View File

@ -1018,6 +1018,6 @@ public class I2PAppContext {
* @since 0.9.11, in RouterContext since 0.9.4
*/
public ClientAppManager clientAppManager() {
return null;
return _appManager;
}
}

4
history.txt
View File

@ -1,3 +1,7 @@
2017-04-02 zzz
* Context: Fix ClientAppManagerImpl in AppContext
* i2psnark: Fix standalone configuration for Jetty 9
2017-04-01 zzz
* Console: Fix stopping of webapps when console stops (ticket #1893)
* i2psnark: Only rewrite torrent config file if changed (ticket #1893)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 14;
public final static long BUILD = 15;
/** for example "-test" */
public final static String EXTRA = "";