mcconnell 2004/02/10 09:10:59
Modified: merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl
ContainmentModelHandler.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultFactory.java
merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet
MerlinServlet.java
Log:
Housekeeping.
Revision Changes Path
1.3 +1 -1
avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/ContainmentModelHandler.java
Index: ContainmentModelHandler.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/ContainmentModelHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainmentModelHandler.java 5 Feb 2004 18:59:07 -0000 1.2
+++ ContainmentModelHandler.java 10 Feb 2004 17:10:59 -0000 1.3
@@ -22,8 +22,8 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.composition.model.ComponentModel;
+
import org.apache.avalon.http.HttpRuntimeException;
import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.ServletHandler;
1.28 +1 -1
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DefaultFactory.java 10 Feb 2004 16:31:16 -0000 1.27
+++ DefaultFactory.java 10 Feb 2004 17:10:59 -0000 1.28
@@ -428,7 +428,7 @@
private Artifact getRuntimeArtifact( KernelCriteria criteria )
{
- if( isCodeSecurityEnabled() )
+ if( criteria.isCodeSecurityEnabled() )
{
return criteria.getSecureRuntimeImplementation();
}
1.7 +0 -7
avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java
Index: MerlinServlet.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MerlinServlet.java 10 Feb 2004 16:31:17 -0000 1.6
+++ MerlinServlet.java 10 Feb 2004 17:10:59 -0000 1.7
@@ -29,11 +29,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.activation.appliance.Appliance;
-import org.apache.avalon.activation.appliance.Block;
-
-import org.apache.avalon.composition.model.ContainmentModel;
-
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.merlin.Kernel;
@@ -74,8 +69,6 @@
//----------------------------------------------------------
private KernelCriteria m_criteria;
-
- private Block m_block;
private Kernel m_kernel;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
