Author: markt
Date: Fri Nov 6 23:35:46 2009
New Revision: 833602
URL:
http://svn.apache.org/viewvc?rev=833602&view=revLog:
Use inheritance as it makes merging easier
Fix a handful of Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextEjb.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java
tomcat/trunk/java/org/apache/catalina/deploy/MessageDestination.java
tomcat/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/trunk/java/org/apache/catalina/deploy/SecurityCollection.java
tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java Fri Nov 6 23:35:46 2009
@@ -34,6 +34,7 @@
public class ApplicationParameter implements Serializable {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextEjb.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextEjb.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextEjb.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextEjb.java Fri Nov 6 23:35:46 2009
@@ -18,8 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
-
/**
* Representation of an EJB resource reference for a web application, as
@@ -31,8 +29,9 @@
* @version $Revision$ $Date$
*/
-public class ContextEjb extends ResourceBase implements Serializable {
+public class ContextEjb extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java Fri Nov 6 23:35:46 2009
@@ -33,6 +33,7 @@
public class ContextEnvironment implements Serializable, Injectable {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java Fri Nov 6 23:35:46 2009
@@ -18,7 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.HashMap;
@@ -31,8 +30,9 @@
* @author Fabien Carrion
*/
-public class ContextHandler extends ResourceBase implements Serializable {
+public class ContextHandler extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java Fri Nov 6 23:35:46 2009
@@ -18,8 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
-
/**
* Representation of a local EJB resource reference for a web application, as
@@ -31,8 +29,9 @@
* @version $Revision$ $Date$
*/
-public class ContextLocalEjb extends ResourceBase implements Serializable {
+public class ContextLocalEjb extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java Fri Nov 6 23:35:46 2009
@@ -18,7 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
/**
* Representation of a resource reference for a web application, as
@@ -30,8 +29,9 @@
* @version $Revision$ $Date$
*/
-public class ContextResource extends ResourceBase implements Serializable {
+public class ContextResource extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java Fri Nov 6 23:35:46 2009
@@ -18,8 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
-
/**
* Representation of an application resource reference, as represented in
@@ -30,8 +28,9 @@
* @version $Revision$ $Date$
*/
-public class ContextResourceEnvRef extends ResourceBase implements Serializable {
+public class ContextResourceEnvRef extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java Fri Nov 6 23:35:46 2009
@@ -18,8 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
-
/**
* Representation of a resource link for a web application, as
@@ -31,8 +29,9 @@
* @version $Revision$ $Date$
*/
-public class ContextResourceLink extends ResourceBase implements Serializable {
+public class ContextResourceLink extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java Fri Nov 6 23:35:46 2009
@@ -18,7 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
import java.util.Iterator;
import java.util.HashMap;
@@ -31,8 +30,9 @@
* @version $Revision$ $Date$
*/
-public class ContextService extends ResourceBase implements Serializable {
+public class ContextService extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java Fri Nov 6 23:35:46 2009
@@ -33,6 +33,7 @@
public class ContextTransaction implements Serializable {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java Fri Nov 6 23:35:46 2009
@@ -34,6 +34,7 @@
public class ErrorPage implements Serializable {
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------- Instance Variables
Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java Fri Nov 6 23:35:46 2009
@@ -34,6 +34,7 @@
public class FilterDef implements Serializable {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java Fri Nov 6 23:35:46 2009
@@ -29,6 +29,7 @@
public InjectionTarget() {
+ // NOOP
}
public InjectionTarget(String targetClass, String targetName) {
Modified: tomcat/trunk/java/org/apache/catalina/deploy/MessageDestination.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/MessageDestination.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/MessageDestination.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/MessageDestination.java Fri Nov 6 23:35:46 2009
@@ -29,27 +29,14 @@
* @since Tomcat 5.0
*/
-public class MessageDestination {
+public class MessageDestination extends ResourceBase {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
/**
- * The description of this destination.
- */
- private String description = null;
-
- public String getDescription() {
- return (this.description);
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
-
- /**
* The display name of this destination.
*/
private String displayName = null;
@@ -78,20 +65,6 @@
/**
- * The name of this destination.
- */
- private String name = null;
-
- public String getName() {
- return (this.name);
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
- /**
* The small icon of this destination.
*/
private String smallIcon = null;
@@ -116,7 +89,7 @@
StringBuilder sb = new StringBuilder("MessageDestination[");
sb.append("name=");
- sb.append(name);
+ sb.append(getName());
if (displayName != null) {
sb.append(", displayName=");
sb.append(displayName);
@@ -129,9 +102,9 @@
sb.append(", smallIcon=");
sb.append(smallIcon);
}
- if (description != null) {
+ if (getDescription() != null) {
sb.append(", description=");
- sb.append(description);
+ sb.append(getDescription());
}
sb.append("]");
return (sb.toString());
Modified: tomcat/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java Fri Nov 6 23:35:46 2009
@@ -18,10 +18,6 @@
package org.apache.catalina.deploy;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* <p>Representation of a message destination reference for a web application,
@@ -33,27 +29,14 @@
* @since Tomcat 5.0
*/
-public class MessageDestinationRef implements Serializable, Injectable {
-
+public class MessageDestinationRef extends ResourceBase {
+ private static final long serialVersionUID = 1L;
+
// ------------------------------------------------------------- Properties
/**
- * The description of this destination ref.
- */
- private String description = null;
-
- public String getDescription() {
- return (this.description);
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
-
- /**
* The link of this destination ref.
*/
private String link = null;
@@ -68,34 +51,6 @@
/**
- * The name of this destination ref.
- */
- private String name = null;
-
- public String getName() {
- return (this.name);
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
- /**
- * The type of this destination ref.
- */
- private String type = null;
-
- public String getType() {
- return (this.type);
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
-
- /**
* The usage of this destination ref.
*/
private String usage = null;
@@ -108,17 +63,6 @@
this.usage = usage;
}
- private List<InjectionTarget> injectionTargets = new ArrayList<InjectionTarget>();
-
- public void addInjectionTarget(String injectionTargetName, String jndiName) {
- InjectionTarget target = new InjectionTarget(injectionTargetName, jndiName);
- injectionTargets.add(target);
- }
-
- public List<InjectionTarget> getInjectionTargets() {
- return injectionTargets;
- }
-
// --------------------------------------------------------- Public Methods
@@ -130,22 +74,22 @@
StringBuilder sb = new StringBuilder("MessageDestination[");
sb.append("name=");
- sb.append(name);
+ sb.append(getName());
if (link != null) {
sb.append(", link=");
sb.append(link);
}
- if (type != null) {
+ if (getType() != null) {
sb.append(", type=");
- sb.append(type);
+ sb.append(getType());
}
if (usage != null) {
sb.append(", usage=");
sb.append(usage);
}
- if (description != null) {
+ if (getDescription() != null) {
sb.append(", description=");
- sb.append(description);
+ sb.append(getDescription());
}
sb.append("]");
return (sb.toString());
@@ -153,21 +97,4 @@
}
- // -------------------------------------------------------- Package Methods
-
-
- /**
- * The NamingResources with which we are associated (if any).
- */
- protected NamingResources resources = null;
-
- public NamingResources getNamingResources() {
- return (this.resources);
- }
-
- void setNamingResources(NamingResources resources) {
- this.resources = resources;
- }
-
-
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Fri Nov 6 23:35:46 2009
@@ -40,6 +40,7 @@
public class NamingResources implements Serializable {
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------------- Constructors
@@ -48,6 +49,7 @@
* Create a new NamingResources instance.
*/
public NamingResources() {
+ // NOOP
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java Fri Nov 6 23:35:46 2009
@@ -34,6 +34,7 @@
public class ResourceBase implements Serializable, Injectable {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/SecurityCollection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/SecurityCollection.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/SecurityCollection.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/SecurityCollection.java Fri Nov 6 23:35:46 2009
@@ -41,6 +41,8 @@
public class SecurityCollection implements Serializable {
+ private static final long serialVersionUID = 1L;
+
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java Fri Nov 6 23:35:46 2009
@@ -38,6 +38,7 @@
public class SecurityConstraint implements Serializable {
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=833602&r1=833601&r2=833602&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java Fri Nov 6 23:35:46 2009
@@ -33,6 +33,7 @@
public class ServletDef implements Serializable {
+ private static final long serialVersionUID = 1L;
// ------------------------------------------------------------- Properties
---------------------------------------------------------------------
To unsubscribe, e-mail:
dev-unsubscribe@...
For additional commands, e-mail:
dev-help@...
