On Tue, 2002-07-23 at 23:11, [EMAIL PROTECTED] wrote:
> mcconnell 2002/07/23 20:11:06
>
> Modified: sevak/src/java/org/apache/avalon/apps/sevak/blocks/catalina
> CatalinaSevakImpl.java
> Log:
> adapted to work with Merlin or Phoenix
Cool, thanks man!
> Revision Changes Path
> 1.2 +11 -8
>jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/catalina/CatalinaSevakImpl.java
>
> Index: CatalinaSevakImpl.java
> ===================================================================
> RCS file:
>/home/cvs/jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/catalina/CatalinaSevakImpl.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- CatalinaSevakImpl.java 29 Jun 2002 17:46:23 -0000 1.1
> +++ CatalinaSevakImpl.java 24 Jul 2002 03:11:06 -0000 1.2
> @@ -25,7 +25,6 @@
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.Serviceable;
> -import org.apache.avalon.phoenix.BlockContext;
> import org.apache.catalina.Engine;
> import org.apache.catalina.Host;
> import org.apache.catalina.Lifecycle;
> @@ -52,7 +51,8 @@
> extends AbstractLogEnabled
> implements Contextualizable, Serviceable, Configurable, Initializable, Sevak
> {
> - private BlockContext m_context;
> + //private BlockContext m_context;
> + private Context m_context;
> private Configuration m_configuration;
> private Engine m_engine = null;
> private Embedded m_embedded = null;
> @@ -68,7 +68,8 @@
> public void contextualize(final Context context)
> {
> getLogger().info("Sevak.contextualize()");
> - m_context = (BlockContext) context;
> + //m_context = (BlockContext) context;
> + m_context = (Context) context;
> }
>
> /**
> @@ -115,9 +116,9 @@
> m_configuration.getChild("catalina.home").getValue(null);
> if (catalinaHome == null)
> {
> - catalinaHome=m_context.getBaseDirectory().getAbsolutePath();
> - //Creating a conf/ folder and dumping the default web.xml
> - File confDir=new File(m_context.getBaseDirectory(),"conf");
> + catalinaHome = ((File)m_context.get("app.home")).getAbsolutePath();
> +
> + File confDir=new File( (File) m_context.get("app.home"),"conf");
> confDir.mkdir();
> getLogger().info("Created conf/ folder");
> InputStream in=
>CatalinaSevakImpl.class.getResourceAsStream("default-web.xml");
> @@ -137,8 +138,8 @@
> {
> System.out.println(
> "catalina.home property Not Found. Using : "
> - + m_context.getBaseDirectory().getAbsolutePath());
> - catalinaHome = m_context.getBaseDirectory().getAbsolutePath();
> + + m_context.get("app.home"));
> + catalinaHome = ((File)m_context.get("app.home")).getAbsolutePath();
> }
> */
> m_port = m_configuration.getChild("port").getValueAsInteger(8080);
> @@ -176,7 +177,9 @@
> //START Tomcat Instance
> try
> {
> + getLogger().debug("starting Tomcat");
> m_embedded.start();
> + getLogger().debug("Tomcat started");
> }
> catch (LifecycleException le)
> {
>
>
>
>
> --
> To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
--
jvz.
Jason van Zyl
[EMAIL PROTECTED]
http://tambora.zenplex.org
In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
-- Jacques Ellul, The Technological Society
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
