← Back to branch summary

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

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/loader/WebappLoader.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/loader/WebappLoader.java
78
78
 *
79
79
 * @author Craig R. McClanahan
80
80
 * @author Remy Maucherat
81
 
 * @version $Revision: 893564 $ $Date: 2009-12-23 17:31:31 +0100 (Mi, 23. Dez 2009) $
 
81
 * @version $Id: WebappLoader.java 958543 2010-06-28 11:03:12Z rjung $
82
82
 */
83
83
 
84
84
public class WebappLoader
209
209
    private ArrayList loaderRepositories = null;
210
210
 
211
211
 
 
212
    /**
 
213
     * Whether we should search the external repositories first
 
214
     */
 
215
    private boolean searchExternalFirst = false;
 
216
 
 
217
 
212
218
    // ------------------------------------------------------------- Properties
213
219
 
214
220
 
344
350
 
345
351
    }
346
352
 
 
353
    /**
 
354
     * @return Returns searchExternalFirst.
 
355
     */
 
356
    public boolean getSearchExternalFirst() {
 
357
        return searchExternalFirst;
 
358
    }
 
359
 
 
360
    /**
 
361
     * @param searchExternalFirst Whether external repositories should be searched first
 
362
     */
 
363
    public void setSearchExternalFirst(boolean searchExternalFirst) {
 
364
        this.searchExternalFirst = searchExternalFirst;
 
365
        if (classLoader != null) {
 
366
            classLoader.setSearchExternalFirst(searchExternalFirst);
 
367
        }
 
368
    }
 
369
 
347
370
 
348
371
    // --------------------------------------------------------- Public Methods
349
372
 
638
661
            classLoader = createClassLoader();
639
662
            classLoader.setResources(container.getResources());
640
663
            classLoader.setDelegate(this.delegate);
 
664
            classLoader.setSearchExternalFirst(searchExternalFirst);
641
665
            if (container instanceof StandardContext) {
642
666
                classLoader.setAntiJARLocking(
643
667
                        ((StandardContext) container).getAntiJARLocking());
644
668
                classLoader.setClearReferencesStopThreads(
645
669
                        ((StandardContext) container).getClearReferencesStopThreads());
 
670
                classLoader.setClearReferencesStopTimerThreads(
 
671
                        ((StandardContext) container).getClearReferencesStopTimerThreads());
 
672
                classLoader.setClearReferencesThreadLocals(
 
673
                        ((StandardContext) container).getClearReferencesThreadLocals());
646
674
            }
647
675
 
648
676
            for (int i = 0; i < repositories.length; i++) {