You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2003/09/08 06:51:14 UTC
cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty JettyWebConnector.java JettyWebContainer.java
dain 2003/09/07 21:51:14
Modified: modules/web/src/java/org/apache/geronimo/web/hack
GeronimoWebApplicationContext.java Jetty.java
modules/web/src/java/org/apache/geronimo/web
AbstractWebApplication.java
AbstractWebContainer.java WebAccessLog.java
WebApplication.java WebConnector.java
WebContainer.java
modules/web/src/java/org/apache/geronimo/web/jetty
JettyWebConnector.java JettyWebContainer.java
Log:
Fixed formatting.
Updated to reflect movement of base services code to o.a.g.core.service.
Revision Changes Path
1.3 +2 -2 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/hack/GeronimoWebApplicationContext.java
Index: GeronimoWebApplicationContext.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/hack/GeronimoWebApplicationContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeronimoWebApplicationContext.java 8 Sep 2003 04:40:50 -0000 1.2
+++ GeronimoWebApplicationContext.java 8 Sep 2003 04:51:14 -0000 1.3
@@ -100,7 +100,7 @@
cl = cl.getParent();
}
String s = path.toString();
- if(log.isTraceEnabled()) {
+ if (log.isTraceEnabled()) {
log.trace("File Class Path = " + s);
}
return s;
1.2 +1 -2 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/hack/Jetty.java
Index: Jetty.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/hack/Jetty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Jetty.java 5 Sep 2003 10:26:17 -0000 1.1
+++ Jetty.java 8 Sep 2003 04:51:14 -0000 1.2
@@ -61,7 +61,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.web.hack.GeronimoWebApplicationContext;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.WebApplicationContext;
1.6 +68 -111 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebApplication.java
Index: AbstractWebApplication.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebApplication.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractWebApplication.java 27 Aug 2003 10:32:05 -0000 1.5
+++ AbstractWebApplication.java 8 Sep 2003 04:51:14 -0000 1.6
@@ -57,34 +57,29 @@
package org.apache.geronimo.web;
import java.net.URI;
-
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.LinkRef;
import javax.naming.NamingException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.geronimo.common.AbstractComponent;
+import org.apache.geronimo.core.service.AbstractComponent;
+
import org.w3c.dom.Document;
-/* -------------------------------------------------------------------------------------- */
/**
* AbstractWebApplication
- *
- * Instances are created by a deployer. The deployer finds the
+ *
+ * Instances are created by a deployer. The deployer finds the
* WebContainer and associates it with the WebApplication.
- *
+ *
* @version $Revision$ $Date$
*/
-public abstract class AbstractWebApplication
- extends AbstractComponent
- implements WebApplication
-{
+public abstract class AbstractWebApplication extends AbstractComponent implements WebApplication {
/**
- * Class loading delegation model
+ * Class loading delegation model
*/
private boolean java2ClassloadingCompliance = false;
@@ -97,118 +92,86 @@
private Document geronimoXmlDoc = null;
private Context initialContext = null;
- /* -------------------------------------------------------------------------------------- */
- /** Constructor
- * @param location uri of webapp war or dir
- * @param context context path for webapp
- */
- public AbstractWebApplication()
- {
+ public AbstractWebApplication() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- try
- {
+ try {
parser = factory.newDocumentBuilder();
initialContext = new InitialContext();
- }
- catch (FactoryConfigurationError e)
- {
+ } catch (FactoryConfigurationError e) {
throw new AssertionError("No XML parser available");
- }
- catch (ParserConfigurationException e)
- {
+ } catch (ParserConfigurationException e) {
throw new AssertionError("No XML parser available");
- }
- catch (NamingException e)
- {
+ } catch (NamingException e) {
throw new AssertionError("No initial JNDI context");
}
}
- /* -------------------------------------------------------------------------------------- */
- /* Start the webapp. Called by the container or management interface
+ /**
+ * Start the webapp. Called by the container or management interface
* @throws Exception
* @throws IllegalStateException
- * @see org.apache.geronimo.common.Component#start()
*/
- public void doStart() throws Exception
- {
+ public void doStart() throws Exception {
if (getContainer() == null)
throw new IllegalStateException("WebApplication must have a container set before START can be called");
//probably not necessary if deployer wil do this on our behalf
- // set up the JNDI context for this webapp
+ // set up the JNDI context for this webapp
//setupENC();
-
+
//setupClassLoader();
}
- /* -------------------------------------------------------------------------------------- */
- /* Stop the webapp. Called by the container, or by mangement
+ /**
+ * Stop the webapp. Called by the container, or by mangement
* interface
- *
- * @see org.apache.geronimo.common.Component#stop()
*/
- public void doStop()
- {
-
+ public void doStop() {
}
- /* -------------------------------------------------------------------------------------- */
- /* Return the list of Servlets of this webapp
+ /**
+ * Return the list of Servlets of this webapp
* @return
* @see org.apache.geronimo.web.WebApplication#getServlets()
*/
- public String[] getServlets()
- {
+ public String[] getServlets() {
Document doc = getDeploymentDescriptorDocument();
return null;
}
- /* -------------------------------------------------------------------------------------- */
- /*
+ /**
* @return
* @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptor()
*/
- public String getDeploymentDescriptor()
- {
- try
- {
+ public String getDeploymentDescriptor() {
+ try {
parseWebXml();
-
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new IllegalStateException(e.toString());
}
-
return null;
}
- /* -------------------------------------------------------------------------------------- */
- /* Get the URI of the web.xml deployment descriptor
+ /**
+ * Get the URI of the web.xml deployment descriptor
* @return
* @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptorURI()
*/
- public URI getDeploymentDescriptorURI()
- {
+ public URI getDeploymentDescriptorURI() {
return webXmlURI;
}
- /* -------------------------------------------------------------------------------------- */
- /* Get the Document representing the web.xml descriptor
+ /**
+ * Get the Document representing the web.xml descriptor
* @return
* @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptorDocument()
*/
- public Document getDeploymentDescriptorDocument()
- {
+ public Document getDeploymentDescriptorDocument() {
//TODO - may not be required depending on deployer interface
- try
- {
+ try {
parseWebXml();
return webXmlDoc;
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new IllegalStateException(e.toString());
}
@@ -216,66 +179,61 @@
//the geronimo methods may not be required, depending on the interface to the deployer
- public URI getGeronimoDeploymentDescriptorURI()
- {
+ public URI getGeronimoDeploymentDescriptorURI() {
return geronimoXmlURI;
}
- public Document getGeronimoDeploymentDescriptorDocument()
- {
+ public Document getGeronimoDeploymentDescriptorDocument() {
return geronimoXmlDoc;
}
- public String getGeronimoDeploymentDescriptor()
- {
+ public String getGeronimoDeploymentDescriptor() {
//TODO
return null;
}
-
-
- /* -------------------------------------------------------------------------------------- */
- /** Setter for classloading compliance. If true, then classloading will
+
+
+ /**
+ * Setter for classloading compliance. If true, then classloading will
* delegate first to parent classloader a la Java2 spec. If false, then
* webapps wanting to load class will try their own context class loader first.
* @param state
*/
- public void setJava2ClassloadingCompliance(boolean state)
- {
+ public void setJava2ClassloadingCompliance(boolean state) {
java2ClassloadingCompliance = state;
}
- /* -------------------------------------------------------------------------------------- */
- /**Getter for classloading compliance.
- * @see setJava2ClassloadingCompliance
- * @return
+ /**
+ * Getter for classloading compliance.
+ * @return truen if application is using Java 2 compliant class loading
*/
- public boolean getJava2ClassloadingCompliance()
- {
+ public boolean getJava2ClassloadingCompliance() {
return java2ClassloadingCompliance;
}
- /* -------------------------------------------------------------------------------------- */
- /** Parse the deployment descriptor, if it hasn't been already
+ /**
+ * Parse the deployment descriptor, if it hasn't been already
*
* @exception Exception if an error occurs
*/
- protected synchronized void parseWebXml() throws Exception
- {
- if (webXmlURI == null)
+ protected synchronized void parseWebXml() throws Exception {
+ if (webXmlURI == null) {
return;
-
- if (webXmlDoc != null)
+ }
+ if (webXmlDoc != null) {
return;
+ }
webXmlDoc = parser.parse(webXmlURI.toString());
}
- protected synchronized void parseGeronimoXml() throws Exception
- {
- if (geronimoXmlURI == null)
+ protected synchronized void parseGeronimoXml() throws Exception {
+ if (geronimoXmlURI == null) {
return;
- if (geronimoXmlDoc != null)
+ }
+ if (geronimoXmlDoc != null) {
return;
+ }
geronimoXmlDoc = parser.parse(geronimoXmlURI.toString());
}
@@ -285,25 +243,24 @@
{
//parse the standard descriptor
parseWebXml();
-
+
//parse the geronimo web descriptor?
parseGeronimoXml();
-
+
//create the java:comp/env context
Context enc = null;
-
+
//populate the resources
-
+
//populate the ejbs
-
+
//populate the UserTransaction
enc.bind ("UserTransaction", new LinkRef ("javax.transaction.UserTransaction"));
-
+
//populate the security
-
+
//secure the context as read-only (if necessary)
-
+
}
*/
-
}
1.7 +76 -116 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractWebContainer.java 27 Aug 2003 10:32:05 -0000 1.6
+++ AbstractWebContainer.java 8 Sep 2003 04:51:14 -0000 1.7
@@ -57,143 +57,118 @@
package org.apache.geronimo.web;
import java.net.URI;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.geronimo.common.AbstractContainer;
-import org.apache.geronimo.common.Component;
+import org.apache.geronimo.core.service.AbstractContainer;
+import org.apache.geronimo.core.service.Component;
+
import org.w3c.dom.Document;
-/* -------------------------------------------------------------------------------------- */
/**
* AbstractWebContainer
- *
+ *
* Base class for web containers.
*
* @version $Revision$ $Date$
*/
-public abstract class AbstractWebContainer
- extends AbstractContainer
- implements WebContainer
-{
+public abstract class AbstractWebContainer extends AbstractContainer implements WebContainer {
/**
* Location of the default web.xml file
*/
private URI defaultWebXmlURI = null;
/**
- * Parsed default web.xml
+ * Parsed default web.xml
*/
private Document defaultWebXmlDoc = null;
-
/**
* Controls unpacking of wars to tmp runtime location
*/
private boolean unpackWars = true;
-
private final DocumentBuilder parser;
-
-
- /* -------------------------------------------------------------------------------------- */
/**
- * Constructor
+ * Constructor
*/
- public AbstractWebContainer()
- {
+ public AbstractWebContainer() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- try
- {
+ try {
parser = factory.newDocumentBuilder();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new AssertionError("No XML parser available");
}
}
- /* -------------------------------------------------------------------------------------- */
/**
- * Creates a WebApplication from the url and associates it with this container.
- * @param url the location of the web application to deploy
- * @throws Exception
- * @see org.apache.geronimo.web.WebContainer#deploy(java.lang.String)
- * @todo this is likely to change when the deployment interface becomes available
- */
- public void deploy(String uri) throws Exception
- {
+ * Creates a WebApplication from the url and associates it with this container.
+ * @param url the location of the web application to deploy
+ * @throws Exception
+ * @see org.apache.geronimo.web.WebContainer#deploy(java.lang.String)
+ * @todo this is likely to change when the deployment interface becomes available
+ */
+ public void deploy(String uri) throws Exception {
//TODO what will be the interface to the deployer?
-
+
//sort out the contextPath - if the geronimo web descriptor doesn't
//provide one, and there is no application descriptor, then it will be
//the name of the webapp. NOTE, we need to somehow access
//these descriptors - is it by JSR88 beans or by xml?
String contextPath = null;
-
+
//this is only necessary for compilation, the interface to the deployer will change
URI location = new URI(uri);
-
- WebApplication webapp = createWebApplication ();
+
+ WebApplication webapp = createWebApplication();
webapp.setURI(location);
webapp.setContextPath(contextPath);
- addComponent (webapp);
+ addComponent(webapp);
}
-
- /* -------------------------------------------------------------------------------------- */
- /** Create a WebApplication suitable to the container's type.
+ /**
+ * Create a WebApplication suitable to the container's type.
* @return WebApplication instance, preferably derived from AbstractWebApplication suitable to the container
*/
- public abstract WebApplication createWebApplication ();
-
-
-
- /* -------------------------------------------------------------------------------------- */
+ public abstract WebApplication createWebApplication();
+
/**
* Get the URI of the web defaults.
* @return the location of the default web.xml file for this container
*/
- public URI getDefaultWebXmlURI()
- {
+ public URI getDefaultWebXmlURI() {
return defaultWebXmlURI;
}
- /* -------------------------------------------------------------------------------------- */
- /**Set a uri of a web.xml containing defaults for this container.
+ /**
+ * Set a uri of a web.xml containing defaults for this container.
* @param uri the location of the default web.xml file
*/
- public void setDefaultWebXmlURI(URI uri)
- {
+ public void setDefaultWebXmlURI(URI uri) {
defaultWebXmlURI = uri;
}
- /* -------------------------------------------------------------------------------------- */
- /**Get the parsed web defaults
+ /**
+ * Get the parsed web defaults
* @return
*/
- public Document getDefaultWebXmlDoc()
- {
+ public Document getDefaultWebXmlDoc() {
return defaultWebXmlDoc;
}
-
- /* -------------------------------------------------------------------------------------- */
- /**Parse the web defaults descriptor
+ /**
+ * Parse the web defaults descriptor
* @throws Exception
*/
- protected void parseWebDefaults() throws Exception
- {
+ protected void parseWebDefaults() throws Exception {
if (defaultWebXmlURI == null)
return;
defaultWebXmlDoc = parser.parse(defaultWebXmlURI.toString());
}
- /* -------------------------------------------------------------------------------------- */
- /*
+ /**
* @return
* @see org.apache.geronimo.web.WebContainer#getUnpackWars()
*/
@@ -202,8 +177,7 @@
// return unpackWars;
//}
- /* -------------------------------------------------------------------------------------- */
- /*
+ /**
* @param state
* @see org.apache.geronimo.web.WebContainer#setUnpackWars(boolean)
*/
@@ -212,88 +186,74 @@
// unpackWars = state;
//}
- /* -------------------------------------------------------------------------------------- */
- /* Add a component to this container's containment hierarchy
- * @see org.apache.geronimo.common.Container#addComponent(org.apache.geronimo.common.Component)
+ /**
+ * Add a component to this container's containment hierarchy
+ * @see org.apache.geronimo.core.service.Container#addComponent(org.apache.geronimo.core.service.Component)
*/
- public void addComponent(Component component)
- {
+ public void addComponent(Component component) {
super.addComponent(component);
-
- if (component instanceof WebConnector)
- webConnectorAdded((WebConnector)component);
- else if (component instanceof WebApplication)
- webApplicationAdded((WebApplication)component);
- else if (component instanceof WebAccessLog)
- webAccessLogAdded ((WebAccessLog)component);
- }
-
- /* -------------------------------------------------------------------------------------- */
- /* Remove a component from this container's hierarchy
- * @see org.apache.geronimo.common.Container#removeComponent(org.apache.geronimo.common.Component)
- */
- public void removeComponent(Component component)
- {
- if (component instanceof WebConnector)
- webConnectorRemoval((WebConnector)component);
- else if (component instanceof WebApplication)
- webApplicationRemoval((WebApplication)component);
-
+
+ if (component instanceof WebConnector) {
+ webConnectorAdded((WebConnector) component);
+ } else if (component instanceof WebApplication) {
+ webApplicationAdded((WebApplication) component);
+ } else if (component instanceof WebAccessLog) {
+ webAccessLogAdded((WebAccessLog) component);
+ }
+ }
+
+ /**
+ * Remove a component from this container's hierarchy
+ * @see org.apache.geronimo.core.service.Container#removeComponent(org.apache.geronimo.core.service.Component)
+ */
+ public void removeComponent(Component component) {
+ if (component instanceof WebConnector) {
+ webConnectorRemoval((WebConnector) component);
+ } else if (component instanceof WebApplication) {
+ webApplicationRemoval((WebApplication) component);
+ }
+
super.removeComponent(component);
}
-
-
- /* -------------------------------------------------------------------------------------- */
+
/**
* Method called by addComponent after a WebConnector has been added.
* @param connector
*/
- protected void webConnectorAdded(WebConnector connector)
- {
+ protected void webConnectorAdded(WebConnector connector) {
}
-
- /* -------------------------------------------------------------------------------------- */
/**
* Method called by addComponment after a WebApplication has been added.
* @param connector
*/
- protected void webApplicationAdded(WebApplication connector)
- {
+ protected void webApplicationAdded(WebApplication connector) {
}
-
-
- /* -------------------------------------------------------------------------------------- */
+
/**
* @param log
*/
- protected void webAccessLogAdded (WebAccessLog log)
- {
+ protected void webAccessLogAdded(WebAccessLog log) {
}
-
- /* -------------------------------------------------------------------------------------- */
+
/**
* Method called by removeComponent before a WebConnector has been removed.
* @param connector
*/
- protected void webConnectorRemoval(WebConnector connector)
- {
+ protected void webConnectorRemoval(WebConnector connector) {
}
- /* -------------------------------------------------------------------------------------- */
/**
* Method called by removeComponment before a WebApplication has been removed.
* @param connector
*/
- protected void webApplicationRemoval(WebApplication connector)
- {
+ protected void webApplicationRemoval(WebApplication connector) {
}
-
- /* -------------------------------------------------------------------------------------- */
- /** Remove an access log service from the container
+
+ /**
+ * Remove an access log service from the container
* @param log
*/
- protected void webAccessLogRemoval (WebAccessLog log)
- {
+ protected void webAccessLogRemoval(WebAccessLog log) {
}
}
1.3 +13 -16 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebAccessLog.java
Index: WebAccessLog.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebAccessLog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebAccessLog.java 27 Aug 2003 10:32:05 -0000 1.2
+++ WebAccessLog.java 8 Sep 2003 04:51:14 -0000 1.3
@@ -58,29 +58,26 @@
import java.net.URI;
-import org.apache.geronimo.common.Component;
+import org.apache.geronimo.core.service.Component;
-/* -------------------------------------------------------------------------------------- */
/**
* WebAccessLog
- *
- *
+ *
* @version $Revision$ $Date$
*/
-public interface WebAccessLog extends Component
-{
- public void setLogLocation (URI uri);
-
- public URI getLogLocation ();
-
+public interface WebAccessLog extends Component {
+ public void setLogLocation(URI uri);
+
+ public URI getLogLocation();
+
// extendedNCSAFormat
-
+
// rollover retention days
-
+
// date format
-
+
// append
-
+
// buffering
-
+
}
1.6 +32 -38 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebApplication.java
Index: WebApplication.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebApplication.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebApplication.java 27 Aug 2003 10:32:05 -0000 1.5
+++ WebApplication.java 8 Sep 2003 04:51:14 -0000 1.6
@@ -58,66 +58,60 @@
import java.net.URI;
-import org.apache.geronimo.common.Component;
+import org.apache.geronimo.core.service.Component;
+
import org.w3c.dom.Document;
-/* -------------------------------------------------------------------------------------- */
/**
- * WebApplication
- * This interface represents a web application deployable within
- * a WebContainer.
- *
- * It supports the JSR077 WebModule attribute servlets[]
+ * The WebApplication interface represents a web application deployable within a WebContainer.
+ *
+ * It supports the J2EE Management WebModule attribute servlets[]
*
* @version $Revision$ $Date$
*/
public interface WebApplication extends Component {
-
- /* -------------------------------------------------------------------------------------- */
- /**Get the url of the webapp
+ /**
+ * Get the url of the webapp
* @return
*/
public URI getURI();
-
+
public void setURI(URI uri);
-
-
- /*-------------------------------------------------------------------------------- */
- /** JSR077 WebModule method to expose the
+
+
+ /**
+ * JSR077 WebModule method to expose the
* names of all servlets contained within this webapp.
- *
+ *
* @return Names of all servlets contained by this webapp
*/
public String[] getServlets();
-
+
public String getContextPath();
-
+
public void setContextPath(String path);
-
+
public String getDeploymentDescriptor();
-
+
public URI getDeploymentDescriptorURI();
-
+
public Document getDeploymentDescriptorDocument();
-
+
public String getGeronimoDeploymentDescriptor();
-
+
public URI getGeronimoDeploymentDescriptorURI();
-
+
public Document getGeronimoDeploymentDescriptorDocument();
-
- /* -------------------------------------------------------------------------------------- */
- /**Getter for the class loader delegation model for this webapp
- * @return
- */
- public boolean getJava2ClassloadingCompliance ();
-
- /* -------------------------------------------------------------------------------------- */
- /**Set the class loading delegation model for this web application
+
+ /**
+ * Getter for the class loader delegation model for this webapp
+ * @return
+ */
+ public boolean getJava2ClassloadingCompliance();
+
+ /**
+ * Set the class loading delegation model for this web application
* @param state
*/
- public void setJava2ClassloadingCompliance (boolean state );
-
-
-
+ public void setJava2ClassloadingCompliance(boolean state);
}
1.3 +29 -34 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebConnector.java
Index: WebConnector.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebConnector.java 27 Aug 2003 10:32:05 -0000 1.2
+++ WebConnector.java 8 Sep 2003 04:51:14 -0000 1.3
@@ -56,65 +56,60 @@
package org.apache.geronimo.web;
-import org.apache.geronimo.common.Component;
+import org.apache.geronimo.core.service.Component;
-/* -------------------------------------------------------------------------------------- */
/**
* WebConnector
- *
- *
+ *
* @version $Revision$ $Date$
*/
-public interface WebConnector extends Component
-{
-
- /*-------------------------------------------------------------------------------- */
- /** Port number of connector
- * @param port number on which to listen
- */
+public interface WebConnector extends Component {
+ /**
+ * Port number of connector
+ * @param port number on which to listen
+ */
public void setPort(int port);
public int getPort();
- /*-------------------------------------------------------------------------------- */
- /** Protocol of connector
- * @param protocol eg http, https, ftp etc
- */
+ /**
+ * Protocol of connector
+ * @param protocol eg http, https, ftp etc
+ */
public void setProtocol(String protocol);
public String getProtocol();
- /*-------------------------------------------------------------------------------- */
- /** Interface of connector
- * @param iface (hostname or IP) on which to listen
- */
+ /**
+ * Interface of connector
+ * @param iface (hostname or IP) on which to listen
+ */
public void setInterface(String iface);
public String getInterface();
- /*-------------------------------------------------------------------------------- */
- /** Maximum number of connections supported by connector
- * @param maxConnects
- */
+ /**
+ * Maximum number of connections supported by connector
+ * @param maxConnects
+ */
public void setMaxConnections(int maxConnects);
public int getMaxConnections();
- /*-------------------------------------------------------------------------------- */
- /** Maximum time (in ms) that a connection can be idle
+ /**
+ * Maximum time (in ms) that a connection can be idle
* before the connector will close it.
- * @param maxIdleTime time in msec
- */
+ * @param maxIdleTime time in msec
+ */
public void setMaxIdleTime(int maxIdleTime);
public int getMaxIdleTime();
- /*-------------------------------------------------------------------------------- */
- /** Names of contexts that must be registered and started
- * in the associated web container before this connector will
- * accept connections.
- * @param contexts
- */
+ /**
+ * Names of contexts that must be registered and started in the associated web container before
+ * this connector will accept connections.
+ * @param contexts
+ */
public void setContexts(String[] contexts);
public String[] getContexts();
1.5 +28 -36 incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebContainer.java
Index: WebContainer.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebContainer.java 27 Aug 2003 10:32:05 -0000 1.4
+++ WebContainer.java 8 Sep 2003 04:51:14 -0000 1.5
@@ -58,64 +58,56 @@
import java.net.URI;
-import org.apache.geronimo.common.Container;
+import org.apache.geronimo.core.service.Container;
+
import org.w3c.dom.Document;
/*
* WebContainer
- *
- *
+ *
+ *
* @version $Revision$ $Date$
*/
-public interface WebContainer extends Container
-{
- /*-------------------------------------------------------------------------------- */
- /** Deploy a web application. Convenience method to
+public interface WebContainer extends Container {
+ /**
+ * Deploy a web application. Convenience method to
* have the container create the WebApplication and add it to itself.
- * @param uri
- * @throws Exception
- */
+ * @param uri
+ * @throws Exception
+ */
public void deploy(String uri) throws Exception;
-
-
- /*-------------------------------------------------------------------------------- */
- /** Set up a web.xml descriptor for the Container to use as
- * defaults.
- * @param url
- */
+ /**
+ * Set up a web.xml descriptor for the Container to use as defaults.
+ * @param uri
+ */
public void setDefaultWebXmlURI(URI uri);
- /*-------------------------------------------------------------------------------- */
- /** Get the uri of the default web.xml descriptor used
+ /**
+ * Get the uri of the default web.xml descriptor used
* by this container.
- * @return
- */
+ * @return
+ */
public URI getDefaultWebXmlURI();
-
-
- /* -------------------------------------------------------------------------------------- */
- /**Get the parsed web defaults
+
+ /**
+ * Get the parsed web defaults
* @return
*/
- public Document getDefaultWebXmlDoc ();
-
+ public Document getDefaultWebXmlDoc();
-
- /* -------------------------------------------------------------------------------------- */
- /** Control if wars will be unpacked to temporary location or not
+ /**
+ * Control if wars will be unpacked to temporary location or not
* @param state
* @todo this might be handled by the deployer instead
*/
//public void setUnpackWars (boolean state);
-
- /* -------------------------------------------------------------------------------------- */
- /**Getter for whether wars will be unpacked to temporary location or not
+
+ /**
+ * Getter for whether wars will be unpacked to temporary location or not
* @return
* @todo this might be handled by the deployer instead
*/
//public boolean getUnpackWars ();
-
-
}
1.3 +18 -30 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JettyWebConnector.java 27 Aug 2003 10:32:05 -0000 1.2
+++ JettyWebConnector.java 8 Sep 2003 04:51:14 -0000 1.3
@@ -56,48 +56,44 @@
package org.apache.geronimo.web.jetty;
-import org.apache.geronimo.common.AbstractComponent;
+import org.apache.geronimo.core.service.AbstractComponent;
import org.apache.geronimo.web.WebConnector;
+
import org.mortbay.http.HttpListener;
/**
* @version $Revision$ $Date$
*/
-public class JettyWebConnector extends AbstractComponent implements WebConnector
-{
+public class JettyWebConnector extends AbstractComponent implements WebConnector {
private HttpListener listener;
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#setPort(int)
*/
- public void setPort(int port)
- {
+ public void setPort(int port) {
listener.setPort(port);
}
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#getPort()
*/
- public int getPort()
- {
+ public int getPort() {
return listener.getPort();
}
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#setProtocol(java.lang.String)
*/
- public void setProtocol(String protocol)
- {
- // TODO. We have a choice here - if the protocol changes then create a new listener
- // and copy over all the parameters from the old listener OR this class can store all the
+ public void setProtocol(String protocol) {
+ // TODO. We have a choice here - if the protocol changes then create a new listener
+ // and copy over all the parameters from the old listener OR this class can store all the
// parameters and only create a listener when it is started.
}
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#getProtocol()
*/
- public String getProtocol()
- {
+ public String getProtocol() {
// TODO Auto-generated method stub
return null;
}
@@ -105,8 +101,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#setInterface(java.lang.String)
*/
- public void setInterface(String iface)
- {
+ public void setInterface(String iface) {
// TODO Auto-generated method stub
}
@@ -114,8 +109,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#getInterface()
*/
- public String getInterface()
- {
+ public String getInterface() {
// TODO Auto-generated method stub
return null;
}
@@ -123,8 +117,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#setMaxConnections(int)
*/
- public void setMaxConnections(int maxConnects)
- {
+ public void setMaxConnections(int maxConnects) {
// TODO Auto-generated method stub
}
@@ -132,8 +125,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#getMaxConnections()
*/
- public int getMaxConnections()
- {
+ public int getMaxConnections() {
// TODO Auto-generated method stub
return 0;
}
@@ -141,8 +133,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#setMaxIdleTime(int)
*/
- public void setMaxIdleTime(int maxIdleTime)
- {
+ public void setMaxIdleTime(int maxIdleTime) {
// TODO Auto-generated method stub
}
@@ -150,8 +141,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#getMaxIdleTime()
*/
- public int getMaxIdleTime()
- {
+ public int getMaxIdleTime() {
// TODO Auto-generated method stub
return 0;
}
@@ -159,8 +149,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#setContexts(java.lang.String[])
*/
- public void setContexts(String[] contexts)
- {
+ public void setContexts(String[] contexts) {
// TODO Auto-generated method stub
}
@@ -168,8 +157,7 @@
/* (non-Javadoc)
* @see org.apache.geronimo.web.WebConnector#getContexts()
*/
- public String[] getContexts()
- {
+ public String[] getContexts() {
// TODO Auto-generated method stub
return null;
}
1.4 +3 -7 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JettyWebContainer.java 27 Aug 2003 10:32:05 -0000 1.3
+++ JettyWebContainer.java 8 Sep 2003 04:51:14 -0000 1.4
@@ -56,11 +56,8 @@
package org.apache.geronimo.web.jetty;
-import java.net.URI;
-
import org.apache.geronimo.web.AbstractWebContainer;
import org.apache.geronimo.web.WebApplication;
-import org.mortbay.jetty.Server;
/**
* Base class for jetty web containers.
@@ -68,9 +65,8 @@
* @version $Revision$ $Date$
*/
public class JettyWebContainer extends AbstractWebContainer {
-
- public WebApplication createWebApplication ()
- {
+
+ public WebApplication createWebApplication() {
//TODO
return null;
}