svn commit: r526293 - in /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http: ReloadingWicketFilter.java ReloadingWicketServlet.java

[jb...@apache.org]

Author: jbq
Date: Fri Apr  6 14:38:32 2007
New Revision: 526293

URL: http://svn.apache.org/viewvc?view=rev&rev=526293
Log:
Improve Javadoc for Spring

Modified:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java?view=diff&rev=526293&r1=526292&r2=526293
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java Fri Apr  6 14:38:32 2007
@@ -58,6 +58,19 @@
  * </p>
  * 
  * <p>
+ * Be sure to carefully read the following information if you also use Spring:
+ * </p>
+ * 
+ * <p>
+ * When using Spring, the application must not be a Spring bean itself,
+ * otherwise the reloading mechanism won't be able to reload the application. In
+ * particular, make sure <b>not</b> to use
+ * wicket.spring.SpringWebApplicationFactory in web.xml. To inject dependencies
+ * in your application, use SpringComponentInjector or
+ * DefaultListableBeanFactory.autowireBeanProperties() in the init() method.
+ * </p>
+ * 
+ * <p>
  * <b>WARNING. </b> Be careful that when using Spring or other component
  * managers, you will get <tt>ClassCastException</tt> if a given class is
  * loaded two times, one time by the normal classloader, and another time by the

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java?view=diff&rev=526293&r1=526292&r2=526293
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java Fri Apr  6 14:38:32 2007
@@ -37,13 +37,8 @@
  * }
  * </pre>
  * 
- * <p>
- * It is also possible to add an URL to watch for changes using
- * <tt>ReloadingClassLoader.addLocation()</tt>. By default, all the URL
- * locations we can find for the provided class loader are registered.
- * </p>
- * 
- * @see ReloadingWicketFilter
+ * @see ReloadingWicketFilter for complete documentation, and for proper
+ *      integration with Spring
  * 
  * @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
  */