hammant 2002/11/29 15:50:10
Modified: sevak jetty.xml
sevak/src/demo/conf jetty-config.xml
sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty
JettySevak.java
Log:
Another attempt to get Jetty working
Revision Changes Path
1.5 +7 -5 jakarta-avalon-apps/sevak/jetty.xml
Index: jetty.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/jetty.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetty.xml 5 Nov 2002 22:44:38 -0000 1.4
+++ jetty.xml 29 Nov 2002 23:50:10 -0000 1.5
@@ -160,14 +160,16 @@
<include name="sevak-api.jar"/>
</lib>
- <zipfileset
dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/webapps" prefix="webapps">
- <include name="**/*"/>
- </zipfileset>
-
<lib dir="${jetty.jars.dir}">
- <include name="*.jar"/>
+ <include name="javax.servlet.jar"/>
+ <include name="org.apache.jasper.jar"/>
+ <include name="org.mortbay.jetty-jdk1.2.jar"/>
+ <include name="org.mortbay.jmx.jar"/>
</lib>
+ <zipfileset dir="${build.lib}">
+ <include name="sevak-demo.war"/>
+ </zipfileset>
</sar>
1.4 +1 -1 jakarta-avalon-apps/sevak/src/demo/conf/jetty-config.xml
Index: jetty-config.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/src/demo/conf/jetty-config.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jetty-config.xml 6 Nov 2002 07:54:26 -0000 1.3
+++ jetty-config.xml 29 Nov 2002 23:50:10 -0000 1.4
@@ -11,7 +11,7 @@
<hostname>localhost</hostname>
</sevak>
<sevakTest>
- <Context docBase="/" path="webapps/root"/>
+ <Context docBase="/" path="sevak-demo.war"/>
</sevakTest>
</config>
1.6 +7 -4
jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty/JettySevak.java
Index: JettySevak.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty/JettySevak.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JettySevak.java 6 Nov 2002 07:54:26 -0000 1.5
+++ JettySevak.java 29 Nov 2002 23:50:10 -0000 1.6
@@ -29,6 +29,7 @@
import org.mortbay.util.InetAddrPort;
import org.mortbay.util.Log;
import org.mortbay.http.SocketListener;
+import org.mortbay.http.SocketChannelListener;
/**
@@ -140,10 +141,11 @@
{
try
{
- // This does not work.
- WebApplicationContext ctx = m_server.addWebApplication(m_hostName,
context,
- pathToWebAppFolder.getAbsolutePath());
- System.out.println("deploying " + context + " " +
pathToWebAppFolder.getAbsolutePath() + " to "
+ String webAppURL = pathToWebAppFolder.toURL().toString();
+ // This still does not work.
+ WebApplicationContext ctx = m_server.addWebApplication(m_hostName,
context, webAppURL);
+
+ System.out.println("deploying context=" + context + ", webapp=" +
webAppURL + " to host="
+ m_hostName);
m_webapps.put(context, ctx);
}
@@ -161,6 +163,7 @@
public void undeploy(String context) throws SevakException
{
WebApplicationContext ctx = (WebApplicationContext) m_webapps.get(context);
+ m_server.removeContext(ctx);
ctx.destroy();
m_webapps.remove(context);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
