Short URL format for common Alfresco servlets - for internal use

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-06-04 11:06:26 +00:00
parent 45fcc962e1
commit c8b5be7bca
6 changed files with 57 additions and 19 deletions

View File

@@ -73,8 +73,11 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
protected static final String MSG_ERROR_CONTENT_MISSING = "error_content_missing"; protected static final String MSG_ERROR_CONTENT_MISSING = "error_content_missing";
protected static final String URL_DIRECT = "d";
protected static final String URL_DIRECT_LONG = "direct";
protected static final String URL_ATTACH = "a";
protected static final String URL_ATTACH_LONG = "attach";
protected static final String ARG_PROPERTY = "property"; protected static final String ARG_PROPERTY = "property";
protected static final String ARG_ATTACH = "attach";
protected static final String ARG_PATH = "path"; protected static final String ARG_PATH = "path";
/** /**
@@ -122,7 +125,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
// attachment mode (either 'attach' or 'direct') // attachment mode (either 'attach' or 'direct')
String attachToken = t.nextToken(); String attachToken = t.nextToken();
boolean attachment = attachToken.equals(ARG_ATTACH); boolean attachment = URL_ATTACH.equals(attachToken) || URL_ATTACH_LONG.equals(attachToken);
// get or calculate the noderef and filename to download as // get or calculate the noderef and filename to download as
NodeRef nodeRef; NodeRef nodeRef;

View File

@@ -75,8 +75,8 @@ public class DownloadContentServlet extends BaseDownloadContentServlet
private static Log logger = LogFactory.getLog(DownloadContentServlet.class); private static Log logger = LogFactory.getLog(DownloadContentServlet.class);
private static final String DOWNLOAD_URL = "/download/attach/{0}/{1}/{2}/{3}"; private static final String DOWNLOAD_URL = "/d/" + URL_ATTACH + "/{0}/{1}/{2}/{3}";
private static final String BROWSER_URL = "/download/direct/{0}/{1}/{2}/{3}"; private static final String BROWSER_URL = "/d/" + URL_DIRECT + "/{0}/{1}/{2}/{3}";
@Override @Override
protected Log getLogger() protected Log getLogger()

View File

@@ -308,6 +308,6 @@ public class ExternalAccessServlet extends BaseServlet
} }
// example: http://<server>/alfresco/navigate/<outcome>[/<workspace>/<store>/<nodeId>] // example: http://<server>/alfresco/navigate/<outcome>[/<workspace>/<store>/<nodeId>]
private static final String EXTERNAL_URL = "/navigate/{0}"; private static final String EXTERNAL_URL = "/n/{0}";
private static final String EXTERNAL_URL_ARGS = "/navigate/{0}/{1}"; private static final String EXTERNAL_URL_ARGS = "/n/{0}/{1}";
} }

View File

@@ -73,8 +73,8 @@ public class GuestDownloadContentServlet extends BaseDownloadContentServlet
private static Log logger = LogFactory.getLog(GuestDownloadContentServlet.class); private static Log logger = LogFactory.getLog(GuestDownloadContentServlet.class);
private static final String DOWNLOAD_URL = "/guestDownload/attach/{0}/{1}/{2}/{3}"; private static final String DOWNLOAD_URL = "/gd/" + URL_ATTACH + "/{0}/{1}/{2}/{3}";
private static final String BROWSER_URL = "/guestDownload/direct/{0}/{1}/{2}/{3}"; private static final String BROWSER_URL = "/gd/" + URL_DIRECT + "/{0}/{1}/{2}/{3}";
@Override @Override
protected Log getLogger() protected Log getLogger()

View File

@@ -78,8 +78,8 @@ public class TemplateContentServlet extends BaseTemplateContentServlet
private static final Log logger = LogFactory.getLog(TemplateContentServlet.class); private static final Log logger = LogFactory.getLog(TemplateContentServlet.class);
private static final String DEFAULT_URL = "/template/{0}/{1}/{2}"; private static final String DEFAULT_URL = "/t/{0}/{1}/{2}";
private static final String TEMPLATE_URL = "/template/{0}/{1}/{2}/{3}/{4}/{5}"; private static final String TEMPLATE_URL = "/t/{0}/{1}/{2}/{3}/{4}/{5}";
@Override @Override
protected Log getLogger() protected Log getLogger()

View File

@@ -281,14 +281,19 @@
<url-pattern>/uploadFileServlet</url-pattern> <url-pattern>/uploadFileServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>uploadContent</servlet-name>
<url-pattern>/upload/*</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>downloadContent</servlet-name> <servlet-name>downloadContent</servlet-name>
<url-pattern>/download/*</url-pattern> <url-pattern>/download/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>uploadContent</servlet-name> <servlet-name>downloadContent</servlet-name>
<url-pattern>/upload/*</url-pattern> <url-pattern>/d/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@@ -297,13 +302,8 @@
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>guestTemplateContent</servlet-name> <servlet-name>guestDownloadContent</servlet-name>
<url-pattern>/guestTemplate/*</url-pattern> <url-pattern>/gd/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>externalAccess</servlet-name>
<url-pattern>/navigate/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@@ -311,11 +311,41 @@
<url-pattern>/template/*</url-pattern> <url-pattern>/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>templateContent</servlet-name>
<url-pattern>/t/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>guestTemplateContent</servlet-name>
<url-pattern>/guestTemplate/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>guestTemplateContent</servlet-name>
<url-pattern>/gt/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>externalAccess</servlet-name>
<url-pattern>/navigate/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>externalAccess</servlet-name>
<url-pattern>/n/*</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>commandServlet</servlet-name> <servlet-name>commandServlet</servlet-name>
<url-pattern>/command/*</url-pattern> <url-pattern>/command/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>commandServlet</servlet-name>
<url-pattern>/c/*</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>ajaxServlet</servlet-name> <servlet-name>ajaxServlet</servlet-name>
<url-pattern>/ajax/*</url-pattern> <url-pattern>/ajax/*</url-pattern>
@@ -335,6 +365,11 @@
<servlet-name>apiServlet</servlet-name> <servlet-name>apiServlet</servlet-name>
<url-pattern>/service/*</url-pattern> <url-pattern>/service/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>apiServlet</servlet-name>
<url-pattern>/s/*</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>proxyServlet</servlet-name> <servlet-name>proxyServlet</servlet-name>