[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: starksm Date: 02/04/09 16:23:55 Modified:jetty/src/main/org/jboss/jetty Tag: Branch_2_4 Jetty.java Log: Honor the virtual host setting from the metadata Revision ChangesPath No revision No revision 1.9.2.11 +3 -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.9.2.10 retrieving revision 1.9.2.11 diff -u -r1.9.2.10 -r1.9.2.11 --- Jetty.java4 Apr 2002 18:25:12 - 1.9.2.10 +++ Jetty.java9 Apr 2002 23:23:55 - 1.9.2.11 @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -// $Id: Jetty.java,v 1.9.2.10 2002/04/04 18:25:12 starksm Exp $ +// $Id: Jetty.java,v 1.9.2.11 2002/04/09 23:23:55 starksm Exp $ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... @@ -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.9.2.10 $ + * @version $Revision: 1.9.2.11 $ * * pbRevisions:/b * @@ -399,7 +399,7 @@ app.setDefaultsDescriptor (getWebDefault()); - String virtualHost=null; + String virtualHost=wa.getMetaData().getVirtualHost(); addContext(virtualHost, app); try ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell Date: 02/04/04 21:40:10 Modified:jetty/src/main/org/jboss/jetty Jetty.java Log: lose unecessary fix Revision ChangesPath 1.45 +3 -5 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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Jetty.java22 Mar 2002 10:19:08 - 1.44 +++ Jetty.java5 Apr 2002 05:40:10 - 1.45 @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -// $Id: Jetty.java,v 1.44 2002/03/22 10:19:08 janb Exp $ +// $Id: Jetty.java,v 1.45 2002/04/05 05:40:10 jules_gosnell Exp $ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... @@ -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.44 $ + * @version $Revision: 1.45 $ * * pbRevisions:/b * @@ -380,13 +380,11 @@ if (getContext(null, contextPath, 0)!=null) _log.warn(A WebApplication is already deployed in context '+contextPath+' - proceed at your own risk.); - String fixedWarUrl=warUrl+(warUrl.endsWith(/)?:/); - // deploy the WebApp WebApplicationContext app= new JBossWebApplicationContext(this, contextPath, descriptorParser, wa, _parser, -fixedWarUrl); +warUrl); // configure whether the context is to flatten the classes in ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: janb
Date: 02/03/22 02:19:09
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
Set both Principal and Credential to null when finished handling a request.
Revision ChangesPath
1.44 +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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Jetty.java17 Mar 2002 19:02:25 - 1.43
+++ Jetty.java22 Mar 2002 10:19:08 - 1.44
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.43 2002/03/17 19:02:25 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.44 2002/03/22 10:19:08 janb Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -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.43 $
+ * @version $Revision: 1.44 $
*
* pbRevisions:/b
*
@@ -531,7 +531,8 @@
}
finally
{
- SecurityAssociation.setPrincipal(null);
+SecurityAssociation.setPrincipal(null);
+SecurityAssociation.setCredential(null);
}
}
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 02/03/17 11:02:25
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
touch up
Revision ChangesPath
1.43 +54 -66contrib/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.java27 Feb 2002 03:14:49 - 1.42
+++ Jetty.java17 Mar 2002 19:02:25 - 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 $
*
* pbRevisions:/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 @@
}
}
-
-
-
-
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: janb
Date: 02/02/26 19:14:49
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
Ensured security info attached with ThreadLocals is removed after a request has been
processed.
Revision ChangesPath
1.42 +32 -2 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Jetty.java24 Feb 2002 05:08:29 - 1.41
+++ Jetty.java27 Feb 2002 03:14:49 - 1.42
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.41 2002/02/24 05:08:29 janb Exp $
+// $Id: Jetty.java,v 1.42 2002/02/27 03:14:49 janb Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -17,6 +17,7 @@
//--
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.net.URL;
import java.util.Hashtable;
import javax.xml.parsers.DocumentBuilder;
@@ -32,6 +33,11 @@
import org.jboss.logging.Logger;
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.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;
@@ -44,7 +50,7 @@
*
* @author a href=mailto:[EMAIL PROTECTED];Julian Gosnell/a
* @author a href=mailto:[EMAIL PROTECTED];Andreas Schaefer/a.
- * @version $Revision: 1.41 $
+ * @version $Revision: 1.42 $
*
* pbRevisions:/b
*
@@ -516,4 +522,28 @@
{
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);
+}
+}
+
+
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: schaefera
Date: 01/12/01 13:29:45
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
Fixed the problem with Jetty on Windows as well as remove the obsolete
DataCollector from the J2eeDeployers.
Revision ChangesPath
1.25 +37 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Jetty.java2001/11/29 01:21:29 1.24
+++ Jetty.java2001/12/01 21:29:44 1.25
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.24 2001/11/29 01:21:29 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.25 2001/12/01 21:29:44 schaefera Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -26,6 +26,24 @@
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.Resource;
+/**
+ * description
+ *
+ * @author a href=mailto:[EMAIL PROTECTED];Julian Gosnell/a
+ * @author a href=mailto:[EMAIL PROTECTED];Andreas Schaefer/a.
+ * @version $Revision: 1.25 $
+ *
+ * pbRevisions:/b
+ *
+ * pb20011201 andreas:/b
+ * ul
+ * liFixed fixURL() because it is to Unix centric. Right now the
+ * method looks for the last part of the JAR URL (file:/...) which
+ * should be the JAR file name and add a /. before them. Now this
+ * should work for Windows as well (the problem with windows was that
+ * after file: came the DRIVE LETTER which created a wrong URL).
+ * /ul
+ **/
public class Jetty
extends org.mortbay.jetty.Server
{
@@ -278,12 +296,23 @@
static String
fixURL(String url)
{
-String protocol=file:;
-int index=url.indexOf(protocol)+protocol.length();
-return
- url.substring(0,index)+
- File.separator +
- .+
- url.substring(index, url.length());
+// Get the separator of the JAR URL and the file reference
+int index = url.indexOf( '!' );
+if( index = 0 ) {
+ index = url.lastIndexOf( '/', index );
+} else {
+ index = url.lastIndexOf( '/' );
+}
+// Now add a ./ before the JAR file to add a different path
+if( index = 0 ) {
+ return
+url.substring( 0, index ) +
+/. +
+url.substring( index );
+} else {
+ // Now forward slash found then there is severe problem with
+ // the URL but here we just ignore it
+ return url;
+}
}
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 01/11/28 15:54:57
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
move jetty.xml and webdefault.xml into jetty-plugin.sar
Revision ChangesPath
1.23 +18 -4 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Jetty.java2001/11/28 01:22:25 1.22
+++ Jetty.java2001/11/28 23:54:57 1.23
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.22 2001/11/28 01:22:25 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.23 2001/11/28 23:54:57 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -25,6 +25,8 @@
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.Resource;
+import java.io.File;
+
public class Jetty
extends org.mortbay.jetty.Server
{
@@ -98,6 +100,7 @@
public synchronized void
setWebDefault(String webDefault)
{
+webDefault=fixURL(findResourceInJar(webDefault).toString());
_webDefault=webDefault;
}
@@ -119,13 +122,11 @@
if (configUrl==null)
return;
-_log.info(CONFIG IS: +configUrl);
-_log.info(CONFIG IS: +findResourceInJar(configUrl));
+configUrl=fixURL(findResourceInJar(configUrl).toString());
try
{
_log.info(loading config: +configUrl);
- // configure(findResourceInJar(configUrl).toString());
configure(configUrl);
_log.info(loaded config: +configUrl);
_configuration=configUrl;
@@ -272,5 +273,18 @@
}
return url;
+ }
+
+ // work around broken JarURLConnection caching...
+ private String
+fixURL(String url)
+ {
+String protocol=file:;
+int index=url.indexOf(protocol)+protocol.length();
+return
+ url.substring(0,index)+
+ File.separator +
+ .+
+ url.substring(index, url.length());
}
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java JettyService.java
User: jules_gosnell
Date: 01/11/28 17:21:29
Modified:jetty/src/main/org/jboss/jetty Jetty.java JettyService.java
Log:
moving jetty.properties into jetty-plugin.sar
Revision ChangesPath
1.24 +3 -4 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Jetty.java2001/11/28 23:54:57 1.23
+++ Jetty.java2001/11/29 01:21:29 1.24
@@ -5,13 +5,14 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.23 2001/11/28 23:54:57 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.24 2001/11/29 01:21:29 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
package org.jboss.jetty;
+import java.io.File;
import java.io.FileNotFoundException;
import java.net.URL;
import java.util.Hashtable;
@@ -25,8 +26,6 @@
import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.Resource;
-import java.io.File;
-
public class Jetty
extends org.mortbay.jetty.Server
{
@@ -276,7 +275,7 @@
}
// work around broken JarURLConnection caching...
- private String
+ static String
fixURL(String url)
{
String protocol=file:;
1.33 +7 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- JettyService.java 2001/11/28 01:22:25 1.32
+++ JettyService.java 2001/11/29 01:21:29 1.33
@@ -5,12 +5,14 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.32 2001/11/28 01:22:25 jules_gosnell Exp $
+// $Id: JettyService.java,v 1.33 2001/11/29 01:21:29 jules_gosnell Exp $
package org.jboss.jetty;
+
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -19,16 +21,15 @@
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.AbstractWebContainer;
import org.jboss.web.WebApplication;
-import org.mortbay.util.Log;
-
import org.mortbay.jetty.jmx.DebugMBean;
+import org.mortbay.util.Log;
/**
* A service to launch jetty from JMX.
*
* @see related
* @author a href=mailto:[EMAIL PROTECTED];Julian Gosnell/a
- * @version $Revision: 1.32 $
+ * @version $Revision: 1.33 $
*/
// NOTES
@@ -109,7 +110,8 @@
throws IOException
{
String props=jetty.properties;
-InputStream propertiesIn =
getClass().getClassLoader().getResourceAsStream(props);
+//InputStream propertiesIn =
getClass().getClassLoader().getResourceAsStream(props);
+InputStream propertiesIn = new
URL(Jetty.fixURL(getClass().getClassLoader().getResource(props).toString())).openStream();
if (propertiesIn == null)
throw new IOException(failed to load +props);
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java JettyService.java JettyServiceMBean.java
User: starksm Date: 01/11/25 19:24:53 Modified:jetty/src/main/org/jboss/jetty Jetty.java JettyService.java JettyServiceMBean.java Log: Drop the org.jboss.ejb.DeploymentException in favor of the org.jboss.deployment.DeploymentException class. Use the org.jboss.logging.Logger.getLogger factory method. Revision ChangesPath 1.21 +2 -2 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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Jetty.java2001/11/25 14:52:49 1.20 +++ Jetty.java2001/11/26 03:24:53 1.21 @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -// $Id: Jetty.java,v 1.20 2001/11/25 14:52:49 jules_gosnell Exp $ +// $Id: Jetty.java,v 1.21 2001/11/26 03:24:53 starksm Exp $ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... @@ -18,7 +18,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.log4j.Category; -import org.jboss.ejb.DeploymentException; +import org.jboss.deployment.DeploymentException; import org.jboss.web.AbstractWebContainer.WebDescriptorParser; import org.jboss.web.WebApplication; import org.mortbay.http.HttpHandler; 1.30 +4 -4 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- JettyService.java 2001/11/25 16:02:00 1.29 +++ JettyService.java 2001/11/26 03:24:53 1.30 @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -// $Id: JettyService.java,v 1.29 2001/11/25 16:02:00 jules_gosnell Exp $ +// $Id: JettyService.java,v 1.30 2001/11/26 03:24:53 starksm Exp $ package org.jboss.jetty; @@ -20,7 +20,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.log4j.Category; -import org.jboss.ejb.DeploymentException; +import org.jboss.deployment.DeploymentException; import org.jboss.system.ServiceMBeanSupport; import org.jboss.web.AbstractWebContainer.WebDescriptorParser; import org.jboss.web.AbstractWebContainer; @@ -37,7 +37,7 @@ * * @see related * @author a href=mailto:[EMAIL PROTECTED];Julian Gosnell/a - * @version $Revision: 1.29 $ + * @version $Revision: 1.30 $ */ // NOTES @@ -80,7 +80,7 @@ public static final String NAME = Jetty; - Category _log= Category.getInstance(super.category.getName()+.+getName()); + Category _log= Category.getInstance(getClass().getName()); DebugMBean _debug = null; JettyMBean _mbean = null; Jetty_jetty = null; 1.9 +3 -3 contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java Index: JettyServiceMBean.java === RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- JettyServiceMBean.java2001/09/16 17:14:17 1.8 +++ JettyServiceMBean.java2001/11/26 03:24:53 1.9 @@ -5,18 +5,18 @@ * See terms of license at gnu.org. */ -// $Id: JettyServiceMBean.java,v 1.8 2001/09/16 17:14:17 jules_gosnell Exp $ +// $Id: JettyServiceMBean.java,v 1.9 2001/11/26 03:24:53 starksm Exp $ package org.jboss.jetty; -import org.jboss.ejb.DeploymentException; +import org.jboss.deployment.DeploymentException; /** * description * * @see related * @author a href=mailto:[EMAIL PROTECTED];Sebastien Alborini/a - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public interface JettyServiceMBean extends org.jboss.web.AbstractWebContainerMBean ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 01/09/23 12:42:33
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
sort out obscure NPE
Revision ChangesPath
1.18 +3 -2 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Jetty.java2001/09/18 23:06:49 1.17
+++ Jetty.java2001/09/23 19:42:32 1.18
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.17 2001/09/18 23:06:49 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.18 2001/09/23 19:42:32 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -54,7 +54,8 @@
synchronized void
setJettyHome(String jettyHome) // not public
{
-System.setProperty(jetty.home, jettyHome);
+if (jettyHome!=null)
+ System.setProperty(jetty.home, jettyHome);
}
public synchronized String
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 01/09/23 12:51:36
Modified:jetty/src/main/org/jboss/jetty Tag: Branch_2_4 Jetty.java
Log:
fix obscure NPE
Revision ChangesPath
No revision
No revision
1.9.2.6 +3 -2 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.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- Jetty.java2001/09/18 23:04:34 1.9.2.5
+++ Jetty.java2001/09/23 19:51:36 1.9.2.6
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.9.2.5 2001/09/18 23:04:34 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.9.2.6 2001/09/23 19:51:36 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -54,7 +54,8 @@
synchronized void
setJettyHome(String jettyHome) // not public
{
-System.setProperty(jetty.home, jettyHome);
+if (jettyHome!=null)
+ System.setProperty(jetty.home, jettyHome);
}
public synchronized String
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java JettyResolver.java JettyService.java
User: jules_gosnell
Date: 01/09/18 16:04:34
Modified:jetty/src/main/org/jboss/jetty Tag: Branch_2_4 Jetty.java
JettyResolver.java JettyService.java
Log:
add some synchronisation, logging improvements and general tidying up
Revision ChangesPath
No revision
No revision
1.9.2.5 +18 -19contrib/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.9.2.4
retrieving revision 1.9.2.5
diff -u -r1.9.2.4 -r1.9.2.5
--- Jetty.java2001/09/17 23:10:57 1.9.2.4
+++ Jetty.java2001/09/18 23:04:34 1.9.2.5
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.9.2.4 2001/09/17 23:10:57 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.9.2.5 2001/09/18 23:04:34 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -14,7 +14,7 @@
import java.io.FileNotFoundException;
import java.net.URL;
-import java.util.HashMap;
+import java.util.Hashtable;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.log4j.Category;
@@ -35,6 +35,8 @@
{
super();
_log=log;
+
+// resolver should be populated from a configuration file.
_resolver=new JettyResolver(_log);
URL
stdWeb=findResourceInJar(org.mortbay.http.HttpServer,org/mortbay/jetty/servlet/web.dtd);
@@ -49,13 +51,13 @@
// jettyHome property
//
- void
+ synchronized void
setJettyHome(String jettyHome) // not public
{
System.setProperty(jetty.home, jettyHome);
}
- public String
+ public synchronized String
getJettyHome()
{
return System.getProperty(jetty.home);
@@ -67,13 +69,13 @@
boolean _unpackWars=false;
- public void
+ public synchronized void
setUnpackWars(boolean unpackWars)
{
_unpackWars=unpackWars;
}
- public boolean
+ public synchronized boolean
getUnpackWars()
{
return _unpackWars;
@@ -85,13 +87,13 @@
String _webDefault;
- public void
+ public synchronized void
setWebDefault(String webDefault)
{
_webDefault=webDefault;
}
- public String
+ public synchronized String
getWebDefault()
{
return _webDefault;
@@ -103,7 +105,7 @@
String _configuration=null;
- public void
+ public synchronized void
setConfiguration(String configUrl)
{
if (configUrl==null)
@@ -118,12 +120,11 @@
}
catch (Exception e)
{
- _log.info(problem loading configuration: +configUrl);
- e.printStackTrace();
+ _log.error(problem loading configuration: +configUrl, e);
}
}
- public String
+ public synchronized String
getConfiguration()
{
return _configuration;
@@ -133,7 +134,7 @@
// 'deploy' interface
//
- HashMap _deployed = new HashMap();
+ Hashtable _deployed = new Hashtable(); // use Hashtable because is is synchronised
public WebApplication
deploy(String contextPath, String warUrl, WebDescriptorParser descriptorParser)
@@ -207,8 +208,7 @@
}
catch (Exception e)
{
- _log.info(problem deploying +warUrl+ to +contextPath);
- e.printStackTrace();
+ _log.error(problem deploying +warUrl+ to +contextPath, e);
throw new DeploymentException(e.getMessage());
}
@@ -235,7 +235,7 @@
}
catch (Exception e)
{
- _log.info(problem undeploying +warUrl);
+ _log.error(problem undeploying +warUrl, e);
throw new DeploymentException(e.getMessage());
}
}
@@ -257,12 +257,11 @@
try
{
- ClassLoader loader=Class.forName(sibling).getClassLoader();
- url=loader.getResource(name);
+ url=getClass().getClassLoader().getResource(name);
}
catch (Exception e)
{
- _log.info(Could not find resource: +name);
+ _log.error(Could not find resource: +name, e);
}
return url;
1.1.6.3 +7 -2 contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java
Index: JettyResolver.java
===
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -u -r1.1.6.2 -r1.1.6.3
--- JettyResolver.java2001/09/17 23:10:57 1.1.6.2
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java JettyResolver.java JettyService.java
User: jules_gosnell
Date: 01/09/18 16:06:49
Modified:jetty/src/main/org/jboss/jetty Jetty.java JettyResolver.java
JettyService.java
Log:
add some synchronisation, logging improvements and general tidying up.
Revision ChangesPath
1.17 +18 -19contrib/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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Jetty.java2001/09/16 17:14:17 1.16
+++ Jetty.java2001/09/18 23:06:49 1.17
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: Jetty.java,v 1.16 2001/09/16 17:14:17 jules_gosnell Exp $
+// $Id: Jetty.java,v 1.17 2001/09/18 23:06:49 jules_gosnell Exp $
// A Jetty HttpServer with the interface expected by JBoss'
// J2EEDeployer...
@@ -14,7 +14,7 @@
import java.io.FileNotFoundException;
import java.net.URL;
-import java.util.HashMap;
+import java.util.Hashtable;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.log4j.Category;
@@ -35,6 +35,8 @@
{
super();
_log=log;
+
+// resolver should be populated from a configuration file.
_resolver=new JettyResolver(_log);
URL
stdWeb=findResourceInJar(org.mortbay.http.HttpServer,org/mortbay/jetty/servlet/web.dtd);
@@ -49,13 +51,13 @@
// jettyHome property
//
- void
+ synchronized void
setJettyHome(String jettyHome) // not public
{
System.setProperty(jetty.home, jettyHome);
}
- public String
+ public synchronized String
getJettyHome()
{
return System.getProperty(jetty.home);
@@ -67,13 +69,13 @@
boolean _unpackWars=false;
- public void
+ public synchronized void
setUnpackWars(boolean unpackWars)
{
_unpackWars=unpackWars;
}
- public boolean
+ public synchronized boolean
getUnpackWars()
{
return _unpackWars;
@@ -85,13 +87,13 @@
String _webDefault;
- public void
+ public synchronized void
setWebDefault(String webDefault)
{
_webDefault=webDefault;
}
- public String
+ public synchronized String
getWebDefault()
{
return _webDefault;
@@ -103,7 +105,7 @@
String _configuration=null;
- public void
+ public synchronized void
setConfiguration(String configUrl)
{
if (configUrl==null)
@@ -118,12 +120,11 @@
}
catch (Exception e)
{
- _log.info(problem loading configuration: +configUrl);
- e.printStackTrace();
+ _log.error(problem loading configuration: +configUrl, e);
}
}
- public String
+ public synchronized String
getConfiguration()
{
return _configuration;
@@ -133,7 +134,7 @@
// 'deploy' interface
//
- HashMap _deployed = new HashMap();
+ Hashtable _deployed = new Hashtable(); // use Hashtable because is is synchronised
public WebApplication
deploy(String contextPath, String warUrl, WebDescriptorParser descriptorParser)
@@ -207,8 +208,7 @@
}
catch (Exception e)
{
- _log.info(problem deploying +warUrl+ to +contextPath);
- e.printStackTrace();
+ _log.error(problem deploying +warUrl+ to +contextPath, e);
throw new DeploymentException(e.getMessage());
}
@@ -235,7 +235,7 @@
}
catch (Exception e)
{
- _log.info(problem undeploying +warUrl);
+ _log.error(problem undeploying +warUrl, e);
throw new DeploymentException(e.getMessage());
}
}
@@ -257,12 +257,11 @@
try
{
- ClassLoader loader=Class.forName(sibling).getClassLoader();
- url=loader.getResource(name);
+ url=getClass().getClassLoader().getResource(name);
}
catch (Exception e)
{
- _log.info(Could not find resource: +name);
+ _log.error(Could not find resource: +name, e);
}
return url;
1.4 +7 -2 contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java
Index: JettyResolver.java
===
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JettyResolver.java2001/09/17 23:07:47 1.3
+++ JettyResolver.java2001/09/18 23:06:49 1.4
@@ -16,6 +16,11 @@
import org.xml.sax.EntityResolver;
import
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell Date: 01/09/14 13:22:20 Modified:jetty/src/main/org/jboss/jetty Tag: Branch_2_4 Jetty.java Log: test Revision ChangesPath No revision No revision 1.9.2.1 +2 -0 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.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- Jetty.java2001/06/13 23:01:27 1.9 +++ Jetty.java2001/09/14 20:22:20 1.9.2.1 @@ -9,6 +9,8 @@ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... +//test + package org.jboss.jetty; import com.mortbay.HTTP.HttpHandler; ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell Date: 01/09/14 13:27:16 Modified:jetty/src/main/org/jboss/jetty Tag: Branch_2_4 Jetty.java Log: another test Revision ChangesPath No revision No revision 1.9.2.2 +1 -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.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- Jetty.java2001/09/14 20:22:20 1.9.2.1 +++ Jetty.java2001/09/14 20:27:16 1.9.2.2 @@ -5,11 +5,11 @@ * See terms of license at gnu.org. */ +// $Id: Jetty.java,v 1.9.2.2 2001/09/14 20:27:16 jules_gosnell Exp $ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... -//test package org.jboss.jetty; ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell Date: 01/09/05 17:02:09 Modified:jetty/src/main/org/jboss/jetty Jetty.java Log: relocate jboss-web.dtd which seems to have moved Revision ChangesPath 1.14 +1 -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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Jetty.java2001/08/09 20:57:22 1.13 +++ Jetty.java2001/09/06 00:02:09 1.14 @@ -39,7 +39,7 @@ URL stdWeb=findResourceInJar(com.mortbay.HTTP.HttpServer,com/mortbay/Jetty/Servlet/web.dtd); _resolver.put(-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN, stdWeb); -URL jbossWeb=findResourceInJar(org.jboss.jetty.JettyService,jboss-web.dtd); +URL jbossWeb=findResourceInJar(org.jboss.web.AbstractWebContainer,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); } ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 01/06/23 03:06:07
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
alter log message
Revision ChangesPath
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Jetty.java2001/06/21 22:20:12 1.10
+++ Jetty.java2001/06/23 10:06:07 1.11
@@ -98,7 +98,7 @@
setJettyHome(String jettyHome) // not public
{
System.setProperty(jetty.home, jettyHome);
-Log.event(setting JettyHome to +jettyHome);
+Log.event(set JettyHome to +jettyHome);
}
public String
@@ -270,6 +270,10 @@
{
return _deployed.containsKey(warUrl);
}
+
+ //
+ // Utils
+ //
static public URL
findResourceInJar(String sibling, String name)
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 01/06/21 15:20:12
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
sort out some logging
Revision ChangesPath
1.10 +1 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Jetty.java2001/06/13 23:01:27 1.9
+++ Jetty.java2001/06/21 22:20:12 1.10
@@ -98,7 +98,7 @@
setJettyHome(String jettyHome) // not public
{
System.setProperty(jetty.home, jettyHome);
-Log.event(setting jettyHome to +jettyHome);
+Log.event(setting JettyHome to +jettyHome);
}
public String
@@ -117,7 +117,6 @@
setUnpackWars(boolean unpackWars)
{
_unpackWars=unpackWars;
-Log.event(setting unpackWars to +_unpackWars);
}
public boolean
@@ -136,7 +135,6 @@
setWebDefault(String webDefault)
{
_webDefault=webDefault;
-Log.event(setting webDefault to +_webDefault);
}
public String
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell Date: 01/06/13 16:01:27 Modified:jetty/src/main/org/jboss/jetty Jetty.java Log: lose old code Revision ChangesPath 1.9 +0 -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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Jetty.java2001/06/10 21:36:10 1.8 +++ Jetty.java2001/06/13 23:01:27 1.9 @@ -219,12 +219,6 @@ Log.event(no jboss-web.xml found); } -/* - // the latest.. - descriptorParser.parseWebAppDescriptors(wa.getClassLoader(), - wa.getWebApp(), - wa.getJbossWeb()); -*/ // Add a handler to perform the JBoss integration during start() HttpHandler handler = new SetupHandler(descriptorParser, wa); app.addHandler(handler); ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell Date: 01/06/10 14:36:10 Modified:jetty/src/main/org/jboss/jetty Jetty.java Log: hardwire (yeugh!!) another DTD resolution that seems to be needed Revision ChangesPath 1.8 +1 -0 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Jetty.java2001/06/04 23:33:11 1.7 +++ Jetty.java2001/06/10 21:36:10 1.8 @@ -87,6 +87,7 @@ URL jbossWeb=findResourceInJar(org.jboss.jetty.JettyService,jboss-web.dtd); _resolver.put(-//jBoss//DTD Web Application 2.2//EN, jbossWeb); +_resolver.put(-//JBoss//DTD Web Application 2.2//EN, jbossWeb); } // ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java JettyService.java
User: jules_gosnell
Date: 01/05/23 14:14:08
Modified:jetty/src/main/org/jboss/jetty Jetty.java JettyService.java
Log:
move up onto the latest version of AbstractWebContainer
Revision ChangesPath
1.6 +7 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Jetty.java2001/05/21 22:02:36 1.5
+++ Jetty.java2001/05/23 21:14:08 1.6
@@ -28,6 +28,7 @@
import org.jboss.ejb.DeploymentException;
import org.jboss.web.WebApplication;
+import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -166,7 +167,7 @@
Hashtable _deployed = new Hashtable();
public WebApplication
-deploy(String path, String warUrl)
+deploy(String path, String warUrl, WebDescriptorParser descriptorParser)
throws DeploymentException
{
WebApplication wa=new WebApplication();
@@ -215,6 +216,11 @@
Log.event(no jboss-web.xml found);
}
+ // the latest..
+ descriptorParser.parseWebAppDescriptors(wa.getClassLoader(),
+ wa.getWebApp(),
+ wa.getJbossWeb());
+
// finally - start the WebApp...
app.start();
1.13 +13 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JettyService.java 2001/05/18 22:01:38 1.12
+++ JettyService.java 2001/05/23 21:14:08 1.13
@@ -17,6 +17,7 @@
import javax.management.*;
import org.jboss.web.AbstractWebContainer;
+import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.WebApplication;
import org.jboss.logging.Log;
import org.jboss.logging.Logger;
@@ -35,7 +36,7 @@
*
* @see related
* @author a href=mailto:[EMAIL PROTECTED];Julian Gosnell/a
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
class JettyMBean extends HttpServerMBean
@@ -111,6 +112,15 @@
Jetty_jetty = null;
MBeanServer _server = null;
+ public
+JettyService()
+ {
+// moved this from initialise-time to construct-time to ensure
+// that logging models are connected before configure-time (via
+// MLET file) which is done before initialise-time.
+ensureLogging();
+ }
+
//
// hack city...
//
@@ -224,7 +234,6 @@
ensureService()
throws Exception
{
-ensureLogging();
ensureProperties();
ensureJetty();
ensureMBean();
@@ -315,10 +324,10 @@
//
public WebApplication
-performDeploy(String path, String warUrl)
+performDeploy(String path, String warUrl, WebDescriptorParser parser)
throws DeploymentException
{
-return _jetty.deploy(path, warUrl);
+return _jetty.deploy(path, warUrl, parser);
}
public void
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java JettyService.java JettyServiceMBean.java
User: jules_gosnell
Date: 01/05/18 15:01:38
Modified:jetty/src/main/org/jboss/jetty Jetty.java JettyService.java
JettyServiceMBean.java
Log:
move onto Scott's AbstractWebContainer and add support for ENC stuff
Revision ChangesPath
1.4 +96 -118 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jetty.java2001/05/08 23:02:30 1.3
+++ Jetty.java2001/05/18 22:01:38 1.4
@@ -11,149 +11,80 @@
package org.jboss.jetty;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.net.URL;
-import org.jboss.ejb.DeploymentException;
import com.mortbay.Jetty.Servlet.WebApplicationContext;
-import com.mortbay.HTTP.HandlerContext;
import com.mortbay.Util.Code;
import com.mortbay.Util.Log;
+import com.mortbay.Util.Resource;
import com.mortbay.XML.XmlConfiguration;
import com.mortbay.XML.XmlParser;
-import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
+import java.io.*;
+import java.net.URL;
+import java.util.Hashtable;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.lang.reflect.Method;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
-abstract class JndiHandler
- extends org.xml.sax.helpers.DefaultHandler
-{
- String _tmp; // temporary buffer
+import org.jboss.ejb.DeploymentException;
- public void
-startElement (String uri, String localName, String qName, Attributes attrs)
-throws SAXException
- {
-_tmp=;
- }
+import org.jboss.web.WebApplication;
- // is this how it should be done ?
- public void
-characters (char[] buf, int offset, int len)
-throws SAXException
- {
-_tmp+=new String(buf,offset,len);
- }
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
- public void
-endElement(String uri, String localName, String qName)
-throws SAXException
+class JettyResolver
+ implements EntityResolver
+{
+ protected Hashtable _table=new Hashtable();
+
+ public InputSource
+resolveEntity (String publicId, String systemId)
{
+System.err.println(resolving +publicId+ : +systemId);
-String methodName=set_+localName.replace('-','_').toLowerCase();
-Class[] params={_tmp.getClass()};
+URL url=(URL)_table.get(publicId);
-try
+if (url==null)
{
- Method method=getClass().getMethod(methodName,params);
- Object[] args={_tmp};
- method.invoke(this, args);
+ System.err.println(no resolution for +publicId);
}
-catch(NoSuchMethodException e)
+else
{
- Log.warning(NYI: tag - +localName+ (+methodName+));
+ System.err.println(resolved +publicId+ : +url);
+ try
+ {
+ InputSource is=new InputSource(url.openConnection().getInputStream());
+ return is;
+ }
+ catch (IOException e)
+ {
+ System.err.println(bad resolution +publicId+ : +url);
+ }
}
-catch(Exception e)
-{
- e.printStackTrace();
-}
- }
-
- public void
-doBinding(String from, String to)
- {
-Log.event(binding: +from+ to +to);
- }
-
- static
- {
-// ensure comp/env context exists...
-try
-{
- Context context = (Context)(new InitialContext().lookup(java:comp));
- context = context.createSubcontext(env);
- Log.event(Ensured existence of java:comp/env subcontext);
-}
-catch(Exception exception)
-{
- exception.printStackTrace();
-}
+return null;
}
-}
-// The ejb-ref element is used to declare a reference to an enterprise
-// bean.
-
-class EJBRefHandler extends JndiHandler
-{
- // The ejb-ref-name element contains the name of an EJB
- // reference. This is the JNDI name that the servlet code uses to
- // get a reference to the enterprise bean.
- String _ejbRefName;
- // The ejb-ref-type element contains the expected java class type of
- // the referenced EJB.
- String _ejbRefType;
- // The ejb-home element contains the fully qualified name of the
- // EJB's home interface.
- String _home;
- // The ejb-remote element contains the fully qualified name of the
- // EJB's remote interface.
- String _remote;
- // The ejb-link element is used in the ejb-ref element to specify
- // that an EJB reference is linked to an EJB in an encompassing
- // Java2 Enterprise Edition (J2EE) application package. The value of
- // the ejb-link element must
[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java
User: jules_gosnell
Date: 01/05/08 16:02:30
Modified:jetty/src/main/org/jboss/jetty Jetty.java
Log:
ensure MBean corresponding to WebApp is properly registered and deregistered
Revision ChangesPath
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jetty.java2001/05/02 21:13:16 1.2
+++ Jetty.java2001/05/08 23:02:30 1.3
@@ -243,6 +243,8 @@
// deploy the WebApp
WebApplicationContext app=new WebApplicationContext(this, path+/*);
+ addContext(null, app);
+
// Use the same ClassLoader as JBoss - this allows optimisation
// of calls to EJBs...
app.setClassLoader(Thread.currentThread().getContextClassLoader());
@@ -281,8 +283,11 @@
try
{
app.stop();
+
removeContext(app);
- _deployed.remove(app);
+
+ _deployed.remove(warUrl);
+
Log.event(successfully undeployed +warUrl);
}
catch (Exception e)
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
