adc 2003/09/27 10:09:43
Modified: modules/core/src/java/org/apache/geronimo/deployment/model/web
Filter.java Servlet.java
Log:
J2EELoader loads ParamValue not InitParam. May want to either
remove InitParam or have J2EELoader return InitParam.
Revision Changes Path
1.2 +7 -6
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/Filter.java
Index: Filter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/Filter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Filter.java 7 Sep 2003 23:20:06 -0000 1.1
+++ Filter.java 27 Sep 2003 17:09:43 -0000 1.2
@@ -56,6 +56,7 @@
package org.apache.geronimo.deployment.model.web;
import org.apache.geronimo.deployment.model.j2ee.Displayable;
+import org.apache.geronimo.deployment.model.j2ee.ParamValue;
/**
* JavaBean for the web.xml tag filter
@@ -65,7 +66,7 @@
public class Filter extends Displayable {
private String filterName;
private String filterClass;
- private InitParam[] initParam = new InitParam[0];
+ private ParamValue[] initParam = new ParamValue[0];
public String getFilterClass() {
return filterClass;
@@ -83,19 +84,19 @@
this.filterName = filterName;
}
- public InitParam[] getInitParam() {
+ public ParamValue[] getInitParam() {
return initParam;
}
- public InitParam getInitParam(int i) {
+ public ParamValue getInitParam(int i) {
return initParam[i];
}
- public void setInitParam(InitParam[] initParam) {
+ public void setInitParam(ParamValue[] initParam) {
this.initParam = initParam;
}
- public void setInitParam(int i, InitParam initParam) {
+ public void setInitParam(int i, ParamValue initParam) {
this.initParam[i] = initParam;
}
}
1.2 +7 -6
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/Servlet.java
Index: Servlet.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/Servlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Servlet.java 7 Sep 2003 23:20:06 -0000 1.1
+++ Servlet.java 27 Sep 2003 17:09:43 -0000 1.2
@@ -58,6 +58,7 @@
import org.apache.geronimo.deployment.model.j2ee.Displayable;
import org.apache.geronimo.deployment.model.j2ee.RunAs;
import org.apache.geronimo.deployment.model.j2ee.SecurityRoleRef;
+import org.apache.geronimo.deployment.model.j2ee.ParamValue;
/**
* JavaBean for the web.xml tag servlet
@@ -68,24 +69,24 @@
private String servletName;
private String servletClass;
private String jspFile;
- private InitParam[] initParam = new InitParam[0];
+ private ParamValue[] initParam = new ParamValue[0];
private Integer loadOnStartup;
private RunAs runAs;
private SecurityRoleRef[] securityRoleRef = new SecurityRoleRef[0];
- public InitParam[] getInitParam() {
+ public ParamValue[] getInitParam() {
return initParam;
}
- public InitParam getInitParam(int i) {
+ public ParamValue getInitParam(int i) {
return initParam[i];
}
- public void setInitParam(InitParam[] initParam) {
+ public void setInitParam(ParamValue[] initParam) {
this.initParam = initParam;
}
- public void setInitParam(int i, InitParam initParam) {
+ public void setInitParam(int i, ParamValue initParam) {
this.initParam[i] = initParam;
}
