You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/11/26 17:06:53 UTC
svn commit: r1771504 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/ tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/ tobago-example...

Author: lofwyr
Date: Sat Nov 26 17:06:53 2016
New Revision: 1771504

URL: http://svn.apache.org/viewvc?rev=1771504&view=rev
Log:
TOBAGO-1636: End of theme-dependent resource selection (ResourceManager)

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=1771504&r1=1771503&r2=1771504&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Sat Nov 26 17:06:53 2016
@@ -61,7 +61,9 @@ import java.io.OutputStream;
  * </pre>
  *
  * @since 1.0.7
+ * @deprecated since Tobago 3.0.x this is no longer needed
  */
+@Deprecated
 public class ResourceServlet extends HttpServlet {
 
   private static final long serialVersionUID = -4491419290205206466L;

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml?rev=1771504&r1=1771503&r2=1771504&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml Sat Nov 26 17:06:53 2016
@@ -69,36 +69,11 @@
     <multipart-config/>
   </servlet>
 
-  <servlet>
-    <servlet-name>ResourceServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
-    <init-param>
-      <description>Include the WEB-INF/resources directory from the classpath as root for resources.</description>
-      <param-name>include-webinf-resources</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </servlet>
-
   <servlet-mapping>
     <servlet-name>FacesServlet</servlet-name>
     <url-pattern>/faces/*</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/addressbook-resource/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/org/tango-project/*</url-pattern>
-  </servlet-mapping>
-
   <!-- XXX websphere-provided -->
   <listener>
     <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml?rev=1771504&r1=1771503&r2=1771504&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml Sat Nov 26 17:06:53 2016
@@ -37,11 +37,6 @@
     </multipart-config>
   </servlet>
 
-  <servlet>
-    <servlet-name>ResourceServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
-  </servlet>
-
   <!-- servlet-mapping -->
 
   <servlet-mapping>
@@ -49,11 +44,6 @@
     <url-pattern>/faces/*</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
-  </servlet-mapping>
-
   <!-- The Usual Welcome File List -->
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml?rev=1771504&r1=1771503&r2=1771504&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml Sat Nov 26 17:06:53 2016
@@ -132,21 +132,6 @@
     <url-pattern>/faces/*</url-pattern>
   </servlet-mapping>
 
-  <!-- ResourceServlet -->
-
-<!--
-  <servlet>
-    <servlet-name>ResourceServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
-    <url-pattern>/org/apache/myfaces/tobago/sandbox/*</url-pattern>
-  </servlet-mapping>
--->
-
   <!-- Error Page -->
 
   <error-page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml?rev=1771504&r1=1771503&r2=1771504&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml Sat Nov 26 17:06:53 2016
@@ -77,19 +77,6 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>ResourceServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/org/apache/myfaces/tobago/sandbox/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
     <servlet-name>KillSessionServlet</servlet-name>
     <servlet-class>org.apache.myfaces.tobago.example.test.KillSession</servlet-class>
   </servlet>