Author: deepal
Date: Tue Dec 18 22:02:50 2007
New Revision: 11479

Log:

making resource.jsp as the welcome page and that will forward wso2registry/ to 
wso2registry/web.xml
- I had to change this because we do not get the correct web app when we 
forward using servlet 

Modified:
   trunk/registry/modules/webapps/conf/web.xml
   
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java

Modified: trunk/registry/modules/webapps/conf/web.xml
==============================================================================
--- trunk/registry/modules/webapps/conf/web.xml (original)
+++ trunk/registry/modules/webapps/conf/web.xml Tue Dec 18 22:02:50 2007
@@ -35,14 +35,16 @@
         <servlet-name>WebServlet</servlet-name>
         <url-pattern>/web/*</url-pattern>
     </servlet-mapping>
-    <!-- servlet-mapping>
-        <servlet-name>WebServlet</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping -->
     <servlet-mapping>
         <servlet-name>WebServlet</servlet-name>
         <url-pattern>/system/*</url-pattern>
     </servlet-mapping>
+
+    <welcome-file-list>
+      <welcome-file>admin/resources.jsp</welcome-file>
+    </welcome-file-list>
+
+
     <!-- resource-ref>
         <description>DB Connection</description>
         <res-ref-name>jdbc/WSO2RegistryDB</res-ref-name>

Modified: 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
--- 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
   (original)
+++ 
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
   Tue Dec 18 22:02:50 2007
@@ -380,10 +380,6 @@
                          HttpServletResponse response)
             throws ServletException, IOException {
         String uri = request.getRequestURI();
-        if ("/wso2registry/".equals(uri)) {
-            request.getRequestDispatcher("/web").forward(request, response);
-            return;
-        }
         // if a path is not set in the session, set the path to the root
         String path = (String) 
request.getSession().getAttribute(UIConstants.PATH_ATTR);
         if (path == null || path.length() == 0) {

_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev

Reply via email to