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

Remove context attributes in postConfigure() phase of configuration that are not needed during deconfigure(). 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@649 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jan Bartel 2009-08-06 03:41:56 +00:00
parent dc8985597a
commit ecc9b9b417
7 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -411,6 +411,13 @@ public abstract class AbstractConfiguration implements Configuration
context.setAttribute(RunAsCollection.RUNAS_COLLECTION, runAsCollection);
}
public void postConfigure(WebAppContext context) throws Exception
{
context.setAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION, null);
context.setAttribute(InjectionCollection.INJECTION_COLLECTION, null);
context.setAttribute(RunAsCollection.RUNAS_COLLECTION, null);
}
public void configure (WebAppContext context)
throws Exception
{

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

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

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

@ -85,14 +85,14 @@ 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
{
context.setAttribute(METAINF_FRAGMENTS, null);
context.setAttribute(METAINF_RESOURCES, null);
context.setAttribute(METAINF_TLDS, null);
}
public void addResource (WebAppContext context, String attribute, Resource jar)

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

@ -282,13 +282,12 @@ public class TagLibConfiguration implements Configuration
public void postConfigure(WebAppContext context) throws Exception
{
// TODO Auto-generated method stub
context.setAttribute(TldProcessor.TAGLIB_PROCESSOR, null);
}
public void deconfigure(WebAppContext context) throws Exception
{
context.setAttribute(TldProcessor.TAGLIB_PROCESSOR, null);
}
}

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

@ -112,8 +112,8 @@ public class WebInfConfiguration implements Configuration
public void postConfigure(WebAppContext context) throws Exception
{
// TODO Auto-generated method stub
context.setAttribute(CONTAINER_JAR_RESOURCES, null);
context.setAttribute(WEB_INF_JAR_RESOURCES, null);
}
@ -166,8 +166,7 @@ public class WebInfConfiguration implements Configuration
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);
}

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

@ -123,8 +123,10 @@ public class WebXmlConfiguration implements Configuration
public void postConfigure(WebAppContext context) throws Exception
{
// TODO Auto-generated method stub
context.setAttribute(WebXmlProcessor.WEB_PROCESSOR, null);
context.setAttribute(WebXmlProcessor.METADATA_COMPLETE, null);
context.setAttribute(WebXmlProcessor.WEBXML_VERSION, null);
context.setAttribute(WebXmlProcessor.WEBXML_CLASSNAMES, null);
}
@ -176,9 +178,5 @@ public class WebXmlConfiguration implements Configuration
// 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);
}
}