Changeset 8bfb3649


Ignore:
Timestamp:
Feb 28, 2017 3:52:32 AM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3631efa
Parents:
45abf65
Message:

Fix webapps and plugins not starting, because the
default configurations were not being run.
Revert adding JettyJspServlet? class, maybe we don't need it after all.

Location:
apps
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r45abf65 r8bfb3649  
    175175            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" />
    176176            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar" />
     177<!--
    177178            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
     179-->
    178180            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
    179181            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java

    r45abf65 r8bfb3649  
    113113        // see WebAppConfiguration for info
    114114        String[] classNames = wac.getConfigurationClasses();
     115        // In Jetty 9, it doesn't set the defaults if we've already added one, but the
     116        // defaults aren't set yet when we call the above. So we have to get the defaults.
     117        // Without the default configuration, the web.xml isn't read, and the webapp
     118        // won't respond to any requests, even though it appears to be running.
     119        // See WebAppContext.loadConfigurations() in source
     120        if (classNames.length == 0)
     121            classNames = wac.getDefaultConfigurationClasses();
    115122        String[] newClassNames = new String[classNames.length + 1];
    116123        for (int j = 0; j < classNames.length; j++)
Note: See TracChangeset for help on using the changeset viewer.