Author: kkolinko
Date: Thu Jun 19 20:21:56 2014
New Revision: 1604029
URL: http://svn.apache.org/r1604029
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56588
Update according to the changes in Tomcat 8:
Un-deprecate Context.findApplicationListeners()
It is followup to r1600505, r1600638.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java?rev=1604029&r1=1604028&r2=1604029&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java Thu Jun 19
20:21:56 2014
@@ -989,11 +989,7 @@ public interface Context extends Contain
/**
* Return the set of application listener class names configured
* for this application.
- *
- * @deprecated The return type of this method will be changing to
- * {@link ApplicationListener}[] in Tomcat 8
*/
- @Deprecated
public String[] findApplicationListeners();
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1604029&r1=1604028&r2=1604029&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Thu Jun 19 20:21:56 2014
@@ -76,7 +76,6 @@ public class WebAnnotationSet {
*/
protected static void loadApplicationListenerAnnotations(Context context) {
Class<?> classClass = null;
- @SuppressWarnings("deprecation")
String[] applicationListeners =
context.findApplicationListeners();
for (int i = 0; i < applicationListeners.length; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
