Bug 527825: Allow for Servlet 3.1 listeners to be added to EE8 projects This patch updates the Filter/Listener/Servlet wizard pages to allow for them to be added to Web 4.0 projects in WTP. Signed-off-by: John Collier <John.J.Collier@ibm.com>

diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
index c6cc790..1e7783f 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java

@@ -177,8 +177,8 @@
 	@Override
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
-		String javaEEVersion = model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION);
-		if("3.0".equals(javaEEVersion) || "3.1".equals(javaEEVersion)){ //$NON-NLS-1$ //$NON-NLS-2$			
+		Float javaEEVersion = Float.valueOf(model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION));
+		if (javaEEVersion >= 3.0) {			
 			asyncSupportCheckBox.setVisible(true);
 		}
 		else

diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
index 13fac90..61116f7 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java

@@ -275,8 +275,8 @@
 	@Override
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
-		String javaEEVersion = model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION);
-		if("3.1".equals(javaEEVersion)){ //$NON-NLS-1$ 	
+		Float javaEEVersion = Float.valueOf(model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION));
+		if (javaEEVersion >= 3.1) {
 			setServlet31ListenersVisible(true);
 		}
 		else{
@@ -284,7 +284,6 @@
 		}
 	}
 	
-	
 	private void setServlet31ListenersVisible(boolean visible){
 		changeSessionID.setVisible(visible);
 		changeSessionIDIconLabel.setVisible(visible);

diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
index 9df611a..783344e 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java

@@ -216,8 +216,8 @@
 	@Override
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
-		String javaEEVersion = model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION);
-		if("3.0".equals(javaEEVersion) || "3.1".equals(javaEEVersion)){ //$NON-NLS-1$ //$NON-NLS-2$			
+		Float javaEEVersion = Float.valueOf(model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION));
+		if (javaEEVersion >= 3.0) {		
 			asyncSupportCheckBox.setVisible(true);
 		}
 		else