← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/security/SecurityClassLoad.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/security/SecurityClassLoad.java
25
25
 *
26
26
 * @author Glenn L. Nielsen
27
27
 * @author Jean-Francois Arcand
28
 
 * @version $Revision: 900131 $ $Date: 2010-01-17 13:46:53 +0100 (So, 17. Jan 2010) $
 
28
 * @version $Id: SecurityClassLoad.java 952026 2010-06-06 23:56:45Z markt $
29
29
 */
30
30
 
31
31
public final class SecurityClassLoad {
42
42
        loadSessionPackage(loader);
43
43
        loadUtilPackage(loader);
44
44
        loadJavaxPackage(loader);
45
 
        loadCoyotePackage(loader);        
46
 
        loadHttp11Package(loader);        
 
45
        loadCoyotePackage(loader);
 
46
        loadHttp11Package(loader);
47
47
        loadTomcatPackage(loader);
48
48
    }
49
49
    
119
119
    private final static void loadHttp11Package(ClassLoader loader)
120
120
        throws Exception {
121
121
        String basePackage = "org.apache.coyote.http11.";
122
 
        loader.loadClass(basePackage + "Http11Processor$1");
123
122
        loader.loadClass(basePackage + "InternalOutputBuffer$1");
124
123
        loader.loadClass(basePackage + "InternalOutputBuffer$2");
125
124
    }
212
211
        throws Exception {
213
212
        String basePackage = "org.apache.tomcat.";
214
213
        loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
 
214
        // Make sure system property is read at this point
 
215
        Class<?> clazz = loader.loadClass(
 
216
                basePackage + "util.http.FastHttpDateFormat");
 
217
        clazz.newInstance();
215
218
    }
216
219
}
217
220