You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/02/01 12:11:37 UTC
svn commit: r1727918 - in /tomcat/trunk:
java/org/apache/catalina/core/StandardContext.java
java/org/apache/catalina/core/StandardWrapper.java
java/org/apache/catalina/core/mbeans-descriptors.xml
webapps/docs/changelog.xml
Author: markt
Date: Mon Feb 1 11:11:36 2016
New Revision: 1727918
URL: http://svn.apache.org/viewvc?rev=1727918&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58827
Remove what is left of the JSR-77 implementation.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1727918&r1=1727917&r2=1727918&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Feb 1 11:11:36 2016
@@ -16,11 +16,9 @@
*/
package org.apache.catalina.core;
-import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.AccessController;
@@ -6198,67 +6196,6 @@ public class StandardContext extends Con
// ------------------------------------------------------------- Operations
-
- /**
- * JSR77 deploymentDescriptor attribute
- *
- * @return string deployment descriptor
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
- @Deprecated
- public String getDeploymentDescriptor() {
-
- InputStream stream = null;
- ServletContext servletContext = getServletContext();
- if (servletContext != null) {
- stream = servletContext.getResourceAsStream(
- org.apache.catalina.startup.Constants.ApplicationWebXml);
- }
- if (stream == null) {
- return "";
- }
- StringBuilder sb = new StringBuilder();
- try (BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
- String strRead = "";
- while (strRead != null) {
- sb.append(strRead);
- strRead = br.readLine();
- }
- } catch (IOException e) {
- return "";
- }
-
- return sb.toString();
- }
-
-
- /**
- * JSR77 servlets attribute
- *
- * @return list of all servlets ( we know about )
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
- @Deprecated
- public String[] getServlets() {
-
- String[] result = null;
-
- Container[] children = findChildren();
- if (children != null) {
- result = new String[children.length];
- for( int i=0; i< children.length; i++ ) {
- result[i] = children[i].getObjectName().toString();
- }
- }
-
- return result;
- }
-
-
@Override
protected String getObjectNameKeyProperties() {
@@ -6455,17 +6392,6 @@ public class StandardContext extends Con
/**
- * @return support for "stateManageable" JSR77
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
- @Deprecated
- public boolean isStateManageable() {
- return true;
- }
-
- /**
* The J2EE Server ObjectName this module is deployed on.
*/
private String server = null;
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1727918&r1=1727917&r2=1727918&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Feb 1 11:11:36 2016
@@ -1786,18 +1786,6 @@ public class StandardWrapper extends Con
/**
- * @return JSR 77. Always return <code>false</code>.
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
- @Deprecated
- public boolean isStateManageable() {
- return false;
- }
-
-
- /**
* Remove a JMX notficationListener
* @see javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1727918&r1=1727917&r2=1727918&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Mon Feb 1 11:11:36 2016
@@ -299,12 +299,6 @@
description="Time (in milliseconds) it took to start this context"
type="long"/>
- <attribute name="stateManageable"
- description="Deprecated. State management support for this managed object"
- is="true"
- type="boolean"
- writeable="false" />
-
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
type="java.lang.String"
@@ -1614,12 +1608,6 @@
is="true"
writeable="false" />
- <attribute name="stateManageable"
- description="State management support for this managed object"
- is="true"
- type="boolean"
- writeable="false"/>
-
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
type="java.lang.String"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1727918&r1=1727917&r2=1727918&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 1 11:11:36 2016
@@ -72,6 +72,9 @@
<bug>58768</bug>: Log a warning if a redirect fails because of an
invalid location. (markt)
</fix>
+ <scode>
+ <bug>58827</bug>: Remove remains of JSR-77 implementaion. (markt)
+ </scode>
<fix>
<bug>58946</bug>: Ensure that the request parameter map remains
immutable when processing via a RequestDispatcher. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org