[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java
User: starksm
Date: 02/04/11 01:57:52
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Log:
Update for changes in the AbstractWebContainer layer
Revision ChangesPath
1.37 +1 -32
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JBossWebApplicationContext.java 9 Apr 2002 20:55:52 - 1.36
+++ JBossWebApplicationContext.java 11 Apr 2002 08:57:51 - 1.37
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.36 2002/04/09 20:55:52 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.37 2002/04/11 08:57:51 starksm Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -266,37 +266,6 @@
_webApp.setClassLoader(Thread.currentThread().getContextClassLoader());
_webApp.setName(getDisplayName());
_webApp.setAppData(this);
-
- try
- {
- // MANDATORY - web.xml
- Resource web=getResource("/WEB-INF/web.xml");
- _webApp.setWebApp(_parser.parse(new
InputSource(web.toString())).getDocumentElement());
- }
- catch (Exception e)
- {
- _log.error("problem locating web.xml", e);
- }
-
- try
- {
- // OPTIONAL - jboss-web.xml
- Resource jbossWeb=getResource("/WEB-INF/jboss-web.xml");
- if (jbossWeb!=null)
-
_webApp.setJbossWeb(_parser.parse(jbossWeb.getInputStream()).getDocumentElement());
- }
- catch (FileNotFoundException e)
- {
- _log.debug("no jboss-web.xml found");
- }
- catch (IOException e)
- {
- _log.debug("no jboss-web.xml found");
- }
- catch (Exception e)
- {
-_log.error("problem locating jboss-web.xml", e);
- }
try
{
1.46 +5 -6 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Jetty.java5 Apr 2002 05:40:10 - 1.45
+++ Jetty.java11 Apr 2002 08:57:51 - 1.46
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.45 2002/04/05 05:40:10 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.46 2002/04/11 08:57:51 starksm Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -50,7 +50,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.45 $
+ * @version $Revision: 1.46 $
*
* Revisions:
*
@@ -366,11 +366,10 @@
Hashtable _deployed = new Hashtable(); // use Hashtable because is is synchronised
public WebApplication
-deploy(String contextPath, String warUrl, WebDescriptorParser descriptorParser)
+deploy(WebApplication wa, String warUrl, WebDescriptorParser descriptorParser)
throws DeploymentException
{
-WebApplication wa=new WebApplication();
-
+String contextPath = wa.getMetaData().getContextRoot();
try
{
wa.setURL(new URL(warUrl));
@@ -397,7 +396,7 @@
app.setDefaultsDescriptor (getWebDefault());
- String virtualHost=null;
+ String virtualHost=wa.getMetaData().getVirtualHost();
addContext(virtualHost, app);
try
1.56 +5 -5 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JettyService.java 3 Apr 2002 08:24:27 - 1.55
+++ JettyService.java 11 Apr 2002 08:57:51 - 1.56
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.55 2002/04/03 08:24:27 user57 Exp $
+// $Id: JettyService.java,v 1.56 2002/04/11 08:57:51 starksm Exp $
//--
@@ -35,7 +35,7 @@
* A service to launch jetty from JMX.
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
- * @version $Revision: 1.55 $
+ * @version $Revision: 1.56 $
*/
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java JettyServiceMBean.java
User: janb
Date: 02/02/23 21:08:29
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java JettyServiceMBean.java
Log:
Added support for choice of Servlet2.3 or Java2 compliance for class loading
delegation.
Revision ChangesPath
1.28 +8 -12
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JBossWebApplicationContext.java 21 Feb 2002 02:03:57 - 1.27
+++ JBossWebApplicationContext.java 24 Feb 2002 05:08:29 - 1.28
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.27 2002/02/21 02:03:57 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.28 2002/02/24 05:08:29 janb Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -52,11 +52,7 @@
WebDescriptorParser descriptorParser,
WebApplication webApp,
DocumentBuilder parser,
-String warUrl,
-String storageStrategy,
-String snapshotFrequency,
-String notificationPolicy,
-String subjAttrName)
+String warUrl)
throws java.io.IOException
{
@@ -67,13 +63,13 @@
_descriptorParser = descriptorParser;
_webApp = webApp;
_parser = parser;
- _subjAttrName = subjAttrName;
-
+ _subjAttrName = jetty.getSubjectAttributeName();
+
getServletHandler().
setSessionManager(new DistributedHttpSessionManager(this,
- storageStrategy,
- snapshotFrequency,
- notificationPolicy));
+
jetty.getHttpSessionStorageStrategy(),
+
jetty.getHttpSessionSnapshotFrequency(),
+
jetty.getHttpSessionSnapshotNotificationPolicy()));
}
/* */
@@ -162,7 +158,7 @@
ClassLoader _loader=getClassLoader();
if (_loader instanceof org.mortbay.http.ContextLoader)
- ((org.mortbay.http.ContextLoader)_loader).setJava2Compliant(true);
+
((org.mortbay.http.ContextLoader)_loader).setJava2Compliant(_jetty.getJava2ClassLoadingCompliance());
}
String _separator=System.getProperty("path.separator");
1.41 +28 -7 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Jetty.java21 Feb 2002 02:03:57 - 1.40
+++ Jetty.java24 Feb 2002 05:08:29 - 1.41
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.40 2002/02/21 02:03:57 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.41 2002/02/24 05:08:29 janb Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -44,7 +44,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.40 $
+ * @version $Revision: 1.41 $
*
* Revisions:
*
@@ -111,6 +111,31 @@
_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
+ */
+pu
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java
User: jules_gosnell
Date: 02/02/20 18:03:57
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Log:
a few more comments in config files
addition of an FAQ - needs content !
publish JAAS support via JMX interface
Revision ChangesPath
1.27 +15 -36
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JBossWebApplicationContext.java 20 Feb 2002 05:37:23 - 1.26
+++ JBossWebApplicationContext.java 21 Feb 2002 02:03:57 - 1.27
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.26 2002/02/20 05:37:23 janb Exp $
+// $Id: JBossWebApplicationContext.java,v 1.27 2002/02/21 02:03:57 jules_gosnell
Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -40,13 +40,14 @@
extends WebApplicationContext
{
Logger _log;
+ Jetty _jetty;
WebDescriptorParser _descriptorParser;
WebApplication _webApp;
DocumentBuilder _parser;
String _subjAttrName="j_subject";
public
-JBossWebApplicationContext(HttpServer httpServer,
+JBossWebApplicationContext(Jetty jetty,
String contextPathSpec,
WebDescriptorParser descriptorParser,
WebApplication webApp,
@@ -58,10 +59,11 @@
String subjAttrName)
throws java.io.IOException
{
-
- super(httpServer, contextPathSpec, warUrl);
+
+ super(jetty, contextPathSpec, warUrl);
_log = Logger.getLogger(getClass().getName()+"#" +
contextPathSpec);
+ _jetty= jetty;
_descriptorParser = descriptorParser;
_webApp = webApp;
_parser = parser;
@@ -164,44 +166,21 @@
}
String _separator=System.getProperty("path.separator");
- protected String
-URLArrayToClassPath(URL[] urls, String classpath)
-{
- for (int i=urls.length-1; urls!=null && i>-1; i--)
- {
- URL url=urls[i];
- if (url.getProtocol().equals("file"))
- {
- String path=url.getPath();
- // brute force - but should strip out duplicates
- if (classpath.indexOf(path)==-1)
- classpath+=(classpath.length()==0?"":_separator)+path;
- }
- else
- _log.warn("non-file URL encountered in ClassPath URLs");
- }
-
- return classpath;
-}
public String
getFileClassPath()
{
+ String[] entries=_jetty.getCompileClasspath(getClassLoader());
+
+ // this should probably :
+ // 1. be cached
+ // 2. use a StringBuffer
String classpath="";
- for (ClassLoader cl=getClassLoader();
-cl.getParent()!=null;
-cl=cl.getParent())
- {
- if (cl instanceof URLClassLoader)
- classpath=URLArrayToClassPath(((URLClassLoader)cl).getURLs(), classpath);
- else if (cl instanceof MBeanClassLoader)
- classpath=URLArrayToClassPath(((MBeanClassLoader)cl).getURLs(), classpath);
- else
- _log.warn("unknown ClassLoader type ("+cl.getClass().getName()+") -
classpath may be incomplete");
- }
+ for (int i=0; imailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.39 $
+ * @version $Revision: 1.40 $
*
* Revisions:
*
@@ -61,20 +60,24 @@
public class Jetty
extends org.mortbay.jetty.Server
{
- static DocumentBuilderFactory _factory =DocumentBuilderFactory.newInstance();
+ static DocumentBuilderFactory _factory = DocumentBuilderFactory.newInstance();
+
DocumentBuilder _parser;
Logger_log = Logger.getLogger(Jetty.class);
+ JettyService _service;
+
+ // the XML snippet
+ String _xmlConfigString = null;
+
+ // the XML snippet as a DOM element
+ Element _configElement = null;
-// the XML snippet
-String _xmlConfigString = null;
-
-// the XML snippet as a DOM element
-Element _configElement = null;
-
- Jetty()
+ Jetty(JettyService service)
{
super();
+_service=service;
+
// resolver should be populated from a configuration file.
JettyResolver resolver = new JettyResolver();
@@ -84,12 +87,12 @@
URL stdWeb23=findResou
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java JettyServiceMBean.java
User: janb
Date: 02/02/19 21:37:24
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java JettyServiceMBean.java
Log:
Removed necessity for jetty.xml for config.
Revision ChangesPath
1.26 +3 -4
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JBossWebApplicationContext.java 20 Feb 2002 00:15:35 - 1.25
+++ JBossWebApplicationContext.java 20 Feb 2002 05:37:23 - 1.26
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.25 2002/02/20 00:15:35 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.26 2002/02/20 05:37:23 janb Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -52,15 +52,14 @@
WebApplication webApp,
DocumentBuilder parser,
String warUrl,
-String webDefaults,
-boolean unpackWars,
String storageStrategy,
String snapshotFrequency,
String notificationPolicy,
String subjAttrName)
throws java.io.IOException
{
- super(httpServer, contextPathSpec, warUrl, webDefaults, unpackWars);
+
+ super(httpServer, contextPathSpec, warUrl);
_log = Logger.getLogger(getClass().getName()+"#" +
contextPathSpec);
_descriptorParser = descriptorParser;
1.39 +151 -57 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Jetty.java20 Feb 2002 00:15:35 - 1.38
+++ Jetty.java20 Feb 2002 05:37:23 - 1.39
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.38 2002/02/20 00:15:35 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.39 2002/02/20 05:37:23 janb Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -15,11 +15,21 @@
package org.jboss.jetty;
//--
-
+import java.io.ByteArrayOutputStream;
import java.net.URL;
import java.util.Hashtable;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Element;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+
import org.jboss.deployment.DeploymentException;
import org.jboss.jetty.xml.JettyResolver;
import org.jboss.logging.Logger;
@@ -27,7 +37,7 @@
import org.jboss.web.WebApplication;
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.MultiException;
-
+import org.mortbay.xml.XmlConfiguration;
//--
/**
@@ -35,7 +45,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.38 $
+ * @version $Revision: 1.39 $
*
* Revisions:
*
@@ -55,6 +65,12 @@
DocumentBuilder _parser;
Logger_log = Logger.getLogger(Jetty.class);
+// the XML snippet
+String _xmlConfigString = null;
+
+// the XML snippet as a DOM element
+Element _configElement = null;
+
Jetty()
{
super();
@@ -92,22 +108,6 @@
_log.warn("JSP compilation requires $JAVA_HOME/lib/tools.jar on your
JBOSS_CLASSPATH");
}
- //
- // jettyHome property
- //
-
- synchronized void
-setJettyHome(String jettyHome) // not public
- {
-if (jettyHome!=null)
- System.setProperty("jetty.home", jettyHome);
- }
-
- public synchronized String
-getJettyHome()
- {
-return System.getProperty("jetty.home");
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java
User: jules_gosnell
Date: 02/02/19 16:15:36
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Log:
more log guarding/unguarding (DOH!)
Revision ChangesPath
1.25 +3 -2
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JBossWebApplicationContext.java 19 Feb 2002 23:22:32 - 1.24
+++ JBossWebApplicationContext.java 20 Feb 2002 00:15:35 - 1.25
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.24 2002/02/19 23:22:32 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.25 2002/02/20 00:15:35 jules_gosnell
Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -201,7 +201,8 @@
_log.warn("unknown ClassLoader type ("+cl.getClass().getName()+") -
classpath may be incomplete");
}
- _log.info("default JSP CLASSPATH: "+classpath);
+ if (_log.isDebugEnabled())
+ _log.debug("JSP classpath: "+classpath);
return classpath;
}
1.38 +4 -3 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Jetty.java19 Feb 2002 23:22:32 - 1.37
+++ Jetty.java20 Feb 2002 00:15:35 - 1.38
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.37 2002/02/19 23:22:32 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.38 2002/02/20 00:15:35 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -35,7 +35,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.38 $
*
* Revisions:
*
@@ -234,7 +234,8 @@
try
{
- _log.info("loading configuration: "+configUrl);
+ if (_log.isDebugEnabled())
+ _log.debug("loading configuration: "+configUrl);
configure(configUrl);
_log.debug("configuratin loaded");
_configuration=configUrl;
1.49 +6 -10 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- JettyService.java 19 Feb 2002 23:22:32 - 1.48
+++ JettyService.java 20 Feb 2002 00:15:35 - 1.49
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.48 2002/02/19 23:22:32 jules_gosnell Exp $
+// $Id: JettyService.java,v 1.49 2002/02/20 00:15:35 jules_gosnell Exp $
//--
@@ -34,7 +34,7 @@
* A service to launch jetty from JMX.
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
- * @version $Revision: 1.48 $
+ * @version $Revision: 1.49 $
*/
public class JettyService
@@ -115,8 +115,7 @@
// why doesn't this work? - investigate...
//_jetty.setLogSink(logSink);
-if (_log.isDebugEnabled())
- _log.debug("connected JBoss and Jetty Log models");
+_log.debug("connected JBoss and Jetty Log models");
}
/** the usual path separators we know */
@@ -139,8 +138,7 @@
_jetty=tmp; // now we are initialised.
-if (_log.isDebugEnabled())
- _log.debug("Instantiated and configured server");
+_log.debug("Instantiated and configured server");
}
protected void
@@ -152,8 +150,7 @@
{
try
{
- if (_log.isDebugEnabled())
- _log.debug("MBean peers WILL be created for Jetty Contexts");
+ _log.debug("MBean peers WILL be created for Jetty Contexts");
_mbean = new JettyMBean(_jetty);
_debug = new CodeMBean();
@@ -169,8 +166,7 @@
}
else
{
- if (_log.isDebugEnabled())
- _log.debug("MBean peers WILL NOT be created for Jetty Contexts");
+ _log.debug("MBean peers WILL NOT be created for Jetty Contexts");
}
_jetty.setConfiguration
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java JettyServiceMBean.java
User: jules_gosnell
Date: 02/02/19 15:22:32
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java JettyServiceMBean.java
Log:
allow configuration of JAAS support via JMX
Revision ChangesPath
1.24 +6 -3
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JBossWebApplicationContext.java 19 Feb 2002 00:15:29 - 1.23
+++ JBossWebApplicationContext.java 19 Feb 2002 23:22:32 - 1.24
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.23 2002/02/19 00:15:29 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.24 2002/02/19 23:22:32 jules_gosnell
Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -43,6 +43,7 @@
WebDescriptorParser _descriptorParser;
WebApplication _webApp;
DocumentBuilder _parser;
+ String _subjAttrName="j_subject";
public
JBossWebApplicationContext(HttpServer httpServer,
@@ -55,7 +56,8 @@
boolean unpackWars,
String storageStrategy,
String snapshotFrequency,
-String notificationPolicy)
+String notificationPolicy,
+String subjAttrName)
throws java.io.IOException
{
super(httpServer, contextPathSpec, warUrl, webDefaults, unpackWars);
@@ -64,6 +66,7 @@
_descriptorParser = descriptorParser;
_webApp = webApp;
_parser = parser;
+ _subjAttrName = subjAttrName;
getServletHandler().
setSessionManager(new DistributedHttpSessionManager(this,
@@ -91,7 +94,7 @@
if (realmName!=null)
{
// these need to be cached and reused by name...MAYBE - TODO
- getHttpContext().getHttpServer().addRealm(new JBossUserRealm(realmName));
+ getHttpContext().getHttpServer().addRealm(new JBossUserRealm(realmName,
_subjAttrName));
}
// this is causing a printout which implies a separate
1.37 +22 -3 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Jetty.java16 Feb 2002 14:13:22 - 1.36
+++ Jetty.java19 Feb 2002 23:22:32 - 1.37
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.36 2002/02/16 14:13:22 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.37 2002/02/19 23:22:32 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -35,7 +35,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.36 $
+ * @version $Revision: 1.37 $
*
* Revisions:
*
@@ -201,6 +201,24 @@
}
//
+ // subjectAttributeName property
+ //
+
+ String _subjectAttributeName;
+
+ public synchronized void
+setSubjectAttributeName(String subjectAttributeName)
+ {
+_subjectAttributeName=subjectAttributeName;
+ }
+
+ public synchronized String
+getSubjectAttributeName()
+ {
+return _subjectAttributeName;
+ }
+
+ //
// configuration property
//
@@ -262,7 +280,8 @@
fixedWarUrl, getWebDefault(), getUnpackWars(),
getHttpSessionStorageStrategy(),
getHttpSessionSnapshotFrequency(),
-getHttpSessionSnapshotNotificationPolicy());
+getHttpSessionSnapshotNotificationPolicy(),
+getSubjectAttributeName());
String virtualHost=null;
addContext(virtualHost, app);
1.48 +28 -2 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===
RCS file: /cvsroot/jboss/
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java JettyServiceMBean.java
User: jules_gosnell
Date: 02/01/31 16:32:24
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java JettyServiceMBean.java
Log:
some way further to configurable snapshot strategies and intervals,
Revision ChangesPath
1.18 +9 -3
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JBossWebApplicationContext.java 2002/01/22 21:03:03 1.17
+++ JBossWebApplicationContext.java 2002/02/01 00:32:24 1.18
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.17 2002/01/22 21:03:03 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.18 2002/02/01 00:32:24 jules_gosnell
Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -52,7 +52,9 @@
String warUrl,
String webDefaults,
boolean unpackWars,
-String distributedStoreImpl)
+String storageStrategy,
+String snapshotFrequency,
+String notificationPolicy)
throws java.io.IOException
{
super(httpServer, contextPathSpec, warUrl, webDefaults, unpackWars);
@@ -62,7 +64,11 @@
_webApp = webApp;
_parser = parser;
- getServletHandler().setSessionManager(new DistributedHttpSessionManager(this,
distributedStoreImpl));
+ getServletHandler().
+ setSessionManager(new DistributedHttpSessionManager(this,
+ storageStrategy,
+ snapshotFrequency,
+ notificationPolicy));
}
/* */
1.35 +46 -8 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Jetty.java2002/01/22 21:03:03 1.34
+++ Jetty.java2002/02/01 00:32:24 1.35
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.34 2002/01/22 21:03:03 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.35 2002/02/01 00:32:24 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -35,7 +35,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.34 $
+ * @version $Revision: 1.35 $
*
* Revisions:
*
@@ -147,21 +147,57 @@
// distributedStore property
//
- String _distributedStore;
+ String _storageStrategy;
public synchronized void
-setDistributedStore(String distributedStore)
+setHttpSessionStorageStrategy(String storageStrategy)
{
-_distributedStore=distributedStore;
+_storageStrategy=storageStrategy;
}
public synchronized String
-getDistributedStore()
+getHttpSessionStorageStrategy()
{
-return _distributedStore;
+return _storageStrategy;
}
//
+ // snapshotFrequency property
+ //
+
+ String _snapshotFrequency;
+
+ public synchronized void
+setHttpSessionSnapshotFrequency(String snapshotFrequency)
+ {
+_snapshotFrequency=snapshotFrequency;
+ }
+
+ public synchronized String
+getHttpSessionSnapshotFrequency()
+ {
+return _snapshotFrequency;
+ }
+
+ //
+ // snapshotNotificationPolicy property
+ //
+
+ String _snapshotNotificationPolicy;
+
+ public synchronized void
+setHttpSessionSnapshotNotificationPolicy(String snapshotNotificationPolicy)
+ {
+_snapshotNotificationPolicy=snapshotNotificationPolicy;
+ }
+
+ public synchronized String
+getHttpSessionSnapshotNotificationPolicy()
+ {
+return _snapshotNotificationPolicy;
+ }
+
+ //
// configuration property
//--
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java AbstractHttpSessionData.java DistributedSessionManager.java JBossLogSink.java JBossUserRealm.java JettyResolver.java
User: jules_gosnell
Date: 02/01/13 05:26:45
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Removed: jetty/src/main/org/jboss/jetty AbstractHttpSessionData.java
DistributedSessionManager.java JBossLogSink.java
JBossUserRealm.java JettyResolver.java
Log:
split src into dirs
check in latest DistributedSession code
Revision ChangesPath
1.14 +15 -7
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JBossWebApplicationContext.java 2002/01/12 10:57:45 1.13
+++ JBossWebApplicationContext.java 2002/01/13 13:26:45 1.14
@@ -5,20 +5,26 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.13 2002/01/12 10:57:45 jules_gosnell
Exp $
+// $Id: JBossWebApplicationContext.java,v 1.14 2002/01/13 13:26:45 jules_gosnell
Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
+//--
+
package org.jboss.jetty;
+//--
+
import java.io.FileNotFoundException;
import java.net.URL;
import java.net.URLClassLoader;
import javax.xml.parsers.DocumentBuilder;
+import org.jboss.jetty.security.JBossUserRealm;
+import org.jboss.jetty.session.DistributedHttpSessionManager;
+import org.jboss.logging.Logger;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.WebApplication;
-import org.jboss.logging.Logger;
import org.mortbay.http.ContextLoader;
import org.mortbay.http.HttpServer;
import org.mortbay.http.handler.SecurityHandler;
@@ -26,6 +32,8 @@
import org.mortbay.util.Resource;
import org.w3c.dom.Element;
+//--
+
public class
JBossWebApplicationContext
extends WebApplicationContext
@@ -112,12 +120,12 @@
"ejb-ref".equals(element))
{
//_log.info("Don't moan : "+element);
+ }
+ else if ("distributable".equals(element))
+ {
+ _distributed=true;
+ getServletHandler().setSessionManager(new
DistributedHttpSessionManager(this));
}
- // else if ("distributable".equals(element))
- // {
- // _distributed=true;
- // getServletHandler().setSessionManager(new
DistributedSessionManager(this));
- // }
// these are handled by Jetty
else
super.initWebXmlElement(element, node);
1.31 +10 -3 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Jetty.java2001/12/09 06:05:49 1.30
+++ Jetty.java2002/01/13 13:26:45 1.31
@@ -5,29 +5,36 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.30 2001/12/09 06:05:49 user57 Exp $
+// $Id: Jetty.java,v 1.31 2002/01/13 13:26:45 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
+//--
+
package org.jboss.jetty;
+//--
+
import java.net.URL;
import java.util.Hashtable;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.jboss.deployment.DeploymentException;
+import org.jboss.jetty.xml.JettyResolver;
+import org.jboss.logging.Logger;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.WebApplication;
import org.mortbay.jetty.servlet.WebApplicationContext;
-import org.jboss.logging.Logger;
+
+//--
/**
*
*
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
* @author mailto:[EMAIL PROTECTED]";>Andreas Schaefer.
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
*
* Revisions:
*
1.37 +9 -5 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
=
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java
User: jules_gosnell
Date: 01/11/27 17:22:25
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Log:
messing around with DebugMBean stuff
trying to get jetty.xml read out of jetty-plugin.sar
...
Revision ChangesPath
1.4 +17 -18
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JBossWebApplicationContext.java 2001/11/25 14:52:48 1.3
+++ JBossWebApplicationContext.java 2001/11/28 01:22:25 1.4
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.3 2001/11/25 14:52:48 jules_gosnell Exp
$
+// $Id: JBossWebApplicationContext.java,v 1.4 2001/11/28 01:22:25 jules_gosnell Exp
$
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -135,7 +135,6 @@
}
}
-
/**
* return the first JBossSXSecurityHandler, inserting one at the
* beginning of the list, if no other can be found.
@@ -173,31 +172,31 @@
super.initWebXmlElement(element, node);
}
-// public boolean
-// handle(org.mortbay.http.HttpRequest request, org.mortbay.http.HttpResponse
response)
-// throws org.mortbay.http.HttpException, java.io.IOException
-// {
-// Thread.currentThread().setContextClassLoader(getClassLoader());
-// return super.handle(request, response);
-// }
+ // public boolean
+ // handle(org.mortbay.http.HttpRequest request, org.mortbay.http.HttpResponse
response)
+ // throws org.mortbay.http.HttpException, java.io.IOException
+ // {
+ // Thread.currentThread().setContextClassLoader(getClassLoader());
+ // return super.handle(request, response);
+ // }
// hack our class loader to be Java2 compliant - i.e. always
// delegate upwards before looking locally. This will be changed to
// a non-compliant strategy later when JBoss' new ClassLoader is
// ready.
- protected void initClassLoader()
- throws java.net.MalformedURLException, java.io.IOException
- {
- super.initClassLoader();
+ protected void initClassLoader()
+throws java.net.MalformedURLException, java.io.IOException
+{
+ super.initClassLoader();
- ClassLoader _loader=getClassLoader();
- if (_loader instanceof org.mortbay.http.ContextLoader)
+ ClassLoader _loader=getClassLoader();
+ if (_loader instanceof org.mortbay.http.ContextLoader)
((org.mortbay.http.ContextLoader)_loader).setJava2Compliant(true);
- }
+}
- // copy our superclass' version of this, but ensure that servlet
- // api and jasper jars are appended to it...
+ // copy our superclass' version of this, but ensure that servlet
+ // api and jasper jars are appended to it...
public String getFileClassPath()
throws IllegalStateException
1.22 +5 -1 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Jetty.java2001/11/26 03:24:53 1.21
+++ Jetty.java2001/11/28 01:22:25 1.22
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.21 2001/11/26 03:24:53 starksm Exp $
+// $Id: Jetty.java,v 1.22 2001/11/28 01:22:25 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -119,9 +119,13 @@
if (configUrl==null)
return;
+_log.info("CONFIG IS: "+configUrl);
+_log.info("CONFIG IS: "+findResourceInJar(configUrl));
+
try
{
_log.info("loading config: "+configUrl);
+ // configure(findResourceInJar(configUrl).toString());
configure(configUrl);
_log.info("loaded config: "+configUrl);
_configuration=configUrl;
1.32 +18 -3 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JettyService.java 2001/11/26 23:39:22 1.31
+++ JettyService.java 2001/11/28 01:22:25 1.32
@@ -5,7 +5,7 @@
* See terms of l
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java JettyService.java
User: jules_gosnell
Date: 01/11/25 06:52:51
Modified:jetty/src/main/org/jboss/jetty
JBossWebApplicationContext.java Jetty.java
JettyService.java
Log:
tidy up JSP support a little more.
add README
minor changes
Revision ChangesPath
1.3 +7 -8
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
Index: JBossWebApplicationContext.java
===
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JBossWebApplicationContext.java 2001/11/23 02:01:29 1.2
+++ JBossWebApplicationContext.java 2001/11/25 14:52:48 1.3
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JBossWebApplicationContext.java,v 1.2 2001/11/23 02:01:29 jules_gosnell Exp
$
+// $Id: JBossWebApplicationContext.java,v 1.3 2001/11/25 14:52:48 jules_gosnell Exp
$
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -205,18 +205,18 @@
ClassLoader loader = getClassLoader();
if (loader==null)
throw new IllegalStateException("Context classloader not initialized");
+
+ String separator=System.getProperty("path.separator");
+
String fileClassPath =
((loader instanceof ContextLoader)
? ((ContextLoader)loader).getFileClassPath()
- : getClassPath())+
- System.getProperty("path.separator")+
- System.getProperty("java.class.path");
+ : getClassPath())+separator+System.getProperty("java.class.path");
try
{
String jar=findJarByResource("javax/servlet/resources/web-app_2_3.dtd");
- //
jar="/home/jules/cvs/JBoss/3.0/thirdparty/mortbay/jetty/lib/javax.servlet.jar";
- fileClassPath+=jar;
+ fileClassPath+=separator+jar;
}
catch (Exception e)
{
@@ -226,8 +226,7 @@
try
{
String jar=findJarByResource("org/apache/jasper/resources/jsp12.dtd");
- //
jar="/home/jules/cvs/JBoss/3.0/thirdparty/mortbay/jetty/lib/org.apache.jasper.jar";
- fileClassPath+=":"+jar;
+ fileClassPath+=separator+jar;
}
catch (Exception e)
{
1.20 +6 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Jetty.java2001/11/21 23:13:01 1.19
+++ Jetty.java2001/11/25 14:52:49 1.20
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.19 2001/11/21 23:13:01 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.20 2001/11/25 14:52:49 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -39,6 +39,7 @@
// resolver should be populated from a configuration file.
_resolver=new JettyResolver(_log);
+// populate dtd resulver
URL stdWeb22=findResourceInJar("javax/servlet/resources/web-app_2_2.dtd");
_resolver.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN",
stdWeb22);
URL stdWeb23=findResourceInJar("javax/servlet/resources/web-app_2_3.dtd");
@@ -47,6 +48,10 @@
URL jbossWeb=findResourceInJar("org/jboss/metadata/jboss-web.dtd");
_resolver.put("-//jBoss//DTD Web Application 2.2//EN", jbossWeb);
_resolver.put("-//JBoss//DTD Web Application 2.2//EN", jbossWeb);
+
+// check support for JSP compilation...
+if
(findResourceInJar("com/sun/tools/javac/v8/resources/javac.properties")==null)
+ _log.warn("WARNING: JSP compilation requires $JAVA_HOME/lib/tools.jar on your
JBOSS_CLASSPATH");
}
//
1.28 +3 -3 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JettyService.java 2001/11/21 23:13:01 1.27
+++ JettyService.java 2001/11/25 14:52:50 1.28
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.27 2001/11/21 23:13:01 jules_gosnell Exp $
+// $Id: JettyService.java,v 1.28 2001/11/25 14:52:50 jules_gosnell Exp $
package org.jboss.jetty;
@@ -36,7 +36,7 @@
*
* @see
* @author mailto:[EMAIL PROTECTED]";>Julian Gosnell
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
