git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/WEB-INF/web.xml b/server/user.jobengine.osgi.server/WEB-INF/web.xml
index b0826fddacd9a4ec9b9d72b2e4daa7f97efe34c8..540721cabedd343053e281e4deab8fe547e77329 100644 (file)
--- a/server/user.jobengine.osgi.server/WEB-INF/web.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/web.xml
@@ -22,9 +22,9 @@
        </servlet>\r
 \r
        <servlet>\r
-               <description>Test servlet for jetty</description>\r
-               <servlet-name>testservlet</servlet-name>\r
-               <servlet-class>user.jobengine.servlet.TestServlet</servlet-class>\r
+               <servlet-name>action-route</servlet-name>\r
+               <description>Map action path to query string</description>\r
+               <servlet-class>user.jobengine.servlet.ActionRouteServlet</servlet-class>\r
                <load-on-startup>2</load-on-startup>\r
        </servlet>\r
 \r
@@ -45,14 +45,14 @@
        </servlet-mapping>\r
 \r
        <servlet-mapping>\r
-               <servlet-name>testservlet</servlet-name>\r
+               <servlet-name>action-route</servlet-name>\r
                <url-pattern>/actions/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>\r
-               <servlet-name>zkLoader</servlet-name>\r
-               <url-pattern>/test</url-pattern>\r
-       </servlet-mapping>\r
+<!--   <servlet-mapping> -->\r
+<!--           <servlet-name>zkLoader</servlet-name> -->\r
+<!--           <url-pattern>/test</url-pattern> -->\r
+<!--   </servlet-mapping> -->\r
 \r
        <session-config>\r
                <!-- percben -->\r
@@ -71,13 +71,13 @@
                <welcome-file>index.zhtml</welcome-file>\r
        </welcome-file-list>\r
 \r
-       <security-constraint>\r
-               <web-resource-collection>\r
-                       <web-resource-name>Everything on the app</web-resource-name>\r
-                       <url-pattern>/*</url-pattern>\r
-               </web-resource-collection>\r
-               <user-data-constraint>\r
-                       <transport-guarantee>CONFIDENTIAL</transport-guarantee>\r
-               </user-data-constraint>\r
-       </security-constraint>\r
+<!--   <security-constraint> -->\r
+<!--           <web-resource-collection> -->\r
+<!--                   <web-resource-name>Everything on the app</web-resource-name> -->\r
+<!--                   <url-pattern>/*</url-pattern> -->\r
+<!--           </web-resource-collection> -->\r
+<!--           <user-data-constraint> -->\r
+<!--                   <transport-guarantee>CONFIDENTIAL</transport-guarantee> -->\r
+<!--           </user-data-constraint> -->\r
+<!--   </security-constraint> -->\r
 </web-app>\r