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 Changes Path
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.java 2001/11/21 23:13:01 1.19
+++ Jetty.java 2001/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 <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
// NOTES
@@ -264,7 +264,7 @@
_log.warn("WARNING: Jetty has already been stopped");
if (!isDestroyed())
{
- // _jetty.destroy();
+ _jetty.destroy();
_jetty=null;
_mbean=null;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
