You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/12 02:52:32 UTC

svn commit: r898149 - in /wicket/trunk: wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/ wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/ wicket/src/main/java/org/apache/wicket/ajax/ wicket/src/main/java/org/apach...

Author: knopp
Date: Tue Jan 12 01:52:31 2010
New Revision: 898149

URL: http://svn.apache.org/viewvc?rev=898149&view=rev
Log: (empty)

Modified:
    wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
    wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java

Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java?rev=898149&r1=898148&r2=898149&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java Tue Jan 12 01:52:31 2010
@@ -18,9 +18,9 @@
 
 import org.apache.wicket.Application;
 import org.apache.wicket.IClusterable;
-import org.apache.wicket.ResourceReference;
 import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.resources.CompressedResourceReference;
+import org.apache.wicket.ng.resource.CompressedResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
 
 /**
  * Use the {@link #load(IHeaderResponse)} method to initialize the YUI library using the YUI loader.

Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=898149&r1=898148&r2=898149&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Tue Jan 12 01:52:31 2010
@@ -31,8 +31,6 @@
 
 import org.apache.wicket.Application;
 import org.apache.wicket.Component;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
 import org.apache.wicket.Response;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -43,7 +41,10 @@
 import org.apache.wicket.markup.html.IHeaderContributor;
 import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
 import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.convert.converters.DateConverter;
 import org.apache.wicket.util.lang.Objects;
@@ -230,8 +231,10 @@
 		variables.put("alignWithIcon", alignWithIcon());
 		variables.put("hideOnSelect", hideOnSelect());
 		// variables for YUILoader
-		variables.put("basePath", Strings.stripJSessionId(RequestCycle.get().urlFor(YUI)));
-		variables.put("wicketDatePath", RequestCycle.get().urlFor(WICKET_DATE));
+		variables.put("basePath", Strings.stripJSessionId(RequestCycle.get().renderUrlFor(
+				new ResourceReferenceRequestHandler(YUI))));
+		variables.put("wicketDatePath", RequestCycle.get().renderUrlFor(
+				new ResourceReferenceRequestHandler(WICKET_DATE)));
 		if (Application.DEVELOPMENT.equals(Application.get().getConfigurationType()))
 		{
 			variables.put("filter", "filter: \"RAW\",");
@@ -539,7 +542,9 @@
 	 */
 	protected CharSequence getIconUrl()
 	{
-		return RequestCycle.get().urlFor(new ResourceReference(DatePicker.class, "icon1.gif"));
+		return RequestCycle.get().renderUrlFor(
+				new ResourceReferenceRequestHandler(new ResourceReference(DatePicker.class,
+						"icon1.gif")));
 	}
 
 	/**

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=898149&r1=898148&r2=898149&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Tue Jan 12 01:52:31 2010
@@ -23,10 +23,12 @@
 import org.apache.wicket.behavior.AbstractAjaxBehavior;
 import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.WicketEventReference;
+import org.apache.wicket.ng.request.Url;
 import org.apache.wicket.ng.request.cycle.RequestCycle;
 import org.apache.wicket.ng.resource.JavascriptResourceReference;
 import org.apache.wicket.ng.resource.ResourceReference;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.http.WebRequest;
 import org.apache.wicket.settings.IDebugSettings;
 import org.apache.wicket.util.string.AppendingStringBuffer;
 import org.apache.wicket.util.string.Strings;
@@ -296,8 +298,16 @@
 	{
 		WebApplication app = (WebApplication)getComponent().getApplication();
 		AjaxRequestTarget target = app.newAjaxRequestTarget(getComponent().getPage());
-		RequestCycle.get().scheduleRequestHandlerAfterCurrent(target);
+		RequestCycle requestCycle = RequestCycle.get();
+		requestCycle.scheduleRequestHandlerAfterCurrent(target);
+
+		Url oldBaseURL = requestCycle.getUrlRenderer().getBaseUrl();
+		Url baseURL = Url.parse(((WebRequest)requestCycle.getRequest()).getHeader("Wicket-Ajax-BaseURL"));
+		requestCycle.getUrlRenderer().setBaseUrl(baseURL);
+
 		respond(target);
+
+		requestCycle.getUrlRenderer().setBaseUrl(oldBaseURL);
 	}
 
 	/**

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java?rev=898149&r1=898148&r2=898149&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java Tue Jan 12 01:52:31 2010
@@ -94,7 +94,7 @@
 		Integer behaviorIndex)
 	{
 		Checks.argumentNotEmpty(listenerInterface, "listenerInterface");
-		Checks.argumentNotEmpty(componentPath, "componentPath");
+		Checks.argumentNotNull(componentPath, "componentPath");
 
 		this.listenerInterface = listenerInterface;
 		this.componentPath = componentPath;
@@ -210,10 +210,6 @@
 			{
 				return null;
 			}
-			if (Strings.isEmpty(componentPath))
-			{
-				return null;
-			}
 
 			Integer behaviorIndex = null;
 			Integer renderCount = null;