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 2009/05/26 11:47:24 UTC

svn commit: r778639 - in /myfaces/tobago/branches/tobago-1.0.x/example/addressbook: lib/src/main/resources/META-INF/resources/addressbook-resource/ lib/src/main/resources/META-INF/resources/addressbook-resource/html/ lib/src/main/resources/META-INF/res...

Author: lofwyr
Date: Tue May 26 09:47:23 2009
New Revision: 778639

URL: http://svn.apache.org/viewvc?rev=778639&view=rev
Log:
TOBAGO-756: fix ugly directory name (was a workaround for svn problems)

Added:
    myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook-resource/
      - copied from r778632, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource/
    myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook-resource/html/
      - copied from r778632, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/
Removed:
    myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource/
    myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/
Modified:
    myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tobago-config.xml
    myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tobago-config.xml?rev=778639&r1=778638&r2=778639&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tobago-config.xml Tue May 26 09:47:23 2009
@@ -29,8 +29,7 @@
     <supported-theme>charlotteville</supported-theme>
   </theme-config>
 
-  <resource-dir>tobago-resource</resource-dir>
-  <resource-dir>tobago-resource2</resource-dir> <!-- XXX for testing, can be removed later -->
+  <resource-dir>addressbook-resource</resource-dir>
   <ajax-enabled>true</ajax-enabled>
   <renderers>
     <renderer>

Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/web.xml?rev=778639&r1=778638&r2=778639&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/web.xml Tue May 26 09:47:23 2009
@@ -114,7 +114,7 @@
 
   <servlet-mapping>
     <servlet-name>ResourceServlet</servlet-name>
-    <url-pattern>/tobago-resource2/*</url-pattern>
+    <url-pattern>/addressbook-resource/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>