You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/01/21 17:40:06 UTC
svn commit: r1061889 - in
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket:
protocol/http/WebApplication.java request/mapper/ResourceMapper.java
Author: mgrigorov
Date: Fri Jan 21 16:40:05 2011
New Revision: 1061889
URL: http://svn.apache.org/viewvc?rev=1061889&view=rev
Log:
WICKET-3362 Rename WebApplication#mountSharedResource() to #mountResource()
Rename the method.
Register the reference only it can be registered.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=1061889&r1=1061888&r2=1061889&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Fri Jan 21 16:40:05 2011
@@ -320,9 +320,12 @@ public abstract class WebApplication ext
* @param reference
* resource reference to be mounted
*/
- public final void mountSharedResource(final String path, final ResourceReference reference)
+ public final void mountResource(final String path, final ResourceReference reference)
{
- getResourceReferenceRegistry().registerResourceReference(reference);
+ if (reference.canBeRegistered())
+ {
+ getResourceReferenceRegistry().registerResourceReference(reference);
+ }
mount(new ResourceMapper(path, reference));
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java?rev=1061889&r1=1061888&r2=1061889&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java Fri Jan 21 16:40:05 2011
@@ -49,7 +49,7 @@ import org.apache.wicket.util.lang.Args;
* getRootRequestMapperAsCompound().add(new ResourceMapper("/images", new ImagesResourceReference()));
* </pre>
*
- * @see org.apache.wicket.protocol.http.WebApplication#mountSharedResource(String, org.apache.wicket.request.resource.ResourceReference)
+ * @see org.apache.wicket.protocol.http.WebApplication#mountResource(String, org.apache.wicket.request.resource.ResourceReference)
*
* @author Peter Ertl
*/