diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java index 07eeae68e96..ffeb3a8d4aa 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java @@ -133,7 +133,7 @@ public void setupDispositionScheduleLinkedRecordsTest() { *

*

TestRail Test C775

**/ - @Test + @Test(enabled = false) // temporary disabled, see ACS-6073 @AlfrescoTest(jira = "RM-1622") public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException { STEP("Create record category"); @@ -199,7 +199,7 @@ public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingExcepti * Check the disposition steps for a record can be executed * When the record is linked to a folder with the same disposition schedule * */ - @Test + @Test(enabled = false) // temporary disabled, see ACS-6073 @AlfrescoTest (jira = "RM-3060") public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException { diff --git a/pom.xml b/pom.xml index c8da4d1055e..a4500fa3a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -276,7 +276,7 @@ xalan xalan - 2.7.2-alfresco + 2.7.3-alfresco diff --git a/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java index 7c0947a7ea2..e810a38c216 100644 --- a/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java +++ b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.template; import java.io.IOException; @@ -59,6 +59,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.xalan.processor.TransformerFactoryImpl; import org.apache.xml.utils.Constants; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -142,6 +143,7 @@ private void process(TemplateSource templateSource, Object model, Writer out) XSLTemplateModel xsltModel = (XSLTemplateModel) model; System.setProperty("org.apache.xalan.extensions.bsf.BSFManager", BSFManager.class.getName()); + System.setProperty("javax.xml.transform.TransformerFactory", TransformerFactoryImpl.class.getName()); Document xslTemplate; try diff --git a/repository/src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java b/repository/src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java deleted file mode 100644 index e59289eca17..00000000000 --- a/repository/src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.repo.urlshortening; - -import java.util.ArrayList; -import java.util.List; - -import org.alfresco.service.cmr.urlshortening.UrlShortener; -import org.apache.commons.httpclient.HostConfiguration; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; -import org.apache.commons.httpclient.NameValuePair; -import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.protocol.Protocol; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * @deprecated as it is no longer used in the core repository code. - */ -@Deprecated -public class BitlyUrlShortenerImpl implements UrlShortener -{ - private static final Log log = LogFactory.getLog(BitlyUrlShortenerImpl.class); - - private int urlLength = 20; - private String username; - private String apiKey = "R_ca15c6c89e9b25ccd170bafd209a0d4f"; - private HttpClient httpClient; - - public BitlyUrlShortenerImpl() - { - httpClient = new HttpClient(); - httpClient.setHttpConnectionManager(new MultiThreadedHttpConnectionManager()); - HostConfiguration hostConfiguration = new HostConfiguration(); - hostConfiguration.setHost("api-ssl.bitly.com", 443, Protocol.getProtocol("https")); - httpClient.setHostConfiguration(hostConfiguration); - } - - @Override - public String shortenUrl(String longUrl) - { - if (log.isDebugEnabled()) - { - log.debug("Shortening URL: " + longUrl); - } - String shortUrl = longUrl; - if (longUrl.length() > urlLength) - { - GetMethod getMethod = new GetMethod(); - getMethod.setPath("/v3/shorten"); - - List args = new ArrayList(); - args.add(new NameValuePair("login", username)); - args.add(new NameValuePair("apiKey", apiKey)); - args.add(new NameValuePair("longUrl", longUrl)); - args.add(new NameValuePair("format", "txt")); - getMethod.setQueryString(args.toArray(new NameValuePair[args.size()])); - - try - { - int resultCode = httpClient.executeMethod(getMethod); - if (resultCode == 200) - { - shortUrl = getMethod.getResponseBodyAsString(); - } - else - { - log.warn("Failed to shorten URL " + longUrl + " - response code == " + resultCode); - log.warn(getMethod.getResponseBodyAsString()); - } - } - catch (Exception ex) - { - log.error("Failed to shorten URL " + longUrl, ex); - } - if (log.isDebugEnabled()) - { - log.debug("URL " + longUrl + " has been shortened to " + shortUrl); - } - } - return shortUrl.trim(); - } - - /** - * {@inheritDoc} - */ - @Override - public int getUrlLength() - { - return urlLength; - } - - /** - * @param urlLength the urlLength to set - */ - public void setUrlLength(int urlLength) - { - this.urlLength = urlLength; - } - - /** - * @param username the username to set - */ - public void setUsername(String username) - { - this.username = username; - } - - /** - * @param apiKey the apiKey to set - */ - public void setApiKey(String apiKey) - { - this.apiKey = apiKey; - } -} \ No newline at end of file diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index 7c8da7507a7..2ce78687911 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -813,13 +813,6 @@ solr6.store.mappings.value.solrMappingHistory.baseUrl=/solr/history solr6.store.mappings.value.solrMappingHistory.protocol=workspace solr6.store.mappings.value.solrMappingHistory.identifier=history -# -# URL Shortening Properties -# -urlshortening.bitly.username=brianalfresco -urlshortening.bitly.api.key=R_ca15c6c89e9b25ccd170bafd209a0d4f -urlshortening.bitly.url.length=20 - # # Bulk Filesystem Importer # diff --git a/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java b/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java index 482f0867651..e67496d92b9 100644 --- a/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java +++ b/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java @@ -83,7 +83,6 @@ org.alfresco.repo.transfer.HttpClientTransmitterImplTest.class, org.alfresco.repo.transfer.manifest.TransferManifestTest.class, org.alfresco.repo.transfer.TransferVersionCheckerImplTest.class, - org.alfresco.repo.urlshortening.BitlyUrlShortenerTest.class, org.alfresco.service.cmr.calendar.CalendarRecurrenceHelperTest.class, org.alfresco.service.cmr.calendar.CalendarTimezoneHelperTest.class, org.alfresco.tools.RenameUserTest.class, diff --git a/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java index b4993312cbc..98d89f3bd5e 100644 --- a/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java +++ b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java @@ -263,7 +263,7 @@ public void testImportXMLDocument() throws Exception fail(); } } - + private FileInfo createXmlFile(NodeRef folder) { return createXmlFile(folder, sampleXML); diff --git a/repository/src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java b/repository/src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java deleted file mode 100644 index c75e64e7e67..00000000000 --- a/repository/src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.repo.urlshortening; - -import junit.framework.TestCase; - -/** - * @deprecated as BitlyUrlShortenerImpl is no longer used in the core repository code. - */ -@Deprecated -public class BitlyUrlShortenerTest extends TestCase -{ - private BitlyUrlShortenerImpl shortener; - - public void testShorten() - { - String url = "http://www.alfresco.com/"; - String shortUrl = shortener.shortenUrl(url); - assertNotNull(shortUrl); - assertFalse(shortUrl.isEmpty()); - assertFalse(url.equals(shortUrl)); - assertTrue(shortUrl.length() < url.length()); - } - - /** - * {@inheritDoc} - */ - @Override - protected void setUp() throws Exception - { - this.shortener = new BitlyUrlShortenerImpl();; - shortener.setApiKey("R_ca15c6c89e9b25ccd170bafd209a0d4f"); - shortener.setUrlLength(20); - shortener.setUsername("brianalfresco"); - } -}