You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/08/09 18:14:48 UTC
svn commit: rev 36117 - in avalon/trunk/planet/facilities/http: blocks/webappserver/etc impl/src/main/org/apache/avalon/http/impl
Author: niclas
Date: Mon Aug 9 09:14:46 2004
New Revision: 36117
Modified:
avalon/trunk/planet/facilities/http/blocks/webappserver/etc/config.xml
avalon/trunk/planet/facilities/http/blocks/webappserver/etc/webapp-server.block
avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java
Log:
Better understanding of how Jetty's classloading works, and by that managed to get Cocoon running, against the webapp/ dir.
Modified: avalon/trunk/planet/facilities/http/blocks/webappserver/etc/config.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/blocks/webappserver/etc/config.xml (original)
+++ avalon/trunk/planet/facilities/http/blocks/webappserver/etc/config.xml Mon Aug 9 09:14:46 2004
@@ -4,10 +4,14 @@
<target path="/webapp-server/context">
<configuration>
- <web-application>/home/niclas/struts-documentation.war</web-application>
- <context-path>/struts-docs</context-path>
+ <web-application>/home/niclas/dev/opensource/asf-svn/cocoon/build/webapp</web-application>
+ <!--
+ <web-application>/home/niclas/dev/opensource/asf-svn/cocoon/build/cocoon-2.2.0-dev/cocoon.war</web-application>
+ -->
+ <context-path>/cocoon</context-path>
<defaults-descriptor>blocks/webappserver/etc/webdefaults.xml</defaults-descriptor>
</configuration>
</target>
</targets>
+
Modified: avalon/trunk/planet/facilities/http/blocks/webappserver/etc/webapp-server.block
==============================================================================
--- avalon/trunk/planet/facilities/http/blocks/webappserver/etc/webapp-server.block (original)
+++ avalon/trunk/planet/facilities/http/blocks/webappserver/etc/webapp-server.block Mon Aug 9 09:14:46 2004
@@ -21,6 +21,7 @@
<artifact>jar:tomcat/jasper-runtime#5.0.25</artifact>
<artifact>jar:tomcat/jasper-compiler#5.0.25</artifact>
<artifact>jar:tomcat/jsp-api#5.0.18</artifact>
+ <artifact>jar:log4j/log4j#1.2.8</artifact>
</classpath>
</classloader>
Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java (original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java Mon Aug 9 09:14:46 2004
@@ -93,8 +93,9 @@
tmpDir.mkdirs();
setTempDirectory( tmpDir );
+ setClassLoaderJava2Compliant( true );
ClassLoader cl = (ClassLoader) ctx.get( "urn:avalon:classloader" );
- setClassLoader( cl );
+ setParentClassLoader( cl );
}
/**
@@ -146,8 +147,11 @@
public void configure( org.apache.avalon.framework.configuration.Configuration conf )
throws ConfigurationException
{
- setIgnoreWebJetty( true );
- setExtractWAR( false );
+ boolean ignore = conf.getChild( "ignore-jetty-web" ).getValueAsBoolean( false );
+ setIgnoreWebJetty( ignore );
+
+ boolean extract = conf.getChild( "extract-war" ).getValueAsBoolean( false );
+ setExtractWAR( extract );
String displayName = conf.getChild( "display-name" ).getValue( null );
if( displayName != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org