Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[4932] sandbox/3.0.x/geonetwork-gaap/ geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request
|
From: <jos...@us...> - 2009-08-17 09:31:41
|
Revision: 4932
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=4932&view=rev
Author: josegar74
Date: 2009-08-17 09:31:32 +0000 (Mon, 17 Aug 2009)
Log Message:
-----------
Validation and cleanup
Modified Paths:
--------------
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/BaseGetRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteGroupRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteUserRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupsRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetRequestFactory.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUserRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUsersRequest.java
sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/UnknownRequest.java
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/BaseGetRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/BaseGetRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/BaseGetRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,10 +1,11 @@
package org.geonetwork.gaap.web.request;
import org.springframework.web.context.WebApplicationContext;
-import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.jibx.runtime.IBindingFactory;
import org.jibx.runtime.BindingDirectory;
import org.jibx.runtime.IMarshallingContext;
+import org.apache.commons.lang.StringUtils;
+import org.geonetwork.gaap.web.util.RequestUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -12,6 +13,7 @@
import java.io.Writer;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
+import java.util.List;
/**
* Interface implemented by Get Gaap requests
@@ -28,12 +30,26 @@
this.waco = waco;
this.requestName = requestName;
}
-
+
+ /**
+ * Method to implement by requests
+ *
+ * @param request HttpServletRequest
+ * @param response HttpServletResponse
+ * @throws ServletException
+ */
public abstract void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException;
- protected void outputResponse(ResponseReport er, HttpServletResponse response) throws ServletException {
+ /**
+ * Outputs the jibx xml mashalling of an object
+ *
+ * @param er Object to marshall
+ * @param response HttpServletResponse to output the xml
+ * @throws ServletException
+ */
+ protected void outputResponse(Object er, HttpServletResponse response) throws ServletException {
try {
- IBindingFactory bfact = BindingDirectory.getFactory(ResponseReport.class);
+ IBindingFactory bfact = BindingDirectory.getFactory(er.getClass());
IMarshallingContext marshallingContext = bfact.createMarshallingContext();
// marshal to servlet response outputstream
@@ -46,4 +62,32 @@
throw new ServletException(e);
}
}
+
+ /**
+ * Method to validate request parameters. Default implementation
+ *
+ * @param request HttpServletRequest
+ * @param errors List of errors
+ * @throws ServletException
+ */
+ protected boolean validate(HttpServletRequest request, List<String> errors) {
+ return true;
+ }
+
+ /**
+ * Validation for UUID param
+ *
+ * @param request HttpServletRequest
+ * @param errors List of errors
+ * @return
+ */
+ protected boolean validateUuid(HttpServletRequest request, List<String> errors) {
+ if (StringUtils.isEmpty(RequestUtil.getParameter(request, UUID_PARAM))) {
+ errors.add("Param uuid is required.");
+
+ return false;
+ }
+
+ return true;
+ }
}
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteGroupRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteGroupRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteGroupRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,8 +1,8 @@
package org.geonetwork.gaap.web.request;
import org.geonetwork.gaap.web.util.RequestUtil;
+import org.geonetwork.gaap.web.ServiceName;
import org.geonetwork.gaap.services.GroupService;
-import org.geonetwork.gaap.services.exception.GaapServiceException;
import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
import org.springframework.web.context.WebApplicationContext;
@@ -10,6 +10,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
+import java.util.List;
+import java.util.ArrayList;
/**
* Get service to delete a group
@@ -22,21 +24,34 @@
super(waco, requestName);
}
- public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ ResponseReport rr = new ResponseReport(ResponseStatusCode.OK);
+
+ // Validate request
+ List<String> errors = new ArrayList<String>();
+ if (!validate(request, errors)) {
+ rr.setStatus(ResponseStatusCode.ERROR);
+ for(String error: errors) {
+ rr.addException(error);
+ }
+ outputResponse(rr, response);
+ }
+
String groupUuid = RequestUtil.getParameter(request, UUID_PARAM);
+ GroupService groupService = (GroupService) waco.getBean(ServiceName.GROUP_SERVICE);
- GroupService groupService = (GroupService) waco.getBean("groupService");
try {
groupService.deleteGroup(groupUuid);
+ outputResponse(rr, response);
- ResponseReport er = new ResponseReport(ResponseStatusCode.OK);
-
- outputResponse(er, response);
-
- } catch (GaapServiceException e) {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException(e.getMessage());
- outputResponse(er, response);
+ } catch (Exception e) {
+ rr.setStatus(ResponseStatusCode.ERROR);
+ rr.addException(e.getMessage());
+ outputResponse(rr, response);
}
}
+
+ protected boolean validate(HttpServletRequest request, List<String> errors) {
+ return super.validate(request, errors) && validateUuid(request, errors);
+ }
}
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteUserRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteUserRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/DeleteUserRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,8 +1,8 @@
package org.geonetwork.gaap.web.request;
import org.geonetwork.gaap.web.util.RequestUtil;
+import org.geonetwork.gaap.web.ServiceName;
import org.geonetwork.gaap.services.UserService;
-import org.geonetwork.gaap.services.exception.GaapServiceException;
import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
import org.springframework.web.context.WebApplicationContext;
@@ -10,6 +10,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
+import java.util.List;
+import java.util.ArrayList;
/**
* Get service to delete a user
@@ -23,19 +25,33 @@
}
public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ ResponseReport rr = new ResponseReport(ResponseStatusCode.OK);
+
+ // Validate request
+ List<String> errors = new ArrayList<String>();
+ if (!validate(request, errors)) {
+ rr.setStatus(ResponseStatusCode.ERROR);
+ for(String error: errors) {
+ rr.addException(error);
+ }
+ outputResponse(rr, response);
+ }
+
String userUuid = RequestUtil.getParameter(request, UUID_PARAM);
+ UserService userService = (UserService) waco.getBean(ServiceName.USER_SERVICE);
- UserService userService = (UserService) waco.getBean("userService");
try {
userService.deleteUser(userUuid);
+ outputResponse(rr, response);
- ResponseReport er = new ResponseReport(ResponseStatusCode.OK);
- outputResponse(er, response);
-
- } catch (GaapServiceException e) {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException(e.getMessage());
- outputResponse(er, response);
+ } catch (Exception e) {
+ rr.setStatus(ResponseStatusCode.ERROR);
+ rr.addException(e.getMessage());
+ outputResponse(rr, response);
}
}
+
+ protected boolean validate(HttpServletRequest request, List<String> errors) {
+ return super.validate(request, errors) && validateUuid(request, errors);
+ }
}
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -2,20 +2,17 @@
import org.springframework.web.context.WebApplicationContext;
import org.geonetwork.gaap.web.util.RequestUtil;
+import org.geonetwork.gaap.web.ServiceName;
import org.geonetwork.gaap.services.GroupService;
import org.geonetwork.gaap.domain.group.Group;
-import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IMarshallingContext;
+import org.geonetwork.gaap.domain.web.response.GetGroupResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import java.io.Writer;
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
+import java.util.List;
+import java.util.ArrayList;
/**
* Get service to get a group
@@ -23,36 +20,43 @@
* @author Jose
*/
public class GetGroupRequest extends BaseGetRequest {
-
+
public GetGroupRequest(WebApplicationContext waco, String requestName) {
super(waco, requestName);
}
public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ GetGroupResponse res = new GetGroupResponse();
+
+ // Validate request
+ List<String> errors = new ArrayList<String>();
+ if (!validate(request, errors)) {
+ res.setStatus(ResponseStatusCode.ERROR);
+ for (String error : errors) {
+ res.addException(error);
+ }
+ outputResponse(res, response);
+ }
+
String groupUuid = RequestUtil.getParameter(request, UUID_PARAM);
+ GroupService groupService = (GroupService) waco.getBean(ServiceName.GROUP_SERVICE);
- GroupService groupService = (GroupService) waco.getBean("groupService");
try {
Group group = groupService.retrieveGroup(groupUuid);
+ res.setGroup(group);
- if (group != null) {
- // set up JiBX marshalling context
- IBindingFactory bfact = BindingDirectory.getFactory(Group.class);
- IMarshallingContext marshallingContext = bfact.createMarshallingContext();
- // marshal to servlet response outputstream
- response.setContentType("application/xml");
- Writer writer = new BufferedWriter(new OutputStreamWriter(response.getOutputStream()));
- marshallingContext.setIndent(3);
- marshallingContext.setOutput(writer);
- marshallingContext.marshalDocument(group, "UTF-8", null);
- } else {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException("Group " + groupUuid + " is not valid");
- outputResponse(er, response);
- }
+ outputResponse(res, response);
+
} catch (Exception e) {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException(e.getMessage());
- outputResponse(er, response);
- } }
+ res.setStatus(ResponseStatusCode.ERROR);
+ res.setGroup(null);
+ res.addException(e.getMessage());
+
+ outputResponse(res, response);
+ }
+ }
+
+ protected boolean validate(HttpServletRequest request, List<String> errors) {
+ return super.validate(request, errors) && validateUuid(request, errors);
+ }
}
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupsRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupsRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetGroupsRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,24 +1,17 @@
package org.geonetwork.gaap.web.request;
import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
import org.geonetwork.gaap.services.GroupService;
import org.geonetwork.gaap.domain.group.Group;
import org.geonetwork.gaap.domain.web.response.GetGroupsResponse;
import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IMarshallingContext;
+import org.geonetwork.gaap.web.ServiceName;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
import java.util.List;
-import java.io.Writer;
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
/**
* Get service to get all groups
@@ -32,27 +25,25 @@
}
public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ GroupService groupService = (GroupService) waco.getBean(ServiceName.GROUP_SERVICE);
+ GetGroupsResponse res = new GetGroupsResponse();
- GroupService groupService = (GroupService) waco.getBean("groupService");
try {
List<Group> groups = groupService.retrieveAllGroups();
- GetGroupsResponse res = new GetGroupsResponse();
res.setGroups(groups);
- // set up JiBX marshalling context
- IBindingFactory bfact = BindingDirectory.getFactory(Group.class);
- IMarshallingContext marshallingContext = bfact.createMarshallingContext();
- // marshal to servlet response outputstream
- response.setContentType("application/xml");
- Writer writer = new BufferedWriter(new OutputStreamWriter(response.getOutputStream()));
- marshallingContext.setIndent(3);
- marshallingContext.setOutput(writer);
- marshallingContext.marshalDocument(res, "UTF-8", null);
+ outputResponse(res, response);
} catch (Exception e) {
ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
er.addException(e.getMessage());
outputResponse(er, response);
+
+ res.setStatus(ResponseStatusCode.ERROR);
+ res.addException(e.getMessage());
+ res.setGroups(null);
+
+ outputResponse(res, response);
}
}
}
\ No newline at end of file
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetRequestFactory.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetRequestFactory.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetRequestFactory.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -18,7 +18,7 @@
return new DeleteUserRequest(waco, requestName);
} else if (requestName.equalsIgnoreCase(GaapGetRequest.GETUSER.toString())) {
- return new DeleteUserRequest(waco, requestName);
+ return new GetUserRequest(waco, requestName);
} else if (requestName.equalsIgnoreCase(GaapGetRequest.GETGROUP.toString())) {
return new GetGroupRequest(waco, requestName);
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUserRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUserRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUserRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,22 +1,18 @@
package org.geonetwork.gaap.web.request;
import org.geonetwork.gaap.web.util.RequestUtil;
+import org.geonetwork.gaap.web.ServiceName;
import org.geonetwork.gaap.services.UserService;
import org.geonetwork.gaap.domain.user.User;
-import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
+import org.geonetwork.gaap.domain.web.response.GetUserResponse;
import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IMarshallingContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import java.io.Writer;
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
+import java.util.List;
+import java.util.ArrayList;
/**
* Get service to get a user
@@ -29,31 +25,37 @@
}
public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+ GetUserResponse res = new GetUserResponse();
+
+ // Validate request
+ List<String> errors = new ArrayList<String>();
+ if (!validate(request, errors)) {
+ res.setStatus(ResponseStatusCode.ERROR);
+ for (String error : errors) {
+ res.addException(error);
+ }
+ outputResponse(res, response);
+ }
+
String userUuid = RequestUtil.getParameter(request, UUID_PARAM);
+ UserService userService = (UserService) waco.getBean(ServiceName.USER_SERVICE);
- UserService userService = (UserService) waco.getBean("userService");
try {
User user = userService.retrieveUser(userUuid);
+ res.setUser(user);
- if (user != null) {
- // set up JiBX marshalling context
- IBindingFactory bfact = BindingDirectory.getFactory(User.class);
- IMarshallingContext marshallingContext = bfact.createMarshallingContext();
- // marshal to servlet response outputstream
- response.setContentType("application/xml");
- Writer writer = new BufferedWriter(new OutputStreamWriter(response.getOutputStream()));
- marshallingContext.setIndent(3);
- marshallingContext.setOutput(writer);
- marshallingContext.marshalDocument(user, "UTF-8", null);
- } else {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException("User " + userUuid + " is not valid");
- outputResponse(er, response);
- }
+ outputResponse(res, response);
+
} catch (Exception e) {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException(e.getMessage());
- outputResponse(er, response);
+ res.setStatus(ResponseStatusCode.ERROR);
+ res.setUser(null);
+ res.addException(e.getMessage());
+
+ outputResponse(res, response);
}
}
+
+ protected boolean validate(HttpServletRequest request, List<String> errors) {
+ return super.validate(request, errors) && validateUuid(request, errors);
+ }
}
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUsersRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUsersRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/GetUsersRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,25 +1,15 @@
package org.geonetwork.gaap.web.request;
import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.geonetwork.gaap.web.util.RequestUtil;
import org.geonetwork.gaap.services.UserService;
import org.geonetwork.gaap.domain.user.User;
-import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
import org.geonetwork.gaap.domain.web.response.GetUsersResponse;
-import org.geonetwork.gaap.domain.group.Group;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IMarshallingContext;
+import org.geonetwork.gaap.web.ServiceName;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
-import java.io.Writer;
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
import java.util.List;
/**
@@ -34,27 +24,21 @@
}
public void exec(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-
- UserService userService = (UserService) waco.getBean("userService");
+ UserService userService = (UserService) waco.getBean(ServiceName.USER_SERVICE);
+ GetUsersResponse res = new GetUsersResponse();
+
try {
List<User> users = userService.retrieveAllUsers();
- GetUsersResponse res = new GetUsersResponse();
res.setUsers(users);
- // set up JiBX marshalling context
- IBindingFactory bfact = BindingDirectory.getFactory(Group.class);
- IMarshallingContext marshallingContext = bfact.createMarshallingContext();
- // marshal to servlet response outputstream
- response.setContentType("application/xml");
- Writer writer = new BufferedWriter(new OutputStreamWriter(response.getOutputStream()));
- marshallingContext.setIndent(3);
- marshallingContext.setOutput(writer);
- marshallingContext.marshalDocument(res, "UTF-8", null);
+ outputResponse(res, response);
} catch (Exception e) {
- ResponseReport er = new ResponseReport(ResponseStatusCode.ERROR);
- er.addException(e.getMessage());
- outputResponse(er, response);
+ res.setStatus(ResponseStatusCode.ERROR);
+ res.addException(e.getMessage());
+ res.setUsers(null);
+
+ outputResponse(res, response);
}
}
}
Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/UnknownRequest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/UnknownRequest.java 2009-08-17 09:25:39 UTC (rev 4931)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-web/src/main/java/org/geonetwork/gaap/web/request/UnknownRequest.java 2009-08-17 09:31:32 UTC (rev 4932)
@@ -1,9 +1,6 @@
package org.geonetwork.gaap.web.request;
import org.springframework.web.context.WebApplicationContext;
-import org.geonetwork.gaap.web.util.RequestUtil;
-import org.geonetwork.gaap.services.GroupService;
-import org.geonetwork.gaap.services.exception.GaapServiceException;
import org.geonetwork.gaap.domain.web.response.ResponseReport;
import org.geonetwork.gaap.domain.web.response.ResponseStatusCode;
@@ -12,7 +9,7 @@
import javax.servlet.ServletException;
/**
- * Unknown reques
+ * Unknown request
*
* @author Jose
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|