You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2004/08/27 17:38:09 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry ApplicationServlet.java
hlship 2004/08/27 08:38:09
Modified: framework/src/org/apache/tapestry ApplicationServlet.java
Log:
Replace the bulk of the Tapestry ApplicationServlet with a collection of HiveMind services and pipelines.
Revision Changes Path
1.14 +3 -55 jakarta-tapestry/framework/src/org/apache/tapestry/ApplicationServlet.java
Index: ApplicationServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/ApplicationServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ApplicationServlet.java 27 Aug 2004 13:42:49 -0000 1.13
+++ ApplicationServlet.java 27 Aug 2004 15:38:09 -0000 1.14
@@ -31,16 +31,11 @@
import org.apache.hivemind.Registry;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.RegistryBuilder;
-import org.apache.tapestry.engine.IPropertySource;
import org.apache.tapestry.request.RequestContext;
import org.apache.tapestry.services.ApplicationGlobals;
import org.apache.tapestry.services.ApplicationInitializer;
import org.apache.tapestry.services.RequestServicer;
import org.apache.tapestry.spec.IApplicationSpecification;
-import org.apache.tapestry.util.DelegatingPropertySource;
-import org.apache.tapestry.util.ServletContextPropertySource;
-import org.apache.tapestry.util.ServletPropertySource;
-import org.apache.tapestry.util.SystemPropertiesPropertySource;
import org.apache.tapestry.util.exception.ExceptionAnalyzer;
/**
@@ -105,16 +100,6 @@
private IApplicationSpecification _specification;
/**
- * Used to search for configuration properties.
- *
- *
- * @since 3.0
- *
- */
-
- private IPropertySource _propertySource;
-
- /**
* Invokes {@link #doService(HttpServletRequest, HttpServletResponse)}.
*
* @since 1.0.6
@@ -140,6 +125,9 @@
private Registry _registry;
+ /**
+ * @since 3.1
+ */
private RequestServicer _requestServicer;
/**
@@ -282,47 +270,7 @@
}
}
- /**
- * Searches for a configuration property in:
- * <ul>
- * <li>The servlet's initial parameters
- * <li>The servlet context's initial parameters
- * <li>JVM system properties
- * </ul>
- *
- * @see #createPropertySource()
- * @since 3.0
- *
- */
-
- protected String searchConfiguration(String propertyName)
- {
- if (_propertySource == null)
- _propertySource = createPropertySource();
- return _propertySource.getPropertyValue(propertyName);
- }
-
- /**
- * Creates an instance of {@link IPropertySource} used for
- * searching of configuration values. Subclasses may override
- * this method if they want to change the normal locations
- * that properties are searched for within.
- *
- * @since 3.0
- *
- */
-
- protected IPropertySource createPropertySource()
- {
- DelegatingPropertySource result = new DelegatingPropertySource();
-
- result.addSource(new ServletPropertySource(getServletConfig()));
- result.addSource(new ServletContextPropertySource(getServletContext()));
- result.addSource(SystemPropertiesPropertySource.getInstance());
-
- return result;
- }
/**
* Invoked from the {@link IEngine engine}, just prior to starting to
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org