You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2004/01/17 00:00:19 UTC
cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty JettyWebContainer.java JettyWebConnector.java
jboynes 2004/01/16 15:00:19
Modified: modules/web/src/java/org/apache/geronimo/web
AbstractWebConnector.java
modules/web/src/java/org/apache/geronimo/web/jetty
JettyWebContainer.java JettyWebConnector.java
Log:
Fix GBean info issues
Revision Changes Path
1.7 +5 -5 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebConnector.java
Index: AbstractWebConnector.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebConnector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractWebConnector.java 16 Jan 2004 02:19:23 -0000 1.6
+++ AbstractWebConnector.java 16 Jan 2004 23:00:19 -0000 1.7
@@ -41,13 +41,13 @@
}
- public AbstractWebConnector(String protocol, String iface, int port, int maxConnections, int maxIdleTime, List contexts) {
+ public AbstractWebConnector(String protocol, String iface, int port, int maxConnections, int maxIdleTime, String[] contexts) {
this.protocol = protocol;
this.iface = iface;
this.port = port;
this.maxConnections = maxConnections;
this.maxIdleTime = maxIdleTime;
- this.contexts = contexts;
+ this.contexts = Arrays.asList(contexts);
}
/* (non-Javadoc)
@@ -156,12 +156,12 @@
infoFactory.addAttribute(new GAttributeInfo("Contexts", true, "Contexts that must be registered in the web container before this connector will start accepting connections"));
infoFactory.setConstructor(new GConstructorInfo(
Arrays.asList(new Object[] {"Protocol", "Interface", "Port", "MaxConnections", "MaxIdleTime", "Contexts"}),
- Arrays.asList(new Object[] {String.class, String.class, Integer.class, Integer.class, Integer.class, List.class})
+ Arrays.asList(new Object[] {String.class, String.class, Integer.TYPE, Integer.TYPE, Integer.TYPE, String[].class})
));
GBEAN_INFO = infoFactory.getBeanInfo();
}
- public static GBeanInfo getGbeanInfo() {
+ public static GBeanInfo getGBeanInfo() {
return GBEAN_INFO;
}
1.12 +3 -2 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebContainer.java
Index: JettyWebContainer.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebContainer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JettyWebContainer.java 16 Jan 2004 02:19:23 -0000 1.11
+++ JettyWebContainer.java 16 Jan 2004 23:00:19 -0000 1.12
@@ -72,6 +72,7 @@
import org.apache.geronimo.gbean.GBeanInfoFactory;
import org.apache.geronimo.gbean.GEndpointInfo;
import org.apache.geronimo.gbean.GConstructorInfo;
+import org.apache.geronimo.gbean.GAttributeInfo;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.w3c.dom.Document;
@@ -228,7 +229,7 @@
GBEAN_INFO = infoFactory.getBeanInfo();
}
- public static GBeanInfo getGbeanInfo() {
+ public static GBeanInfo getGBeanInfo() {
return GBEAN_INFO;
}
1.8 +4 -4 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebConnector.java
Index: JettyWebConnector.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebConnector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JettyWebConnector.java 16 Jan 2004 02:19:23 -0000 1.7
+++ JettyWebConnector.java 16 Jan 2004 23:00:19 -0000 1.8
@@ -94,7 +94,7 @@
}
- public JettyWebConnector(String protocol, String iface, int port, int maxConnections, int maxIdleTime, List contexts) {
+ public JettyWebConnector(String protocol, String iface, int port, int maxConnections, int maxIdleTime, String[] contexts) {
super(protocol, iface, port, maxConnections, maxIdleTime, contexts);
}
@@ -242,12 +242,12 @@
}
static {
- GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Connector", "Wrapped Jetty listener", JettyWebConnector.class.getName(), AbstractWebConnector.getGbeanInfo());
+ GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Connector", "Wrapped Jetty listener", JettyWebConnector.class.getName(), AbstractWebConnector.getGBeanInfo());
infoFactory.addOperation(new GOperationInfo("getListener", Collections.EMPTY_LIST));
GBEAN_INFO = infoFactory.getBeanInfo();
}
- public static GBeanInfo getGbeanInfo() {
+ public static GBeanInfo getGBeanInfo() {
return GBEAN_INFO;
}