User: jules_gosnell
Date: 02/03/17 11:02:25
Modified: jetty/src/main/org/jboss/jetty Jetty.java
Log:
touch up
Revision Changes Path
1.43 +54 -66 contrib/jetty/src/main/org/jboss/jetty/Jetty.java
Index: Jetty.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/Jetty.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Jetty.java 27 Feb 2002 03:14:49 -0000 1.42
+++ Jetty.java 17 Mar 2002 19:02:25 -0000 1.43
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.42 2002/02/27 03:14:49 janb Exp $
+// $Id: Jetty.java,v 1.43 2002/03/17 19:02:25 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -31,13 +31,13 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.jetty.xml.JettyResolver;
import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.WebApplication;
-import org.jboss.security.SecurityAssociation;
import org.mortbay.http.HttpContext;
+import org.mortbay.http.HttpException;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;
-import org.mortbay.http.HttpException;
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.MultiException;
import org.mortbay.xml.XmlConfiguration;
@@ -50,7 +50,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.42 $
+ * @version $Revision: 1.43 $
*
* <p><b>Revisions:</b>
*
@@ -111,37 +111,35 @@
_log.error("problem building descriptor parser", e);
}
-
// check support for JSP compilation...
if
(findResourceInJar("com/sun/tools/javac/v8/resources/javac.properties")==null)
_log.warn("JSP compilation requires $JAVA_HOME/lib/tools.jar on your
JBOSS_CLASSPATH");
}
-
-
- //----------------------------------------
- // class loader delegation policy property
- //----------------------------------------
- boolean _loaderCompliance = true;
- /**
- * @param loaderCompliance if true, Jetty delegates class loading
- *to parent class loader first, false implies servlet spec 2.3 compliance
- */
- public synchronized void setJava2ClassLoadingCompliance (boolean
loaderCompliance)
- {
- _loaderCompliance = loaderCompliance;
- }
-
- /**
- * @return true if Java2 style class loading delegation, false if
- *servlet2.3 spec compliance
- */
- public synchronized boolean getJava2ClassLoadingCompliance ()
- {
- return _loaderCompliance;
- }
-
-
+ //----------------------------------------
+ // class loader delegation policy property
+ //----------------------------------------
+ boolean _loaderCompliance = true;
+
+ /**
+ * @param loaderCompliance if true, Jetty delegates class loading
+ *to parent class loader first, false implies servlet spec 2.3 compliance
+ */
+ public synchronized void
+ setJava2ClassLoadingCompliance (boolean loaderCompliance)
+ {
+ _loaderCompliance = loaderCompliance;
+ }
+
+ /**
+ * @return true if Java2 style class loading delegation, false if
+ *servlet2.3 spec compliance
+ */
+ public synchronized boolean
+ getJava2ClassLoadingCompliance ()
+ {
+ return _loaderCompliance;
+ }
//----------------------------------------
// unpackWars property
@@ -194,8 +192,6 @@
if (_log.isDebugEnabled())
_log.debug ("webdefault specification is: "+_webDefault);
-
-
}
public synchronized String
@@ -276,23 +272,21 @@
return _subjectAttributeName;
}
-
-
-
//----------------------------------------
// configuration property
//----------------------------------------
- public Element getConfigurationElement ()
+ public Element
+ getConfigurationElement()
{
return _configElement;
-
}
/**
* @param configElement XML fragment from jboss-service.xml
*/
- public void setConfigurationElement (Element configElement)
+ public void
+ setConfigurationElement(Element configElement)
{
// convert to an xml string to pass into Jetty's normal
@@ -350,7 +344,8 @@
/* Actually perform the configuration
* @param xmlString
*/
- private void setXMLConfiguration (String xmlString)
+ private void
+ setXMLConfiguration(String xmlString)
{
try
@@ -364,10 +359,6 @@
}
}
-
-
-
-
//----------------------------------------------------------------------------
// 'deploy' interface
//----------------------------------------------------------------------------
@@ -378,7 +369,6 @@
deploy(String contextPath, String warUrl, WebDescriptorParser descriptorParser)
throws DeploymentException
{
- _log.info("DEPLOYING contextPath:"+contextPath+" warUrl:"+warUrl);
WebApplication wa=new WebApplication();
try
@@ -523,27 +513,25 @@
return _service.getCompileClasspath(cl);
}
-
- /** Override service method to allow ditching of security info
- * after a request has been processed
- * @param request
- * @param response
- * @return
- * @exception IOException
- * @exception HttpException
- */
- public HttpContext service(HttpRequest request,HttpResponse response)
- throws IOException, HttpException
- {
- try
- {
- return super.service(request,response);
- }
- finally
- {
- SecurityAssociation.setPrincipal(null);
- }
+ /** Override service method to allow ditching of security info
+ * after a request has been processed
+ * @param request
+ * @param response
+ * @return
+ * @exception IOException
+ * @exception HttpException
+ */
+ public HttpContext
+ service(HttpRequest request,HttpResponse response)
+ throws IOException, HttpException
+ {
+ try
+ {
+ return super.service(request,response);
}
-
-
+ finally
+ {
+ SecurityAssociation.setPrincipal(null);
+ }
+ }
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
