← Back to branch summary

~ubuntu-branches/ubuntu/precise/jetty/precise-updates

« back to all changes in this revision

Viewing changes to modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin/Jetty6PluginWebAppContext.java

  • Committer: Bazaar Package Importer
  • Author(s): Niels Thykier
  • Date: 2009-10-23 20:45:43 UTC
  • mfrom: (1.1.6 upstream) (2.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091023204543-3c4pyw0dhqq4qloh
Tags: 6.1.21-1
* New upstream release.
* Stopped using /tmp/jetty-temp in /etc/init.d/jetty for security
  reasons.
  - JVM_TMP is now /var/cache/jetty/tmp
  - JETTY_TMP is now /var/cache/jetty/data
* The postrm script no longer deletes files in /tmp/jetty-temp.
* Removed Philipp Meier from Uploaders (last upload was 2006-06-07).
  Thanks for your work on this package.
* Corrected javadoc symlink in binary package jetty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin/Jetty6PluginWebAppContext.java
1
1
//========================================================================
2
 
//$Id: Jetty6PluginWebAppContext.java 3605 2008-09-04 10:24:54Z dyu $
 
2
//$Id: Jetty6PluginWebAppContext.java 5511 2009-09-08 03:25:47Z janb $
3
3
//Copyright 2006 Mort Bay Consulting Pty. Ltd.
4
4
//------------------------------------------------------------------------
5
5
//Licensed under the Apache License, Version 2.0 (the "License");
41
41
    private JettyWebXmlConfiguration jettyWebConfig = new JettyWebXmlConfiguration();
42
42
    private TagLibConfiguration tagConfig = new TagLibConfiguration();
43
43
    private Configuration[] configs = new Configuration[]{webInfConfig,envConfig, mvnConfig, jettyWebConfig, tagConfig};
 
44
    private String contextPath = null;
44
45
    
45
46
    public Jetty6PluginWebAppContext ()
46
47
    {
48
49
        setConfigurations(configs);
49
50
    }
50
51
    
 
52
    public void setContextPath(String path)
 
53
    {
 
54
        this.contextPath = path;
 
55
    }
 
56
    
 
57
    public String getContextPath()
 
58
    {
 
59
        return contextPath;
 
60
    }
 
61
    
51
62
    public void setClassPathFiles(List classpathFiles)
52
63
    {
53
64
        this.classpathFiles = classpathFiles;
80
91
    
81
92
    public void configure ()
82
93
    {        
 
94
        if (this.contextPath != null)
 
95
            super.setContextPath(this.contextPath);
 
96
        
83
97
        setConfigurations(configs);
84
98
        mvnConfig.setClassPathConfiguration (classpathFiles);
85
99
        mvnConfig.setWebXml (webXmlFile);  
92
106
        {
93
107
            throw new RuntimeException(e);
94
108
        }
95
 
        /*
96
 
        Configuration[] configurations = getConfigurations();
97
 
        for (int i=0;i<configurations.length; i++)
98
 
        {
99
 
            if (configurations[i] instanceof Jetty6MavenConfiguration)
100
 
            {
101
 
                ((Jetty6MavenConfiguration)configurations[i]).setClassPathConfiguration (classpathFiles);
102
 
                ((Jetty6MavenConfiguration)configurations[i]).setWebXml (webXmlFile);              
103
 
            }
104
 
            else if (configurations[i] instanceof EnvConfiguration)
105
 
            {
106
 
                try
107
 
                {
108
 
                    if (this.jettyEnvXmlFile != null)
109
 
                        ((EnvConfiguration)configurations[i]).setJettyEnvXml(this.jettyEnvXmlFile.toURL());
110
 
                }
111
 
                catch (Exception e)
112
 
                {
113
 
                    throw new RuntimeException(e);
114
 
                }
115
 
            }
116
 
        }
117
 
        */
118
109
    }
119
110
 
120
111