You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/05/11 14:22:32 UTC
svn commit: r537178 - in
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket:
protocol/http/MockWebApplication.java protocol/http/WebApplication.java
settings/IApplicationSettings.java settings/Settings.java
Author: almaw
Date: Fri May 11 05:22:31 2007
New Revision: 537178
URL: http://svn.apache.org/viewvc?view=rev&rev=537178
Log:
Ditch setContextPath() for WebApplication - relative URLs mean this is no longer required.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?view=diff&rev=537178&r1=537177&r2=537178
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Fri May 11 05:22:31 2007
@@ -211,9 +211,6 @@
// Create request cycle
createRequestCycle();
- // Set the default context path
- this.application.getApplicationSettings().setContextPath(context.getServletContextName());
-
this.application.getRequestCycleSettings().setRenderStrategy(
IRequestCycleSettings.ONE_PASS_RENDER);
this.application.getResourceSettings().setResourceFinder(new WebApplicationPath(context));
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?view=diff&rev=537178&r1=537177&r2=537178
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Fri May 11 05:22:31 2007
@@ -526,12 +526,6 @@
// Set resource finder to web app path
getResourceSettings().setResourceFinder(new WebApplicationPath(getServletContext()));
- String contextPath = getInitParameter(Application.CONTEXTPATH);
- if (contextPath != null)
- {
- getApplicationSettings().setContextPath(contextPath);
- }
-
// Check if system property -Dwicket.configuration exists
String configuration = null;
try
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java?view=diff&rev=537178&r1=537177&r2=537178
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java Fri May 11 05:22:31 2007
@@ -16,10 +16,7 @@
*/
package org.apache.wicket.settings;
-import org.apache.wicket.Application;
import org.apache.wicket.application.IClassResolver;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.util.convert.IConverterLocatorFactory;
/**
@@ -94,26 +91,6 @@
* The default class resolver
*/
void setClassResolver(final IClassResolver defaultClassResolver);
-
- /**
- * Sets context path to use for absolute path generation. For example an
- * Application Server that is used as a virtual server on a Webserver:
- *
- * <pre>
- * appserver.com/context mapped to webserver/ (context path should be '/')
- * </pre>
- *
- * This method can be called in the init phase of the application with the
- * servlet init parameter {@link Application#CONTEXTPATH} if it is specified
- * or by the developer itself in the {@link WebApplication} init() method.
- * If it is not set in the init phase of the application it will be set
- * automatically on the context path of the request
- * {@link WebRequest#getContextPath()}
- *
- * @param contextPath
- * The context path to use.
- */
- void setContextPath(String contextPath);
/**
* Sets the CoverterLocatorFactory
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java?view=diff&rev=537178&r1=537177&r2=537178
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java Fri May 11 05:22:31 2007
@@ -125,9 +125,6 @@
/** True if multiple tabs/spaces should be compressed to a single space */
private boolean compressWhitespace = false;
- /** The context path that should be used for url prefixing */
- private String contextPath;
-
private IConverterLocatorFactory converterLocatorFactory;
/** Default values for persistence of form data (by means of cookies) */
@@ -864,25 +861,6 @@
public void setCompressWhitespace(final boolean compressWhitespace)
{
this.compressWhitespace = compressWhitespace;
- }
-
- /**
- * @see org.apache.wicket.settings.IApplicationSettings#setContextPath(java.lang.String)
- */
- public void setContextPath(String contextPath)
- {
- if (contextPath != null)
- {
- if (!contextPath.startsWith("/") && !contextPath.startsWith("http:")
- && !contextPath.startsWith("https:"))
- {
- this.contextPath = "/" + contextPath;
- }
- else
- {
- this.contextPath = contextPath;
- }
- }
}
/**