You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by kl...@apache.org on 2009/09/10 22:17:51 UTC

svn commit: r813618 - /incubator/olio/webapp/java/trunk/ws/apps/webapp/web/WEB-INF/web.xml

Author: klichong
Date: Thu Sep 10 22:17:51 2009
New Revision: 813618

URL: http://svn.apache.org/viewvc?rev=813618&view=rev
Log:
workaround for URL conflict between javascript and REST resources

Modified:
    incubator/olio/webapp/java/trunk/ws/apps/webapp/web/WEB-INF/web.xml

Modified: incubator/olio/webapp/java/trunk/ws/apps/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/java/trunk/ws/apps/webapp/web/WEB-INF/web.xml?rev=813618&r1=813617&r2=813618&view=diff
==============================================================================
--- incubator/olio/webapp/java/trunk/ws/apps/webapp/web/WEB-INF/web.xml (original)
+++ incubator/olio/webapp/java/trunk/ws/apps/webapp/web/WEB-INF/web.xml Thu Sep 10 22:17:51 2009
@@ -49,10 +49,12 @@
          
         <load-on-startup>1</load-on-startup>
     </servlet>
+<!--
     <servlet-mapping>
         <servlet-name>Jersey</servlet-name>
         <url-pattern>/resources/*</url-pattern>
     </servlet-mapping>
+-->
    <!--
    <servlet>
         <servlet-name>jersey</servlet-name>