Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unset context attributes during Configuration.deconfigure() that were set during Configuration.configure(). 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@628 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jan Bartel 2009-08-04 07:52:03 +00:00
parent 62c605f802
commit 8e9e7d5179
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
View File

@ -83,6 +83,7 @@ public class AnnotationConfiguration extends AbstractConfiguration
public void deconfigure(WebAppContext context) throws Exception
{
context.setAttribute(CLASS_INHERITANCE_MAP, null);
}

3
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java
View File

@ -69,13 +69,12 @@ public class FragmentConfiguration implements Configuration
public void deconfigure(WebAppContext context) throws Exception
{
// TODO Auto-generated method stub
context.setAttribute(FRAGMENT_RESOURCES, null);
}
public void postConfigure(WebAppContext context) throws Exception
{
// TODO Auto-generated method stub
}
/* ------------------------------------------------------------------------------- */

4
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java
View File

@ -85,7 +85,9 @@ public class MetaInfConfiguration implements Configuration
public void deconfigure(WebAppContext context) throws Exception
{
context.setAttribute(METAINF_FRAGMENTS, null);
context.setAttribute(METAINF_RESOURCES, null);
context.setAttribute(METAINF_TLDS, null);
}
public void postConfigure(WebAppContext context) throws Exception

9
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java
View File

@ -53,7 +53,7 @@ public class TagLibConfiguration implements Configuration
public class TldProcessor
{
public static final String __taglib_processor = "org.eclipse.jetty.tagLibProcessor";
public static final String TAGLIB_PROCESSOR = "org.eclipse.jetty.tagLibProcessor";
XmlParser _parser;
WebAppContext _context;
List<XmlParser.Node> _roots = new ArrayList<XmlParser.Node>();
@ -246,7 +246,7 @@ public class TagLibConfiguration implements Configuration
// Create a processor for the tlds and save it
TldProcessor processor = new TldProcessor (context);
context.setAttribute(TldProcessor.__taglib_processor, processor);
context.setAttribute(TldProcessor.TAGLIB_PROCESSOR, processor);
// Parse the tlds into memory
Resource tld = null;
@ -269,7 +269,7 @@ public class TagLibConfiguration implements Configuration
public void configure (WebAppContext context) throws Exception
{
TldProcessor processor = (TldProcessor)context.getAttribute(TldProcessor.__taglib_processor);
TldProcessor processor = (TldProcessor)context.getAttribute(TldProcessor.TAGLIB_PROCESSOR);
if (processor == null)
{
Log.warn("No TldProcessor configured, skipping tld processing");
@ -288,8 +288,7 @@ public class TagLibConfiguration implements Configuration
public void deconfigure(WebAppContext context) throws Exception
{
// TODO Auto-generated method stub
context.setAttribute(TldProcessor.TAGLIB_PROCESSOR, null);
}
}

5
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
View File

@ -165,6 +165,11 @@ public class WebInfConfiguration implements Configuration
IO.delete(context.getTempDirectory());
setTempDirectory(null, context);
}
context.setAttribute(CONTAINER_JAR_RESOURCES, null);
context.setAttribute(WEB_INF_JAR_RESOURCES, null);
context.setAttribute(TEMPDIR_CREATED, null);
context.setAttribute(context.TEMPDIR, null);
}

7
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java
View File

@ -173,7 +173,12 @@ public class WebXmlConfiguration implements Configuration
((ErrorPageErrorHandler)
context.getErrorHandler()).setErrorPages(null);
// TODO remove classpaths from classloader
context.setAttribute(WebXmlProcessor.WEB_PROCESSOR, null);
context.setAttribute(WebXmlProcessor.METADATA_COMPLETE, null);
context.setAttribute(WebXmlProcessor.WEBXML_VERSION, null);
context.setAttribute(WebXmlProcessor.WEBXML_CLASSNAMES, null);
}
}