I2P_Developers/i2p.i2p
3
1
Fork 11
Code Issues 340 Pull Requests 7 Actions 2 Packages Projects Releases Wiki Activity

Eepsite: Fix config class names, fix webapp environment

Browse Source
This commit is contained in:
zzz
2025-05-27 18:17:23 -04:00
parent 26ae478f48
commit 7e443decbc
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jetty/java/src/net/i2p/servlet/WebAppProviderConfiguration.java
View File

@ -25,7 +25,7 @@ public class WebAppProviderConfiguration {
public static void configure(ContextProvider wap) {
// Not in Jetty 12 but these are the two defaults
//String[] classNames = WebAppContext.getDefaultConfigurationClasses();
String[] classNames = { "org.eclipse.jetty.ee8.webapp.WebXMLConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXMLConfiguration" };
String[] classNames = { "org.eclipse.jetty.ee8.webapp.WebXmlConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXmlConfiguration" };
int sz = classNames.length;
String[] newClassNames = new String[sz + 1];
for (int j = 0; j < sz; j++) {

2
apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
View File

@ -206,7 +206,7 @@ public class WebAppStarter {
if (classNames.length == 0) {
//classNames = wac.getDefaultConfigurationClasses();
// These are the defaults as documented in WebAppContext
classNames = new String[] { "org.eclipse.jetty.ee8.webapp.WebXMLConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXMLConfiguration" };
classNames = new String[] { "org.eclipse.jetty.ee8.webapp.WebXmlConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXmlConfiguration" };
}
List<String> newClassNames = new ArrayList<String>(Arrays.asList(classNames));
for (String name : newClassNames) {

23
installer/resources/eepsite/jetty.xml
View File

@ -182,6 +182,29 @@
</Arg>
</Call>
<!-- Setup ee8 environment -->
<!-- First call needed to initialize the class and prevent NPE -->
<Call class="org.eclipse.jetty.util.component.Environment" name="get" >
<Arg>foo</Arg>
</Call>
<New id="EBuilder" class="org.eclipse.jetty.xml.EnvironmentBuilder" >
<Arg>ee8</Arg>
</New>
<Ref refid="EBuilder">
<Call id="Environment" name="build" />
</Ref>
<Ref refid="Environment">
<Call class="org.eclipse.jetty.util.Attributes" name="setAttribute">
<Arg>contextHandlerClass</Arg>
<Arg>org.eclipse.jetty.ee8.webapp.WebAppContext</Arg>
</Call>
</Ref>
<Call class="org.eclipse.jetty.util.component.Environment" name="set" >
<Arg>
<Ref refid="Environment"/>
</Arg>
</Call>
<!-- =========================================================== -->
<!-- Configure the context deployer -->
<!-- A context deployer will deploy contexts described in -->