Menu
▾
▴
[Drawbridge-developers] SF.net SVN: drawbridge: [45] trunk/drawbridge
|
From: <ac...@us...> - 2008-04-22 01:45:35
|
Revision: 45
http://drawbridge.svn.sourceforge.net/drawbridge/?rev=45&view=rev
Author: acresse
Date: 2008-04-21 18:45:33 -0700 (Mon, 21 Apr 2008)
Log Message:
-----------
switch to annotations
Modified Paths:
--------------
trunk/drawbridge/WebContent/WEB-INF/drawbridge-servlet.xml
trunk/drawbridge/src/java/drawbridge-core-spring.xml
trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/AdminController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/FakeLoginController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/ManageDatabasesController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/DeleteDriverSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/ManageDriversController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/DeleteGroupSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/ManageGroupsController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/DeleteJobSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/ManageJobsController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/ManageRunAsController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/DeleteUserSubmitController.java
trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/ManageUsersController.java
Modified: trunk/drawbridge/WebContent/WEB-INF/drawbridge-servlet.xml
===================================================================
--- trunk/drawbridge/WebContent/WEB-INF/drawbridge-servlet.xml 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/WebContent/WEB-INF/drawbridge-servlet.xml 2008-04-22 01:45:33 UTC (rev 45)
@@ -1,151 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-<beans>
-
<import resource="classpath:drawbridge-core-spring.xml"/>
<import resource="classpath:drawbridge-env-spring.xml"/>
+ <context:component-scan base-package="net.sf.drawbridge.controller"/>
+ <context:property-placeholder location="classpath:drawbridge.properties"/>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="classpath:drawbridge.properties"/>
- </bean>
-
- <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
- <property name="mappings">
- <props>
- <prop key="/MainMenu.do">mainMenuController</prop>
- <prop key="/Admin.do">adminController</prop>
- <prop key="/FakeLogin.do">fakeLoginController</prop>
-
- <prop key="/ManageDatabases.do">manageDatabasesController</prop>
- <prop key="/AddDatabase.do">addOrEditDatabaseController</prop>
- <prop key="/EditDatabase.do">addOrEditDatabaseController</prop>
- <prop key="/AddOrEditDatabaseSubmit.do">addOrEditDatabaseSubmitController</prop>
- <prop key="/DeleteDatabaseSubmit.do">deleteDatabaseSubmitController</prop>
-
- <prop key="/ManageDrivers.do">manageDriversController</prop>
- <prop key="/AddDriver.do">addOrEditDriverController</prop>
- <prop key="/EditDriver.do">addOrEditDriverController</prop>
- <prop key="/AddOrEditDriverSubmit.do">addOrEditDriverSubmitController</prop>
- <prop key="/DeleteDriverSubmit.do">deleteDriverSubmitController</prop>
-
- <prop key="/ManageUsers.do">manageUsersController</prop>
- <prop key="/AddUser.do">addOrEditUserController</prop>
- <prop key="/EditUser.do">addOrEditUserController</prop>
- <prop key="/AddOrEditUserSubmit.do">addOrEditUserSubmitController</prop>
- <prop key="/DeleteUserSubmit.do">deleteUserSubmitController</prop>
-
- <prop key="/ManageGroups.do">manageGroupsController</prop>
- <prop key="/AddGroup.do">addOrEditGroupController</prop>
- <prop key="/EditGroup.do">addOrEditGroupController</prop>
- <prop key="/AddOrEditGroupSubmit.do">addOrEditGroupSubmitController</prop>
- <prop key="/DeleteGroupSubmit.do">deleteGroupSubmitController</prop>
-
- <prop key="/ManageRunAsAccounts.do">manageRunAsController</prop>
- <prop key="/AddRunAsAccount.do">addOrEditRunAsController</prop>
- <prop key="/EditRunAsAccount.do">addOrEditRunAsController</prop>
- <prop key="/AddOrEditRunAsAccountSubmit.do">addOrEditRunAsSubmitController</prop>
- <prop key="/DeleteRunAsAccountSubmit.do">deleteRunAsSubmitController</prop>
-
- <prop key="/ManageJobs.do">manageJobsController</prop>
- <prop key="/AddJob.do">addOrEditJobController</prop>
- <prop key="/EditJob.do">addOrEditJobController</prop>
- <prop key="/AddOrEditJobSubmit.do">addOrEditJobSubmitController</prop>
- <prop key="/DeleteJobSubmit.do">deleteJobSubmitController</prop>
- <prop key="/RunJob.do">runJobController</prop>
- <prop key="/RunJobSubmit.do">runJobSubmitController</prop>
-
- </props>
- </property>
- </bean>
-
- <bean id="abstractController" class="net.sf.drawbridge.controller.AbstractDrawbridgeController" abstract="true">
- <property name="drawbridgeService" ref="DrawbridgeService"/>
- </bean>
-
- <bean id="mainMenuController" class="net.sf.drawbridge.controller.MainMenuController" parent="abstractController"/>
- <bean id="adminController" class="net.sf.drawbridge.controller.AdminController" parent="abstractController"/>
- <bean id="fakeLoginController" class="net.sf.drawbridge.controller.FakeLoginController" parent="abstractController"/>
-
- <bean id="manageDatabasesController" class="net.sf.drawbridge.controller.database.ManageDatabasesController" parent="abstractController"/>
- <bean id="addOrEditDatabaseController" class="net.sf.drawbridge.controller.database.AddOrEditDatabaseController" parent="abstractController"/>
- <bean id="addOrEditDatabaseSubmitController" class="net.sf.drawbridge.controller.database.AddOrEditDatabaseSubmitController" parent="abstractController"/>
- <bean id="deleteDatabaseSubmitController" class="net.sf.drawbridge.controller.database.DeleteDatabaseSubmitController" parent="abstractController"/>
-
- <bean id="manageDriversController" class="net.sf.drawbridge.controller.driver.ManageDriversController" parent="abstractController"/>
- <bean id="addOrEditDriverController" class="net.sf.drawbridge.controller.driver.AddOrEditDriverController" parent="abstractController"/>
- <bean id="addOrEditDriverSubmitController" class="net.sf.drawbridge.controller.driver.AddOrEditDriverSubmitController" parent="abstractController"/>
- <bean id="deleteDriverSubmitController" class="net.sf.drawbridge.controller.driver.DeleteDriverSubmitController" parent="abstractController"/>
-
- <bean id="manageUsersController" class="net.sf.drawbridge.controller.user.ManageUsersController" parent="abstractController"/>
- <bean id="addOrEditUserController" class="net.sf.drawbridge.controller.user.AddOrEditUserController" parent="abstractController"/>
- <bean id="addOrEditUserSubmitController" class="net.sf.drawbridge.controller.user.AddOrEditUserSubmitController" parent="abstractController"/>
- <bean id="deleteUserSubmitController" class="net.sf.drawbridge.controller.user.DeleteUserSubmitController" parent="abstractController"/>
-
- <bean id="manageGroupsController" class="net.sf.drawbridge.controller.group.ManageGroupsController" parent="abstractController"/>
- <bean id="addOrEditGroupController" class="net.sf.drawbridge.controller.group.AddOrEditGroupController" parent="abstractController"/>
- <bean id="addOrEditGroupSubmitController" class="net.sf.drawbridge.controller.group.AddOrEditGroupSubmitController" parent="abstractController"/>
- <bean id="deleteGroupSubmitController" class="net.sf.drawbridge.controller.group.DeleteGroupSubmitController" parent="abstractController"/>
-
- <bean id="manageRunAsController" class="net.sf.drawbridge.controller.runas.ManageRunAsController" parent="abstractController"/>
- <bean id="addOrEditRunAsController" class="net.sf.drawbridge.controller.runas.AddOrEditRunAsController" parent="abstractController"/>
- <bean id="addOrEditRunAsSubmitController" class="net.sf.drawbridge.controller.runas.AddOrEditRunAsSubmitController" parent="abstractController"/>
- <bean id="deleteRunAsSubmitController" class="net.sf.drawbridge.controller.runas.DeleteRunAsSubmitController" parent="abstractController"/>
-
- <bean id="manageJobsController" class="net.sf.drawbridge.controller.job.ManageJobsController" parent="abstractController"/>
- <bean id="addOrEditJobController" class="net.sf.drawbridge.controller.job.AddOrEditJobController" parent="abstractController"/>
- <bean id="addOrEditJobSubmitController" class="net.sf.drawbridge.controller.job.AddOrEditJobSubmitController" parent="abstractController"/>
- <bean id="deleteJobSubmitController" class="net.sf.drawbridge.controller.job.DeleteJobSubmitController" parent="abstractController"/>
- <bean id="runJobController" class="net.sf.drawbridge.controller.job.RunJobController" parent="abstractController"/>
- <bean id="runJobSubmitController" class="net.sf.drawbridge.controller.job.RunJobSubmitController" parent="abstractController"/>
-
- <bean id="urlFilenameViewController" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
-
<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
<property name="prefix" value="/WEB-INF/jsp/"/>
<property name="suffix" value=".jsp"/>
</bean>
- <bean id="redirectResolver" class="org.springframework.web.servlet.view.BeanNameViewResolver">
- <property name="order" value="1"/>
- </bean>
-
- <bean id="mainMenuRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="MainMenu.do"/>
- </bean>
-
- <bean id="manageDriversRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="ManageDrivers.do"/>
- </bean>
-
- <bean id="manageDatabasesRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="ManageDatabases.do"/>
- </bean>
-
- <bean id="manageUsersRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="ManageUsers.do"/>
- </bean>
-
- <bean id="manageGroupsRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="ManageGroups.do"/>
- </bean>
-
- <bean id="manageRunAsRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="ManageRunAsAccounts.do"/>
- </bean>
-
- <bean id="manageJobsRedirectView" class="org.springframework.web.servlet.view.RedirectView">
- <property name="contextRelative" value="true"/>
- <property name="url" value="ManageJobs.do"/>
- </bean>
-
<bean id="localeResolver" class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver" />
<bean id="exceptionResolver" class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
Modified: trunk/drawbridge/src/java/drawbridge-core-spring.xml
===================================================================
--- trunk/drawbridge/src/java/drawbridge-core-spring.xml 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/drawbridge-core-spring.xml 2008-04-22 01:45:33 UTC (rev 45)
@@ -5,21 +5,21 @@
<import resource="net/sf/drawbridge/dao/drawbridge-dao-spring.xml"/>
<bean id="DrawbridgeService" class="net.sf.drawbridge.domain.SecureDrawbridgeService">
- <constructor-arg ref="DefaultDrawbridgeService"/>
+ <constructor-arg>
+ <bean id="DefaultDrawbridgeService" class="net.sf.drawbridge.domain.DefaultDrawbridgeService">
+ <constructor-arg ref="UserDao"/>
+ <constructor-arg ref="GroupDao"/>
+ <constructor-arg ref="RunAsAccountDao"/>
+ <constructor-arg ref="DatabaseDao"/>
+ <constructor-arg ref="JobDao"/>
+ <constructor-arg ref="DriverDao"/>
+ <constructor-arg ref="QueryParser"/>
+ <constructor-arg ref="JobExecuter"/>
+ </bean>
+ </constructor-arg>
<constructor-arg ref="SecurityService"/>
</bean>
-
- <bean id="DefaultDrawbridgeService" class="net.sf.drawbridge.domain.DefaultDrawbridgeService">
- <constructor-arg ref="UserDao"/>
- <constructor-arg ref="GroupDao"/>
- <constructor-arg ref="RunAsAccountDao"/>
- <constructor-arg ref="DatabaseDao"/>
- <constructor-arg ref="JobDao"/>
- <constructor-arg ref="DriverDao"/>
- <constructor-arg ref="QueryParser"/>
- <constructor-arg ref="JobExecuter"/>
- </bean>
-
+
<bean id="SecurityService" class="net.sf.drawbridge.security.DefaultSecurityService"/>
<bean id="Scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -23,19 +23,16 @@
import net.sf.drawbridge.vo.ExecutionContext;
import net.sf.drawbridge.vo.User;
-import org.springframework.web.servlet.mvc.AbstractController;
+import org.springframework.beans.factory.annotation.Autowired;
-public abstract class AbstractDrawbridgeController extends AbstractController{
+public abstract class AbstractDrawbridgeController {
public static final String LOGGED_IN_USER = "loggedInUser";
public static final String MESSAGE_LIST="messageList";
+ @Autowired
protected DrawbridgeService drawbridgeService;
- public void setDrawbridgeService(DrawbridgeService drawbridgeService){
- this.drawbridgeService=drawbridgeService;
- }
-
protected String getValueFromRequestOrSession(String name, HttpServletRequest request){
return getValueFromRequestOrSession(name, request, true);
}
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/AdminController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/AdminController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/AdminController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -20,13 +20,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AdminController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/Admin.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav = new ModelAndView("admin");
- return mav;
+ return new ModelAndView("admin");
}
}
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/FakeLoginController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/FakeLoginController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/FakeLoginController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,29 +22,33 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import net.sf.drawbridge.vo.Status;
import net.sf.drawbridge.vo.StatusMessage;
import net.sf.drawbridge.vo.User;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class FakeLoginController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/FakeLogin.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav = new ModelAndView("mainMenu");
-
+ ModelAndView mav=new ModelAndView("mainMenu");
User user = null;
List<StatusMessage> messages=new ArrayList<StatusMessage>();
try{
- Integer userId = new Integer(request.getParameter(LOGGED_IN_USER));
- user = this.drawbridgeService.getUser(userId);
+ user = this.drawbridgeService.getUser(new Integer(request.getParameter(LOGGED_IN_USER)));
} catch(Exception ex){
ex.printStackTrace();
}
- request.getSession().setAttribute(LOGGED_IN_USER, user);
+ HttpSession session=request.getSession();
+ session.setAttribute(LOGGED_IN_USER, user);
messages.add(new StatusMessage(Status.INFO, "Logged in as: "+user, null));
- mav.addObject(MESSAGE_LIST,messages);
+ session.setAttribute(MESSAGE_LIST,messages);
mav.addObject("databaseList", drawbridgeService.listDatabases());
return mav;
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -20,12 +20,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class MainMenuController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/MainMenu.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav = new ModelAndView("mainMenu");
+ ModelAndView mav=new ModelAndView("mainMenu");
mav.addObject("databaseList", drawbridgeService.listDatabases());
return mav;
}
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditDatabaseController extends AbstractDrawbridgeController {
+ @RequestMapping(value={"/AddDatabase.do","/EditDatabase.do"})
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav=new ModelAndView("database/addOrEdit");
String databaseId=request.getParameter("databaseId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -31,14 +31,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditDatabaseSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(AddOrEditDatabaseSubmitController.class);
+ @RequestMapping(value="/AddOrEditDatabaseSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageDatabasesRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageDatabases.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
request.getSession().setAttribute(MESSAGE_LIST, messages);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -29,14 +29,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class DeleteDatabaseSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(DeleteDatabaseSubmitController.class);
+ @RequestMapping(value="/DeleteDatabaseSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageDatabasesRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageDatabases.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
String databaseIdStr = request.getParameter("databaseId");
try{
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/ManageDatabasesController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/ManageDatabasesController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/database/ManageDatabasesController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class ManageDatabasesController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/ManageDatabases.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("database/manage");
mav.addObject("databaseList", drawbridgeService.listDatabases());
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditDriverController extends AbstractDrawbridgeController {
+ @RequestMapping(value={"/AddDriver.do","/EditDriver.do"})
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav=new ModelAndView("driver/addOrEdit");
String driverId=request.getParameter("driverId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -30,14 +30,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditDriverSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(AddOrEditDriverSubmitController.class);
+ @RequestMapping(value="/AddOrEditDriverSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageDriversRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageDrivers.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
request.getSession().setAttribute(MESSAGE_LIST, messages);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/DeleteDriverSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/DeleteDriverSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/DeleteDriverSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -29,14 +29,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class DeleteDriverSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(DeleteDriverSubmitController.class);
+ @RequestMapping(value="/DeleteDriverSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageDriversRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageDrivers.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
String driverIdStr = request.getParameter("driverId");
try{
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/ManageDriversController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/ManageDriversController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/driver/ManageDriversController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class ManageDriversController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/ManageDrivers.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("driver/manage");
mav.addObject("driverList", drawbridgeService.listDrivers());
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -26,10 +26,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
import net.sf.drawbridge.vo.User;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditGroupController extends AbstractDrawbridgeController {
+ @RequestMapping(value={"/AddGroup.do","/EditGroup.do"})
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav=new ModelAndView("group/addOrEdit");
String groupIdStr=request.getParameter("groupId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -30,14 +30,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditGroupSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(AddOrEditGroupSubmitController.class);
+ @RequestMapping(value="/AddOrEditGroupSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageGroupsRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageGroups.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
request.getSession().setAttribute(MESSAGE_LIST, messages);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/DeleteGroupSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/DeleteGroupSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/DeleteGroupSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -29,14 +29,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class DeleteGroupSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(DeleteGroupSubmitController.class);
+ @RequestMapping(value="/DeleteGroupSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageGroupsRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageGroups.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
String groupIdStr = request.getParameter("groupId");
try{
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/ManageGroupsController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/ManageGroupsController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/group/ManageGroupsController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class ManageGroupsController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/ManageGroups.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("group/manage");
mav.addObject("groupList", drawbridgeService.listGroups());
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.vo.Job;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditJobController extends AbstractJobController {
+ @RequestMapping(value={"/AddJob.do","/EditJob.do"})
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav=new ModelAndView("job/addOrEdit");
String jobIdStr=request.getParameter("jobId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/AddOrEditJobSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -32,14 +32,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditJobSubmitController extends AbstractJobController {
private static final Log LOG=LogFactory.getLog(AddOrEditJobSubmitController.class);
+ @RequestMapping(value="/AddOrEditJobSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageJobsRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageJobs.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
request.getSession().setAttribute(MESSAGE_LIST, messages);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/DeleteJobSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/DeleteJobSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/DeleteJobSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -28,14 +28,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class DeleteJobSubmitController extends AbstractJobController {
private static final Log LOG=LogFactory.getLog(DeleteJobSubmitController.class);
+ @RequestMapping(value="/DeleteJobSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageJobsRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageJobs.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
String jobIdStr = request.getParameter("jobId");
Integer databaseId=null;
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/ManageJobsController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/ManageJobsController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/ManageJobsController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -20,10 +20,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class ManageJobsController extends AbstractJobController {
+ @RequestMapping(value="/ManageJobs.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("job/manage");
String databaseIdStr=getValueFromRequestOrSession("databaseId", request, false);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -23,10 +23,14 @@
import net.sf.drawbridge.vo.Job;
import net.sf.drawbridge.vo.RunAsAccount;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class RunJobController extends AbstractJobController {
+ @RequestMapping(value="/RunJob.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("job/run");
try{
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/job/RunJobSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -25,10 +25,14 @@
import net.sf.drawbridge.vo.Job;
import net.sf.drawbridge.vo.QueryParam;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class RunJobSubmitController extends AbstractJobController {
+ @RequestMapping(value="/RunJobSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("job/results");
String jobIdStr=request.getParameter("jobId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditRunAsController extends AbstractDrawbridgeController {
+ @RequestMapping(value={"/AddRunAsAccount.do","/EditRunAsAccount.do"})
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav=new ModelAndView("runAs/addOrEdit");
String runAsIdStr=request.getParameter("runAsId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -31,14 +31,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditRunAsSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(AddOrEditRunAsSubmitController.class);
+ @RequestMapping(value="/AddOrEditRunAsAccountSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageRunAsRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageRunAsAccounts.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
request.getSession().setAttribute(MESSAGE_LIST, messages);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -29,14 +29,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class DeleteRunAsSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(DeleteRunAsSubmitController.class);
+ @RequestMapping(value="/DeleteRunAsAccountSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageRunAsRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageRunAsAccounts.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
String runAsIdStr = request.getParameter("runAsId");
try{
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/ManageRunAsController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/ManageRunAsController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/runas/ManageRunAsController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class ManageRunAsController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/ManageRunAsAccounts.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("runAs/manage");
mav.addObject("runAsList", drawbridgeService.listRunAsAccounts(null));
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -26,10 +26,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
import net.sf.drawbridge.vo.Group;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditUserController extends AbstractDrawbridgeController {
+ @RequestMapping(value={"/AddUser.do","/EditUser.do"})
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav=new ModelAndView("user/addOrEdit");
String userIdStr=request.getParameter("userId");
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/AddOrEditUserSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -30,14 +30,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class AddOrEditUserSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(AddOrEditUserSubmitController.class);
+ @RequestMapping(value="/AddOrEditUserSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageUsersRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageUsers.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
request.getSession().setAttribute(MESSAGE_LIST, messages);
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/DeleteUserSubmitController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/DeleteUserSubmitController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/DeleteUserSubmitController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -29,14 +29,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class DeleteUserSubmitController extends AbstractDrawbridgeController {
private static final Log LOG=LogFactory.getLog(DeleteUserSubmitController.class);
+ @RequestMapping(value="/DeleteUserSubmit.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
- ModelAndView mav=new ModelAndView("manageUsersRedirectView");
+ ModelAndView mav=new ModelAndView("redirect:/ManageUsers.do");
List<StatusMessage> messages=new ArrayList<StatusMessage>();
String userIdStr = request.getParameter("userId");
try{
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/ManageUsersController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/ManageUsersController.java 2008-04-20 02:11:55 UTC (rev 44)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/user/ManageUsersController.java 2008-04-22 01:45:33 UTC (rev 45)
@@ -22,10 +22,14 @@
import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+@Controller
public class ManageUsersController extends AbstractDrawbridgeController {
+ @RequestMapping(value="/ManageUsers.do")
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mav = new ModelAndView("user/manage");
mav.addObject("userList", drawbridgeService.listUsers());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
