diff --git a/VERSION.txt b/VERSION.txt index 842a3fc0db9..a0d648d18f3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,5 +1,6 @@ jetty-7.3.2-SNAPSHOT + 338819 Externally control Deployment Manager application lifecycle + + Ensure generated fragment names are unique jetty-7.3.1.v20110307 7 March 2011 + 316382 Support a more strict SSL option with certificates diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentDescriptor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentDescriptor.java index 9b70375fa4d..a5a9966618e 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentDescriptor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentDescriptor.java @@ -30,9 +30,9 @@ import org.eclipse.jetty.xml.XmlParser; public class FragmentDescriptor extends WebDescriptor { public static final String NAMELESS = "@@-NAMELESS-@@"; //prefix for nameless Fragments + protected static int _counter = 0; + public enum OtherType {None, Before, After}; - - protected int _counter = 0; protected OtherType _otherType = OtherType.None; @@ -161,4 +161,4 @@ public class FragmentDescriptor extends WebDescriptor { return null; //only used for absolute-ordering in Descriptor } -} \ No newline at end of file +}