inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Web Scripts from BRANCHES/DEV/DAVE

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2007-03-08 14:36:34 +00:00
parent d5b82c15a7
commit 570cbb6606
37 changed files with 1788 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
source/java/org/alfresco/web/api/APIServlet.java
View File

@@ -52,7 +52,7 @@ public class APIServlet extends HttpServlet
private static final Log logger = LogFactory.getLog(APIServlet.class);
// API Services
private APIServiceRegistry apiServiceRegistry;
private DeclarativeAPIRegistry apiServiceRegistry;
@Override
@@ -63,7 +63,7 @@ public class APIServlet extends HttpServlet
// Retrieve all web api services and index by http url & http method
ApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
initContext(context);
apiServiceRegistry = new APIServiceRegistry(context);
// apiServiceRegistry = new DeclarativeAPIServiceRegistry(context);
}
@@ -79,45 +79,45 @@ public class APIServlet extends HttpServlet
*/
protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
long start = System.currentTimeMillis();
APIRequest request = new APIRequest(req);
APIResponse response = new APIResponse(res);
try
{
//
// Execute appropriate service
//
// TODO: Handle errors (with appropriate HTTP error responses)
APIRequest.HttpMethod method = request.getHttpMethod();
String uri = request.getPathInfo();
if (logger.isDebugEnabled())
logger.debug("Processing request (" + request.getHttpMethod() + ") " + request.getRequestURL() + (request.getQueryString() != null ? "?" + request.getQueryString() : "") + " (agent: " + request.getAgent() + ")");
APIService service = apiServiceRegistry.get(method, uri);
if (service != null)
{
// TODO: Wrap in single transaction
service.execute(request, response);
}
else
{
if (logger.isDebugEnabled())
logger.debug("Request does not map to service.");
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
// TODO: add appropriate error detail
}
}
// TODO: exception handling
finally
{
long end = System.currentTimeMillis();
if (logger.isDebugEnabled())
logger.debug("Processed request (" + request.getHttpMethod() + ") " + request.getRequestURL() + (request.getQueryString() != null ? "?" + request.getQueryString() : "") + " in " + (end - start) + "ms");
}
// long start = System.currentTimeMillis();
// APIRequest request = new APIRequest(req);
// APIResponse response = new APIResponse(res);
//
// try
// {
// //
// // Execute appropriate service
// //
// // TODO: Handle errors (with appropriate HTTP error responses)
//
// APIRequest.HttpMethod method = request.getHttpMethod();
// String uri = request.getPathInfo();
//
// if (logger.isDebugEnabled())
// logger.debug("Processing request (" + request.getHttpMethod() + ") " + request.getRequestURL() + (request.getQueryString() != null ? "?" + request.getQueryString() : "") + " (agent: " + request.getAgent() + ")");
//
// APIServiceDescription service = apiServiceRegistry.get(method, uri);
// if (service != null)
// {
// // TODO: Wrap in single transaction
// service.execute(request, response);
// }
// else
// {
// if (logger.isDebugEnabled())
// logger.debug("Request does not map to service.");
//
// response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
// // TODO: add appropriate error detail
// }
// }
// // TODO: exception handling
// finally
// {
// long end = System.currentTimeMillis();
// if (logger.isDebugEnabled())
// logger.debug("Processed request (" + request.getHttpMethod() + ") " + request.getRequestURL() + (request.getQueryString() != null ? "?" + request.getQueryString() : "") + " in " + (end - start) + "ms");
// }
}
/**