svn commit: r819117 - in /wicket/trunk: wicket-guice/src/main/java/org/apache/wicket/guice/ wicket-spring/src/main/java/org/apache/wicket/spring/ wicket/src/main/java/org/apache/wicket/protocol/http/

jdonnerstag Sat, 26 Sep 2009 10:56:07 -0700

Author: jdonnerstag
Date: Sat Sep 26 12:29:00 2009
New Revision: 819117

URL: http://svn.apache.org/viewvc?rev=819117&view=rev
Log:
fixed: JavaDoc: Some JavDoc examples still refer to WicketServlet
Issue: WICKET-2386


Modified:
    
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
    
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java

Modified: 
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java?rev=819117&r1=819116&r2=819117&view=diff
==============================================================================
--- 
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
 (original)
+++ 
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
 Sat Sep 26 12:29:00 2009
@@ -35,23 +35,22 @@
  * Configuration example:
  * 
  * <pre>
- *    &lt;servlet&gt;
- *      &lt;servlet-name&gt;myApp&lt;/servlet-name&gt;
- *      
&lt;servlet-class&gt;org.apache.wicket.protocol.http.WicketServlet&lt;/servlet-class&gt;
- *      &lt;init-param&gt;
- *        &lt;param-name&gt;applicationFactoryClassName&lt;/param-name&gt;
- *        
&lt;param-value&gt;org.apache.wicket.guice.GuiceWebApplicationFactory&lt;/param-value&gt;
- *      &lt;/init-param&gt;
- *      &lt;init-param&gt;
- *        &lt;param-name&gt;module&lt;/param-name&gt;
- *        
&lt;param-value&gt;com.company.MyGuiceModule,com.company.MyOtherGuiceModule&lt;/param-value&gt;
- *      &lt;/init-param&gt;
- *      &lt;init-param&gt;
- *        &lt;param-name&gt;wicket-guice.stage&lt;/param-name&gt;
- *        &lt;param-value&gt;DEVELOPMENT&lt;/param-value&gt;
- *      &lt;/init-param&gt;
- *      &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
- *    &lt;/servlet&gt;
+ * &lt;filter&gt;
+ *   &lt;filter-name&gt;MyApplication&lt;/filter-name&gt;
+ *   
&lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;applicationClassName&lt;/param-name&gt;
+ *     
&lt;param-value&gt;org.apache.wicket.guice.GuiceWebApplicationFactory&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;module&lt;/param-name&gt;
+ *     
&lt;param-value&gt;com.company.MyGuiceModule,com.company.MyOtherGuiceModule&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;wicket-guice.stage&lt;/param-name&gt;
+ *     &lt;param-value&gt;DEVELOPMENT&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ * &lt;/filter&gt;
  * </pre>
  * 
  * This factory will create an Injector configured using the Guice Module 
implementation you pass it
@@ -67,19 +66,18 @@
  * Alternatively, you can dig the Injector out of the ServletContext as an 
attribute, like so:
  * 
  * <pre>
- *    &lt;servlet&gt;
- *      &lt;servlet-name&gt;myApp&lt;/servlet-name&gt;
- *      
&lt;servlet-class&gt;org.apache.wicket.protocol.http.WicketServlet&lt;/servlet-class&gt;
- *      &lt;init-param&gt;
- *        &lt;param-name&gt;applicationFactoryClassName&lt;/param-name&gt;
- *        
&lt;param-value&gt;org.apache.wicket.guice.GuiceWebApplicationFactory&lt;/param-value&gt;
- *      &lt;/init-param&gt;
- *      &lt;init-param&gt;
- *        &lt;param-name&gt;injectorContextAttribute&lt;/param-name&gt;
- *        &lt;param-value&gt;GuiceInjector&lt;/param-value&gt;
- *      &lt;/init-param&gt;
- *      &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
- *    &lt;/servlet&gt;
+ * &lt;filter&gt;
+ *   &lt;filter-name&gt;MyApplication&lt;/filter-name&gt;
+ *   
&lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;applicationClassName&lt;/param-name&gt;
+ *     
&lt;param-value&gt;org.apache.wicket.guice.GuiceWebApplicationFactory&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;injectorContextAttribute&lt;/param-name&gt;
+ *     &lt;param-value&gt;GuiceInjector&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ * &lt;/filter&gt;
  * </pre>
  * 
  * <b>NB: You no longer have to add a GuiceComponentInjector manually in your

Modified: 
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=819117&r1=819116&r2=819117&view=diff
==============================================================================
--- 
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
 (original)
+++ 
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
 Sat Sep 26 12:29:00 2009
@@ -35,15 +35,14 @@
  * Configuration example:
  * 
  * <pre>
- * &lt;servlet&gt;
- *    &lt;servlet-name&gt;phonebook&lt;/servlet-name&gt;
- *    
&lt;servlet-class&gt;org.apache.wicket.protocol.http.WicketServlet&lt;/servlet-class&gt;
- *    &lt;init-param&gt;
- *    &lt;param-name&gt;applicationFactoryClassName&lt;/param-name&gt;
- *    
&lt;param-value&gt;org.apache.wicket.spring.SpringWebApplicationFactory&lt;/param-value&gt;
- *    &lt;/init-param&gt;
- *    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
- *    &lt;/servlet&gt;
+ * &lt;filter&gt;
+ *   &lt;filter-name&gt;MyApplication&lt;/filter-name&gt;
+ *   
&lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;applicationClassName&lt;/param-name&gt;
+ *     
&lt;param-value&gt;org.apache.wicket.spring.SpringWebApplicationFactory&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ * &lt;/filter&gt;
  * </pre>
  * 
  * <code>applicationBean</code> init parameter can be used if there are 
multiple WebApplications
@@ -52,19 +51,18 @@
  * Example:
  * 
  * <pre>
- * &lt;servlet&gt;
- *    &lt;servlet-name&gt;phonebook&lt;/servlet-name&gt;
- *    
&lt;servlet-class&gt;org.apache.wicket.protocol.http.WicketServlet&lt;/servlet-class&gt;
- *    &lt;init-param&gt;
- *    &lt;param-name&gt;applicationFactoryClassName&lt;/param-name&gt;
- *    
&lt;param-value&gt;org.apache.wicket.spring.SpringWebApplicationFactory&lt;/param-value&gt;
- *    &lt;/init-param&gt;
- *    &lt;init-param&gt;
- *    &lt;param-name&gt;applicationBean&lt;/param-name&gt;
- *    &lt;param-value&gt;phonebookApplication&lt;/param-value&gt;
- *    &lt;/init-param&gt;
- *    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
- *    &lt;/servlet&gt;
+ * &lt;filter&gt;
+ *   &lt;filter-name&gt;MyApplication&lt;/filter-name&gt;
+ *   
&lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;applicationClassName&lt;/param-name&gt;
+ *     
&lt;param-value&gt;org.apache.wicket.spring.SpringWebApplicationFactory&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;applicationBean&lt;/param-name&gt;
+ *     &lt;param-value&gt;phonebookApplication&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ * &lt;/filter&gt;
  * </pre>
  * 
  * 

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java?rev=819117&r1=819116&r2=819117&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
 Sat Sep 26 12:29:00 2009
@@ -21,11 +21,14 @@
  * webapplication to use this factory in web.xml like:
  * 
  * <pre>
- *     &lt;init-param&gt;
- *       &lt;param-name&gt;applicationFactoryClassName&lt;/param-name&gt;
- *         
&lt;param-value&gt;org.apache.wicket.spring.SpringWebApplicationFactory&lt;/param-value&gt;
- *     &lt;/init-param&gt;
- * 
+ * &lt;filter&gt;
+ *   &lt;filter-name&gt;MyApplication&lt;/filter-name&gt;
+ *   
&lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;applicationClassName&lt;/param-name&gt;
+ *     &lt;param-value&gt;org.mycompany.MyApplication&lt;/param-value&gt;
+ *   &lt;/init-param&gt;
+ * &lt;/filter&gt;
  * </pre>
  * 
  * @author Igor Vaynberg (ivaynberg)

svn commit: r819117 - in /wicket/trunk: wicket-guice/src/main/java/org/apache/wicket/guice/ wicket-spring/src/main/java/org/apache/wicket/spring/ wicket/src/main/java/org/apache/wicket/protocol/http/

Reply via email to