diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index 6c1cd17587..dc174452e7 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -1107,6 +1107,7 @@ class="org.alfresco.repo.web.scripts.publishing.ChannelsGet" parent="webscript"> + diff --git a/source/java/org/alfresco/repo/web/scripts/publishing/ChannelsGet.java b/source/java/org/alfresco/repo/web/scripts/publishing/ChannelsGet.java index 04515109bd..937423091b 100644 --- a/source/java/org/alfresco/repo/web/scripts/publishing/ChannelsGet.java +++ b/source/java/org/alfresco/repo/web/scripts/publishing/ChannelsGet.java @@ -34,6 +34,7 @@ import org.alfresco.repo.web.scripts.WebScriptUtil; import org.alfresco.service.cmr.publishing.channels.Channel; import org.alfresco.service.cmr.publishing.channels.ChannelService; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.urlshortening.UrlShortener; import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.Status; @@ -49,7 +50,8 @@ public class ChannelsGet extends DeclarativeWebScript { private final PublishingModelBuilder builder = new PublishingModelBuilder(); private ChannelService channelService; - + private UrlShortener urlShortener; + /** * {@inheritDoc} */ @@ -81,7 +83,7 @@ public class ChannelsGet extends DeclarativeWebScript Map model = new HashMap(); //TODO Implement URL shortening. - model.put(URL_LENGTH, 20); + model.put(URL_LENGTH, urlShortener.getUrlLength()); model.put(PUBLISHING_CHANNELS, builder.buildChannels(publishingChannels)); model.put(STATUS_UPDATE_CHANNELS, builder.buildChannels(statusUpdateChannels)); @@ -95,4 +97,12 @@ public class ChannelsGet extends DeclarativeWebScript { this.channelService = channelService; } + + /** + * @param urlShortener the urlShortener to set + */ + public void setUrlShortener(UrlShortener urlShortener) + { + this.urlShortener = urlShortener; + } }