Author: markt
Date: Tue Jan 31 09:31:56 2012
New Revision: 1238323
URL: http://svn.apache.org/viewvc?rev=1238323&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?rev=1238323&r1=1238322&r2=1238323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
Tue Jan 31 09:31:56 2012
@@ -137,14 +137,6 @@ public class MbeansDescriptorsDigesterSo
}
- /**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x
- */
- @Deprecated
- public void setLocation( String loc ) {
- this.location=loc;
- }
-
/** Used if a single component is loaded
*
* @param type
@@ -158,13 +150,6 @@ public class MbeansDescriptorsDigesterSo
}
@Override
- @Deprecated
- public List<ObjectName> loadDescriptors( Registry registry, String
location,
- String type, Object source) throws Exception {
- return loadDescriptors(registry, type, source);
- }
-
- @Override
public List<ObjectName> loadDescriptors( Registry registry, String type,
Object source) throws Exception {
setRegistry(registry);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java?rev=1238323&r1=1238322&r2=1238323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
Tue Jan 31 09:31:56 2012
@@ -48,14 +48,6 @@ public class MbeansDescriptorsIntrospect
this.registry=reg;
}
- /**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x
- */
- @Deprecated
- public void setLocation( String loc ) {
- this.location=loc;
- }
-
/** Used if a single component is loaded
*
* @param type
@@ -69,13 +61,6 @@ public class MbeansDescriptorsIntrospect
}
@Override
- @Deprecated
- public List<ObjectName> loadDescriptors( Registry registry, String
location,
- String type, Object source) throws Exception {
- return loadDescriptors(registry, type, source);
- }
-
- @Override
public List<ObjectName> loadDescriptors(Registry registry, String type,
Object source) throws Exception {
setRegistry(registry);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java?rev=1238323&r1=1238322&r2=1238323&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
Tue Jan 31 09:31:56 2012
@@ -41,14 +41,6 @@ public class MbeansDescriptorsSerSource
this.registry=reg;
}
- /**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x
- */
- @Deprecated
- public void setLocation( String loc ) {
- this.location=loc;
- }
-
/** Used if a single component is loaded
*
* @param type
@@ -62,13 +54,6 @@ public class MbeansDescriptorsSerSource
}
@Override
- @Deprecated
- public List<ObjectName> loadDescriptors( Registry registry, String
location,
- String type, Object source) throws Exception {
- return loadDescriptors(registry, type, source);
- }
-
- @Override
public List<ObjectName> loadDescriptors( Registry registry, String type,
Object source) throws Exception {
setRegistry(registry);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java?rev=1238323&r1=1238322&r2=1238323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
Tue Jan 31 09:31:56 2012
@@ -22,32 +22,20 @@ import javax.management.ObjectName;
import org.apache.tomcat.util.modeler.Registry;
-/** Source for descriptor data. More sources can be added.
- *
+/**
+ * Source for descriptor data. More sources can be added.
*/
public abstract class ModelerSource {
protected Object source;
- @Deprecated
- protected String location;
- /** Load data, returns a list of items.
+ /**
+ * Load data, returns a list of items.
*
* @param registry
- * @param location
* @param type
* @param source Introspected object or some other source
* @throws Exception
- *
- * @deprecated Location parameter is unused. Will be removed in Tomcat
- * 8.0.x
*/
- @Deprecated
- public List<ObjectName> loadDescriptors( Registry registry, String
location,
- String type, Object source) throws Exception {
- // TODO
- return null;
- }
-
public abstract List<ObjectName> loadDescriptors(Registry registry,
String type, Object source) throws Exception;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
