summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Tsao2014-04-02 12:28:33 (EDT)
committerRoberto Sanchez2014-04-02 12:28:33 (EDT)
commit53821f2ebbcb29df289c9fe056bba64f2bbd29ba (patch)
tree86c543cd9c2c2b01439bd5f9cfc2a812353b8773
parentd27ac21ddc51e2b3a5356fbf397d4fb43e61a48f (diff)
downloadwebtools.javaee-53821f2ebbcb29df289c9fe056bba64f2bbd29ba.zip
webtools.javaee-53821f2ebbcb29df289c9fe056bba64f2bbd29ba.tar.gz
webtools.javaee-53821f2ebbcb29df289c9fe056bba64f2bbd29ba.tar.bz2
[431721] Web Annotations model needs to handle the 'asyncSupported' attributev201404021645
-rw-r--r--plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.jst.jee.web/pom.xml2
-rw-r--r--plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java11
3 files changed, 12 insertions, 3 deletions
diff --git a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
index 096dc48..2a5c09a 100644
--- a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.jee.web;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-Activator: org.eclipse.jst.jee.web.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.web/pom.xml b/plugins/org.eclipse.jst.jee.web/pom.xml
index fb27f55..ffd0e8a 100644
--- a/plugins/org.eclipse.jst.jee.web/pom.xml
+++ b/plugins/org.eclipse.jst.jee.web/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.jee.web</artifactId>
- <version>1.0.400-SNAPSHOT</version>
+ <version>1.0.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java
index 102d044..3e62778 100644
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java
+++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
+ * Copyright (c) 2008, 2014 by SAP AG, Walldorf and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -51,6 +51,7 @@ public class WebAnnotationFactory extends AbstractAnnotationFactory {
private static final String RESOURCE = "Resource"; //$NON-NLS-1$
private static final String RESOURCES = "Resources"; //$NON-NLS-1$
private static final String DECLARE_ROLES = "DeclareRoles"; //$NON-NLS-1$
+ private static final String ASYNC_SUPPORTED = "asyncSupported"; //$NON-NLS-1$
// private static final String INIT_PARAM = "InitParam"; //$NON-NLS-1$
// private static final String INIT_PARAM_FQ = "javax.servlet.annotation.InitParam"; //$NON-NLS-1$
@@ -127,6 +128,7 @@ public class WebAnnotationFactory extends AbstractAnnotationFactory {
String name = (String) getAnnotatedValue(NAME, memberValuePairs);
String filterName = (String) getAnnotatedValue(FILTER_NAME, memberValuePairs);
String descr = (String) getAnnotatedValue(DESCRIPTION, memberValuePairs);
+ Boolean async = (Boolean) getAnnotatedValue(ASYNC_SUPPORTED, memberValuePairs);
if(WEB_SERVLET.equals(annotationName) || WEB_SERVLET_FQ.equals(annotationName)){
Servlet servlet = (Servlet)artifact;
if (name != null) {
@@ -139,6 +141,10 @@ public class WebAnnotationFactory extends AbstractAnnotationFactory {
description.setValue(descr);
servlet.getDescriptions().add(description);
}
+ if (async != null){
+ servlet.setAsyncSupported(async.booleanValue());
+ }
+
processUrlMapping(result, annotation, servlet);
} else if(WEB_FILTER.equals(annotationName) || WEB_FILTER_FQ.equals(annotationName)){
Filter filter = (Filter)artifact;
@@ -152,6 +158,9 @@ public class WebAnnotationFactory extends AbstractAnnotationFactory {
description.setValue(descr);
filter.getDescriptions().add(description);
}
+ if (async != null){
+ filter.setAsyncSupported(async.booleanValue());
+ }
processUrlMapping(result, annotation, filter);
} else if(WEB_LISTENER.equals(annotationName) || WEB_LISTENER_FQ.equals(annotationName)){