diff --git a/WebUI/src/main/java/com/percussion/webui/gadget/servlets/PSGadgetUtils.java b/WebUI/src/main/java/com/percussion/webui/gadget/servlets/PSGadgetUtils.java index 4822511265..23e0a7cc20 100644 --- a/WebUI/src/main/java/com/percussion/webui/gadget/servlets/PSGadgetUtils.java +++ b/WebUI/src/main/java/com/percussion/webui/gadget/servlets/PSGadgetUtils.java @@ -27,7 +27,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.validation.constraints.NotNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml b/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml index 9f06c62302..4be67d8d1e 100644 --- a/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml @@ -159,10 +159,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging @@ -280,10 +276,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging @@ -535,11 +527,6 @@ compile - - commons-lang - commons-lang - 2.6 - com.google.code.morphia morphia diff --git a/deliverytiersuite/delivery-tier-suite/comments/pom.xml b/deliverytiersuite/delivery-tier-suite/comments/pom.xml index 3c8ad4acd3..54fb33650e 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/comments/pom.xml @@ -167,10 +167,6 @@ ${jersey.version} provided - - commons-lang - commons-lang - commons-io commons-io @@ -265,10 +261,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSCommentsDao.java b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSCommentsDao.java index f6c20a02cd..39a982adea 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSCommentsDao.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSCommentsDao.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.criterion.Conjunction; diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSDefaultModerationState.java b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSDefaultModerationState.java index 2e21eb0199..e54e7f74b6 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSDefaultModerationState.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/service/rdbms/PSDefaultModerationState.java @@ -21,7 +21,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsRestService.java b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsRestService.java index a0beb55bce..5b76dba2d5 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsRestService.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsRestService.java @@ -57,8 +57,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.FastDateFormat; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.glassfish.jersey.server.ContainerRequest; diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsService.java b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsService.java index 7eb14f994e..32947f817b 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsService.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSCommentsService.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSProfanityFilter.java b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSProfanityFilter.java index 102e8eedde..f40db71f38 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSProfanityFilter.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/comments/services/PSProfanityFilter.java @@ -26,7 +26,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/likes/services/PSLikesService.java b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/likes/services/PSLikesService.java index 55efbce7db..ff2117e5df 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/likes/services/PSLikesService.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/main/java/com/percussion/delivery/likes/services/PSLikesService.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/deliverytiersuite/delivery-tier-suite/comments/src/test/java/com/percussion/delivery/comments/service/rdbms/PSCommentsServiceTest.java b/deliverytiersuite/delivery-tier-suite/comments/src/test/java/com/percussion/delivery/comments/service/rdbms/PSCommentsServiceTest.java index 258e4636ee..76a2fcf997 100644 --- a/deliverytiersuite/delivery-tier-suite/comments/src/test/java/com/percussion/delivery/comments/service/rdbms/PSCommentsServiceTest.java +++ b/deliverytiersuite/delivery-tier-suite/comments/src/test/java/com/percussion/delivery/comments/service/rdbms/PSCommentsServiceTest.java @@ -39,7 +39,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.SessionFactory; diff --git a/deliverytiersuite/delivery-tier-suite/common/pom.xml b/deliverytiersuite/delivery-tier-suite/common/pom.xml index 1b24bdff95..a4a2f386ed 100644 --- a/deliverytiersuite/delivery-tier-suite/common/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/common/pom.xml @@ -169,10 +169,6 @@ commons-logging commons-logging - - commons-lang - commons-lang - org.apache.velocity velocity diff --git a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSLicenseStatus.java b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSLicenseStatus.java index c2f652e7d1..c3bd8ffd90 100644 --- a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSLicenseStatus.java +++ b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSLicenseStatus.java @@ -17,7 +17,7 @@ package com.percussion.delivery.multitenant; import com.percussion.delivery.multitenant.IPSTenantAuthorization.Status; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Represents the status information returned by a call to the license service. diff --git a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSTenantSecurityFilter.java b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSTenantSecurityFilter.java index b2296f337d..b836e36f36 100644 --- a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSTenantSecurityFilter.java +++ b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/multitenant/PSTenantSecurityFilter.java @@ -28,7 +28,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSEmailHelper.java b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSEmailHelper.java index 73297d02c6..e23949e398 100644 --- a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSEmailHelper.java +++ b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSEmailHelper.java @@ -20,7 +20,7 @@ import com.percussion.delivery.exceptions.PSEmailException; import com.percussion.error.PSExceptionUtils; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.EmailConstants; import org.apache.commons.mail.EmailException; diff --git a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSVersionHelper.java b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSVersionHelper.java index 0d8735d831..bac4599fd9 100644 --- a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSVersionHelper.java +++ b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/PSVersionHelper.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Utility class for discovering the version of a service. diff --git a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/security/PSTlsSocketFactory.java b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/security/PSTlsSocketFactory.java index b129a30e2f..7a03aa7d7f 100644 --- a/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/security/PSTlsSocketFactory.java +++ b/deliverytiersuite/delivery-tier-suite/common/src/main/java/com/percussion/delivery/utils/security/PSTlsSocketFactory.java @@ -41,7 +41,7 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml index 839f36534b..6ca3b67d9d 100644 --- a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml @@ -131,10 +131,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging @@ -185,11 +181,6 @@ - - commons-lang - commons-lang - ${commons.lang.version} - com.percussion servlet-utils @@ -387,10 +378,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging @@ -550,10 +537,6 @@ com.zaxxer HikariCP - - commons-lang - commons-lang - org.apache.logging.log4j @@ -1070,10 +1053,6 @@ commons-logging commons-logging - - commons-lang - commons-lang - com.percussion rxutils diff --git a/deliverytiersuite/delivery-tier-suite/feeds/pom.xml b/deliverytiersuite/delivery-tier-suite/feeds/pom.xml index 4718cadecc..0bf0abaa58 100644 --- a/deliverytiersuite/delivery-tier-suite/feeds/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/feeds/pom.xml @@ -107,11 +107,6 @@ org.springframework spring-test - - commons-lang - commons-lang - ${commons.lang.version} - commons-io commons-io @@ -209,10 +204,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/PSFeedGenerator.java b/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/PSFeedGenerator.java index aedf876462..08fe5a26ab 100644 --- a/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/PSFeedGenerator.java +++ b/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/PSFeedGenerator.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author erikserating */ public class PSFeedGenerator { diff --git a/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/services/PSFeedService.java b/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/services/PSFeedService.java index a9c7e5a9a3..58d0dedb64 100644 --- a/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/services/PSFeedService.java +++ b/deliverytiersuite/delivery-tier-suite/feeds/src/main/java/com/percussion/delivery/feeds/services/PSFeedService.java @@ -68,8 +68,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.commons.validator.routines.InetAddressValidator; import org.apache.logging.log4j.LogManager; diff --git a/deliverytiersuite/delivery-tier-suite/feeds/src/test/java/com/percussion/delivery/feeds/services/PSFeedsServiceTests.java b/deliverytiersuite/delivery-tier-suite/feeds/src/test/java/com/percussion/delivery/feeds/services/PSFeedsServiceTests.java index 4bfbd0e91c..38ebc33826 100644 --- a/deliverytiersuite/delivery-tier-suite/feeds/src/test/java/com/percussion/delivery/feeds/services/PSFeedsServiceTests.java +++ b/deliverytiersuite/delivery-tier-suite/feeds/src/test/java/com/percussion/delivery/feeds/services/PSFeedsServiceTests.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import javax.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.After; diff --git a/deliverytiersuite/delivery-tier-suite/forms/pom.xml b/deliverytiersuite/delivery-tier-suite/forms/pom.xml index 545913d7c6..b361210ec0 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/forms/pom.xml @@ -80,11 +80,6 @@ guava ${guava.version} - - commons-lang - commons-lang - ${commons.lang.version} - commons-io commons-io @@ -168,10 +163,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/data/PSFormData.java b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/data/PSFormData.java index c4bb7983d8..03705046b3 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/data/PSFormData.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/data/PSFormData.java @@ -17,7 +17,7 @@ package com.percussion.delivery.forms.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import java.util.Collections; import java.util.Date; @@ -38,7 +38,7 @@ import javax.persistence.Table; import javax.persistence.TableGenerator; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormDataJoiner.java b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormDataJoiner.java index cf043c80bf..044acbaabc 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormDataJoiner.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormDataJoiner.java @@ -27,8 +27,8 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.supercsv.io.CsvMapWriter; import org.supercsv.io.ICsvMapWriter; import org.supercsv.prefs.CsvPreference; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormRestService.java b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormRestService.java index 7352e01679..5992992ba1 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormRestService.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormRestService.java @@ -61,7 +61,7 @@ import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.protocol.Protocol; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormService.java b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormService.java index 97bcb78549..4efd80ae19 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormService.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/PSFormService.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; public class PSFormService implements IPSFormService { diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/rdbms/PSFormDao.java b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/rdbms/PSFormDao.java index 3c342e578f..11813c39cd 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/rdbms/PSFormDao.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/main/java/com/percussion/delivery/forms/impl/rdbms/PSFormDao.java @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.hibernate.Session; import org.springframework.orm.hibernate5.support.HibernateDaoSupport; import org.springframework.transaction.annotation.Isolation; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSBaseFormServiceTest.java b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSBaseFormServiceTest.java index a131eae96e..1c9704a3d5 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSBaseFormServiceTest.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSBaseFormServiceTest.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.junit.After; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormDataJoinerTest.java b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormDataJoinerTest.java index 3bf1958d65..9d282e177a 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormDataJoinerTest.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormDataJoinerTest.java @@ -23,7 +23,7 @@ import com.percussion.delivery.forms.data.PSFormData; import java.text.MessageFormat; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormServiceTest.java b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormServiceTest.java index da43b3d2e5..c54902a38b 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormServiceTest.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSFormServiceTest.java @@ -30,7 +30,7 @@ import java.util.Calendar; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSMockEmailHelper.java b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSMockEmailHelper.java index 6275969aba..b52c4f0e00 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSMockEmailHelper.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/PSMockEmailHelper.java @@ -22,7 +22,7 @@ import com.percussion.delivery.utils.PSEmailServiceNotInitializedException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Mock email helper for testing services that send email. Should be wired into services in the diff --git a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/rdbms/PSFormRestServiceRdbmsTest.java b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/rdbms/PSFormRestServiceRdbmsTest.java index ae22a94d5e..18167485ef 100644 --- a/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/rdbms/PSFormRestServiceRdbmsTest.java +++ b/deliverytiersuite/delivery-tier-suite/forms/src/test/java/com/percussion/delivery/forms/impl/rdbms/PSFormRestServiceRdbmsTest.java @@ -50,7 +50,7 @@ import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.SecurityContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.glassfish.jersey.internal.PropertiesDelegate; import org.glassfish.jersey.server.ContainerRequest; import org.junit.After; diff --git a/deliverytiersuite/delivery-tier-suite/integrations/pom.xml b/deliverytiersuite/delivery-tier-suite/integrations/pom.xml index 5573b5e7b8..a116e6472c 100644 --- a/deliverytiersuite/delivery-tier-suite/integrations/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/integrations/pom.xml @@ -124,11 +124,6 @@ guava ${guava.version} - - commons-lang - commons-lang - ${commons.lang.version} - commons-io commons-io @@ -213,10 +208,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/integrations/src/main/java/com/percussion/delivery/integrations/ems/EMSMasterCalendarSoapEventService.java b/deliverytiersuite/delivery-tier-suite/integrations/src/main/java/com/percussion/delivery/integrations/ems/EMSMasterCalendarSoapEventService.java index e13c112b8a..d3ba0c09ba 100644 --- a/deliverytiersuite/delivery-tier-suite/integrations/src/main/java/com/percussion/delivery/integrations/ems/EMSMasterCalendarSoapEventService.java +++ b/deliverytiersuite/delivery-tier-suite/integrations/src/main/java/com/percussion/delivery/integrations/ems/EMSMasterCalendarSoapEventService.java @@ -40,9 +40,9 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.rpc.ServiceException; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.time.FastDateFormat; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deliverytiersuite/delivery-tier-suite/membership/pom.xml b/deliverytiersuite/delivery-tier-suite/membership/pom.xml index 53ba681ac2..041f3899df 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/membership/pom.xml @@ -85,11 +85,6 @@ guava ${guava.version} - - commons-lang - commons-lang - ${commons.lang.version} - commons-io commons-io @@ -181,10 +176,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/data/rdbms/impl/PSGenericKey.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/data/rdbms/impl/PSGenericKey.java index 2a1dfd57fa..236e4fa430 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/data/rdbms/impl/PSGenericKey.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/data/rdbms/impl/PSGenericKey.java @@ -26,7 +26,7 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.TableGenerator; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyRestService.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyRestService.java index f35dd6defa..3a31a2ac3a 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyRestService.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyRestService.java @@ -25,7 +25,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyService.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyService.java index d9cdd4de1c..e6e0af6b4b 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyService.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/impl/PSGenericKeyService.java @@ -22,8 +22,8 @@ import java.util.Calendar; import java.util.Date; import java.util.UUID; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/rdbms/impl/PSGenericKeyDao.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/rdbms/impl/PSGenericKeyDao.java index 6caaeb2fb7..604a1e7802 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/rdbms/impl/PSGenericKeyDao.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/generickey/utils/services/rdbms/impl/PSGenericKeyDao.java @@ -24,7 +24,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.Session; import org.springframework.orm.hibernate5.support.HibernateDaoSupport; import org.springframework.transaction.annotation.Transactional; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSAccountSummary.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSAccountSummary.java index ee3f6d54a6..811bc4796d 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSAccountSummary.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSAccountSummary.java @@ -16,7 +16,7 @@ */ package com.percussion.membership.data; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Object to change the state about of an account. diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserGroup.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserGroup.java index 81b44898e7..e6cc3b4ceb 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserGroup.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserGroup.java @@ -16,7 +16,7 @@ */ package com.percussion.membership.data; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; public class PSUserGroup { private String email; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserSummary.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserSummary.java index 68cc44a8ee..8c693642ec 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserSummary.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/PSUserSummary.java @@ -21,7 +21,7 @@ import com.percussion.delivery.services.PSCustomDateSerializer; import com.percussion.membership.data.IPSMembership.PSMemberStatus; import java.util.Date; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Object to hold summary data about a registered user. diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/rdbms/impl/PSMembership.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/rdbms/impl/PSMembership.java index ac7de975a2..881f5fd0a8 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/rdbms/impl/PSMembership.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/data/rdbms/impl/PSMembership.java @@ -28,9 +28,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.TableGenerator; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipAuthProvider.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipAuthProvider.java index 0297ff8eb7..b104786b3e 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipAuthProvider.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipAuthProvider.java @@ -21,7 +21,7 @@ import com.percussion.membership.services.IPSAuthProvider; import com.percussion.membership.services.IPSMembershipDao; import com.percussion.membership.services.PSAuthenticationFailedException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.jasypt.util.password.PasswordEncryptor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipRestService.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipRestService.java index 8ee7b5b574..cba47ba451 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipRestService.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipRestService.java @@ -54,7 +54,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipService.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipService.java index b80e2efec2..da0917eae5 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipService.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/impl/PSMembershipService.java @@ -37,9 +37,9 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.text.StringEscapeUtils; import org.jasypt.util.password.PasswordEncryptor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/rdbms/impl/PSMembershipDao.java b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/rdbms/impl/PSMembershipDao.java index f8a183bd14..2f7cadbacf 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/rdbms/impl/PSMembershipDao.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/main/java/com/percussion/membership/services/rdbms/impl/PSMembershipDao.java @@ -32,7 +32,7 @@ import javax.persistence.criteria.Expression; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Session; diff --git a/deliverytiersuite/delivery-tier-suite/membership/src/test/java/com/percussion/generickey/utils/services/rdbms/PSGenericKeyDaoTest.java b/deliverytiersuite/delivery-tier-suite/membership/src/test/java/com/percussion/generickey/utils/services/rdbms/PSGenericKeyDaoTest.java index 2bada3d501..ba0f785eb3 100644 --- a/deliverytiersuite/delivery-tier-suite/membership/src/test/java/com/percussion/generickey/utils/services/rdbms/PSGenericKeyDaoTest.java +++ b/deliverytiersuite/delivery-tier-suite/membership/src/test/java/com/percussion/generickey/utils/services/rdbms/PSGenericKeyDaoTest.java @@ -26,7 +26,7 @@ import javax.persistence.criteria.CriteriaDelete; import javax.persistence.criteria.Root; import junit.framework.TestCase; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.junit.After; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/pom.xml b/deliverytiersuite/delivery-tier-suite/metadata/pom.xml index 06ba7c7565..d5be5b7cde 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/metadata/pom.xml @@ -121,11 +121,6 @@ guava ${guava.version} - - commons-lang - commons-lang - ${commons.lang.version} - commons-io commons-io @@ -212,10 +207,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/IPSBlogPostVisitService.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/IPSBlogPostVisitService.java index 87034374f5..4c0d7a183a 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/IPSBlogPostVisitService.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/IPSBlogPostVisitService.java @@ -20,7 +20,7 @@ import com.percussion.delivery.metadata.data.PSVisitQuery; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public interface IPSBlogPostVisitService { public static final int INTIAL_DELAY_SECONDS = 0; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataBlogYear.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataBlogYear.java index eb948b25df..971fb314ab 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataBlogYear.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataBlogYear.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.List; import java.util.Locale; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Represents a year and the list of months with the number of posts for each month. Also each year diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataDatedEvent.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataDatedEvent.java index 3204b0faf3..fbfe68ccb3 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataDatedEvent.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/PSMetadataDatedEvent.java @@ -16,7 +16,7 @@ */ package com.percussion.delivery.metadata.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class contains the structure of the event information. The object is composed of the diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/impl/PSCriteriaElement.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/impl/PSCriteriaElement.java index e6f84b6b10..74b682a073 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/impl/PSCriteriaElement.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/impl/PSCriteriaElement.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author erikserating */ @SuppressWarnings("unchecked") diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java index 78d1f52f46..9ed2917f43 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java @@ -26,11 +26,11 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.time.FastDateFormat; /** diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSBlogPostVisitService.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSBlogPostVisitService.java index b371fd20c1..9e8f600b7c 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSBlogPostVisitService.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSBlogPostVisitService.java @@ -36,7 +36,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import javax.annotation.PreDestroy; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.InitializingBean; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSDatedEntriesHelper.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSDatedEntriesHelper.java index f1786304ab..adb1543f15 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSDatedEntriesHelper.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSDatedEntriesHelper.java @@ -21,7 +21,7 @@ import com.percussion.delivery.metadata.data.PSMetadataDatedEntries; import com.percussion.delivery.metadata.data.PSMetadataDatedEvent; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; /** diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataIndexerService.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataIndexerService.java index 391e0ef93c..72a34b87e9 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataIndexerService.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataIndexerService.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataRestService.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataRestService.java index b3567fb10b..62166c96c0 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataRestService.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/PSMetadataRestService.java @@ -63,7 +63,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONArray; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/utils/PSPair.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/utils/PSPair.java index 04dd21056f..0f1d658f65 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/utils/PSPair.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/impl/utils/PSPair.java @@ -16,10 +16,10 @@ */ package com.percussion.delivery.metadata.impl.utils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * This class holds a generic pair of objects diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSBlogPostVisitDao.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSBlogPostVisitDao.java index 82a2c949d9..fc1205c646 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSBlogPostVisitDao.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSBlogPostVisitDao.java @@ -32,7 +32,7 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Session; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSCookieConsentDao.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSCookieConsentDao.java index e73f7ee0a9..469c352189 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSCookieConsentDao.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSCookieConsentDao.java @@ -30,7 +30,7 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaUpdate; import javax.persistence.criteria.Root; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbBlogPostVisit.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbBlogPostVisit.java index 4a32bb0616..4d62099b26 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbBlogPostVisit.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbBlogPostVisit.java @@ -30,8 +30,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataEntry.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataEntry.java index 30483aec29..46b7d56669 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataEntry.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataEntry.java @@ -30,9 +30,9 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.*; /** diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataProperty.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataProperty.java index e7aa22c19b..2bfcf34d2f 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataProperty.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSDbMetadataProperty.java @@ -36,7 +36,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Nationalized; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataDao.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataDao.java index a5ed3fd06d..8e2a0618c2 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataDao.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataDao.java @@ -37,7 +37,7 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaUpdate; import javax.persistence.criteria.Root; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataQueryService.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataQueryService.java index b3a3823a66..fccf0a639a 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataQueryService.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/rdbms/impl/PSMetadataQueryService.java @@ -16,7 +16,7 @@ */ package com.percussion.delivery.metadata.rdbms.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.delivery.metadata.IPSMetadataEntry; import com.percussion.delivery.metadata.IPSMetadataQueryService; @@ -40,7 +40,7 @@ import java.util.List; import java.util.Map; import javax.xml.bind.DatatypeConverter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/utils/PSHashCalculator.java b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/utils/PSHashCalculator.java index 6579336dd8..9ebb6cc7e6 100644 --- a/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/utils/PSHashCalculator.java +++ b/deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/utils/PSHashCalculator.java @@ -20,7 +20,7 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Responsible for calculating a hash over a value. It uses SHA-1 by default and UTF-8 to convert diff --git a/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/delivery/ds/web/DeliveryController.java b/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/delivery/ds/web/DeliveryController.java index 8182d1717d..36065232ea 100644 --- a/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/delivery/ds/web/DeliveryController.java +++ b/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/delivery/ds/web/DeliveryController.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.time.StopWatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/tracking/data/VisitorProfileResourceRepository.java b/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/tracking/data/VisitorProfileResourceRepository.java index 74ca9b091c..9eeec670a9 100644 --- a/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/tracking/data/VisitorProfileResourceRepository.java +++ b/deliverytiersuite/delivery-tier-suite/p13n-ds/src/main/java/com/percussion/soln/p13n/tracking/data/VisitorProfileResourceRepository.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.io.Resource; diff --git a/deliverytiersuite/delivery-tier-suite/polls/pom.xml b/deliverytiersuite/delivery-tier-suite/polls/pom.xml index 1a14ebd88b..b23b861b49 100644 --- a/deliverytiersuite/delivery-tier-suite/polls/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/polls/pom.xml @@ -94,11 +94,6 @@ guava ${guava.version} - - commons-lang - commons-lang - ${commons.lang.version} - commons-io commons-io @@ -179,10 +174,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/secure-membership/pom.xml b/deliverytiersuite/delivery-tier-suite/secure-membership/pom.xml index b317ecfcd5..ebbd3d114c 100644 --- a/deliverytiersuite/delivery-tier-suite/secure-membership/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/secure-membership/pom.xml @@ -171,10 +171,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging @@ -212,10 +208,6 @@ org.apache.velocity velocity - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/data/PSMembershipConfiguration.java b/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/data/PSMembershipConfiguration.java index b43d22e8c3..dbecdde6b9 100644 --- a/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/data/PSMembershipConfiguration.java +++ b/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/data/PSMembershipConfiguration.java @@ -16,7 +16,7 @@ */ package com.percussion.secure.data; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @deprecated This class is part of the deprecated secure-membership module. */ @Deprecated diff --git a/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/services/PSMembershipAuthProvider.java b/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/services/PSMembershipAuthProvider.java index ccc98392b9..1cc025a8b7 100644 --- a/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/services/PSMembershipAuthProvider.java +++ b/deliverytiersuite/delivery-tier-suite/secure-membership/src/main/java/com/percussion/secure/services/PSMembershipAuthProvider.java @@ -28,7 +28,7 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; import org.springframework.security.access.AuthorizationServiceException; diff --git a/deliverytiersuite/delivery-tier-suite/tomcat-common/pom.xml b/deliverytiersuite/delivery-tier-suite/tomcat-common/pom.xml index baadbe5ce5..cd730141ee 100644 --- a/deliverytiersuite/delivery-tier-suite/tomcat-common/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/tomcat-common/pom.xml @@ -69,10 +69,6 @@ commons-collections commons-collections - - commons-lang - commons-lang - commons-betwixt commons-betwixt diff --git a/deployer/pom.xml b/deployer/pom.xml index be80604161..b2ff922e7a 100644 --- a/deployer/pom.xml +++ b/deployer/pom.xml @@ -79,11 +79,6 @@ javax.ws.rs-api compile - - commons-lang - commons-lang - compile - commons-logging commons-logging diff --git a/deployer/src/main/java/com/percussion/deployer/client/PSDeploymentManager.java b/deployer/src/main/java/com/percussion/deployer/client/PSDeploymentManager.java index ddbca24e87..5a1294eba7 100644 --- a/deployer/src/main/java/com/percussion/deployer/client/PSDeploymentManager.java +++ b/deployer/src/main/java/com/percussion/deployer/client/PSDeploymentManager.java @@ -67,7 +67,7 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/jexl/PSDeployJexlUtils.java b/deployer/src/main/java/com/percussion/deployer/jexl/PSDeployJexlUtils.java index e19acf3bda..17fb017afb 100644 --- a/deployer/src/main/java/com/percussion/deployer/jexl/PSDeployJexlUtils.java +++ b/deployer/src/main/java/com/percussion/deployer/jexl/PSDeployJexlUtils.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.jexl3.parser.ParserVisitor; import org.apache.commons.jexl3.parser.SimpleNode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSDeployJexlUtils { /** diff --git a/deployer/src/main/java/com/percussion/deployer/jexl/PSGetIDsJexlVisitor.java b/deployer/src/main/java/com/percussion/deployer/jexl/PSGetIDsJexlVisitor.java index d9d44da008..5affece9b2 100644 --- a/deployer/src/main/java/com/percussion/deployer/jexl/PSGetIDsJexlVisitor.java +++ b/deployer/src/main/java/com/percussion/deployer/jexl/PSGetIDsJexlVisitor.java @@ -23,7 +23,7 @@ import org.apache.commons.jexl3.parser.ASTStringLiteral; import org.apache.commons.jexl3.parser.ParserVisitor; import org.apache.commons.jexl3.parser.SimpleNode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A visitor for any jexl expression or script. This will call the jexl's parser to build a tree and diff --git a/deployer/src/main/java/com/percussion/deployer/objectstore/PSDbmsInfo.java b/deployer/src/main/java/com/percussion/deployer/objectstore/PSDbmsInfo.java index b7c25fecf2..0e15df056d 100644 --- a/deployer/src/main/java/com/percussion/deployer/objectstore/PSDbmsInfo.java +++ b/deployer/src/main/java/com/percussion/deployer/objectstore/PSDbmsInfo.java @@ -31,7 +31,7 @@ import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/objectstore/PSDescriptor.java b/deployer/src/main/java/com/percussion/deployer/objectstore/PSDescriptor.java index 45a1976034..4e3c447675 100644 --- a/deployer/src/main/java/com/percussion/deployer/objectstore/PSDescriptor.java +++ b/deployer/src/main/java/com/percussion/deployer/objectstore/PSDescriptor.java @@ -29,9 +29,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSBindingIdContext.java b/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSBindingIdContext.java index e18333f33c..b81d705fcb 100644 --- a/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSBindingIdContext.java +++ b/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSBindingIdContext.java @@ -22,7 +22,7 @@ import com.percussion.design.objectstore.PSUnknownNodeTypeException; import com.percussion.xml.PSXmlTreeWalker; import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBinding.java b/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBinding.java index 0cd79b4e46..a9bf91d8ff 100644 --- a/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBinding.java +++ b/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBinding.java @@ -16,7 +16,7 @@ */ package com.percussion.deployer.objectstore.idtypes; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A binding can have name, will have index and value. Index is the location of this expression, in diff --git a/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBindings.java b/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBindings.java index 32f718cbff..e90a8948fd 100644 --- a/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBindings.java +++ b/deployer/src/main/java/com/percussion/deployer/objectstore/idtypes/PSJexlBindings.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A container to hold PSJexlBinding (a name value paired entity. Name may be null.Currently, used diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSAppTransformer.java b/deployer/src/main/java/com/percussion/deployer/server/PSAppTransformer.java index 740421fbac..a4d81089dd 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSAppTransformer.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSAppTransformer.java @@ -97,7 +97,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Handles discovery and transformations of literal ids specified in application and other diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSDependencyDef.java b/deployer/src/main/java/com/percussion/deployer/server/PSDependencyDef.java index 1d9792b43e..4c8c18a499 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSDependencyDef.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSDependencyDef.java @@ -20,7 +20,7 @@ import com.percussion.deployer.objectstore.PSDeployComponentUtils; import com.percussion.design.objectstore.IPSObjectStoreErrors; import com.percussion.design.objectstore.PSUnknownNodeTypeException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSDependencyManager.java b/deployer/src/main/java/com/percussion/deployer/server/PSDependencyManager.java index ff8c85d083..8b91b0d6ee 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSDependencyManager.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSDependencyManager.java @@ -46,7 +46,7 @@ import java.io.FileOutputStream; import java.text.MessageFormat; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSDeploymentHandler.java b/deployer/src/main/java/com/percussion/deployer/server/PSDeploymentHandler.java index 0c8bfbe665..7f6b46038b 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSDeploymentHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSDeploymentHandler.java @@ -119,8 +119,8 @@ import java.util.Map; import java.util.Set; import javax.security.auth.login.LoginException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSExportJob.java b/deployer/src/main/java/com/percussion/deployer/server/PSExportJob.java index ebdbf78374..b8ed4c6327 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSExportJob.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSExportJob.java @@ -45,7 +45,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.ResourceBundle; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSImportJob.java b/deployer/src/main/java/com/percussion/deployer/server/PSImportJob.java index 0e0db1cb12..89baa88892 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSImportJob.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSImportJob.java @@ -71,8 +71,8 @@ import java.util.Properties; import java.util.ResourceBundle; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSJexlExpressionHelper.java b/deployer/src/main/java/com/percussion/deployer/server/PSJexlExpressionHelper.java index f47ef4ac8c..7c57f1a396 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSJexlExpressionHelper.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSJexlExpressionHelper.java @@ -21,7 +21,7 @@ import com.percussion.deployer.objectstore.idtypes.PSBindingParamIdContext; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A helper class for managing the ids found in a jexl binding. This class has a map of a binding diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSLocalDeployerClient.java b/deployer/src/main/java/com/percussion/deployer/server/PSLocalDeployerClient.java index 96ddaf95db..82a163507a 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSLocalDeployerClient.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSLocalDeployerClient.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSPackageConfiguration.java b/deployer/src/main/java/com/percussion/deployer/server/PSPackageConfiguration.java index 70390f8b49..62d4547d47 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSPackageConfiguration.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSPackageConfiguration.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSTransformsHandler.java b/deployer/src/main/java/com/percussion/deployer/server/PSTransformsHandler.java index 7e323569ca..683e1410c8 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSTransformsHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSTransformsHandler.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** The worker class that handles automatic id mapping during install. */ public class PSTransformsHandler { diff --git a/deployer/src/main/java/com/percussion/deployer/server/PSValidationJob.java b/deployer/src/main/java/com/percussion/deployer/server/PSValidationJob.java index 4b316f0074..5f56a6dbe7 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/PSValidationJob.java +++ b/deployer/src/main/java/com/percussion/deployer/server/PSValidationJob.java @@ -42,7 +42,7 @@ import java.util.List; import java.util.Properties; import java.util.ResourceBundle; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSApplicationDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSApplicationDependencyHandler.java index a61867d488..9f17b7540e 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSApplicationDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSApplicationDependencyHandler.java @@ -77,7 +77,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** Class to handle packaging and deploying an application. */ diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSAssemblyServiceHelper.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSAssemblyServiceHelper.java index 6962e3c061..56005eebdf 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSAssemblyServiceHelper.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSAssemblyServiceHelper.java @@ -41,7 +41,7 @@ import java.util.List; import java.util.Set; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentListDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentListDefDependencyHandler.java index b53f990948..e710e332f7 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentListDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentListDefDependencyHandler.java @@ -57,7 +57,7 @@ import java.util.Set; import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.MapIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Class to handle packaging and deploying a ContentList definition. diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentTypeDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentTypeDependencyHandler.java index 9aade6a804..8f3ec59415 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentTypeDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentTypeDependencyHandler.java @@ -89,7 +89,7 @@ import java.util.List; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyHandler.java index 943471ece7..3137a55ffd 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyHandler.java @@ -772,7 +772,7 @@ protected PSPurgableTempFile createXmlFile(Document doc) throws PSDeployExceptio * @throws PSDeployException If there are any errors. */ protected static PSPurgableTempFile createXmlFile(String str) throws PSDeployException { - if (org.apache.commons.lang.StringUtils.isBlank(str)) + if (org.apache.commons.lang3.StringUtils.isBlank(str)) throw new IllegalArgumentException("doc may not be empty or null"); try { diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyUtils.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyUtils.java index 7af3a3b863..2765f5ffeb 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyUtils.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyUtils.java @@ -75,7 +75,7 @@ import java.util.Set; import javax.persistence.Table; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSFilterDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSFilterDefDependencyHandler.java index 13dddf399c..bf83d0e4af 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSFilterDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSFilterDefDependencyHandler.java @@ -55,7 +55,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSLocaleDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSLocaleDefDependencyHandler.java index 885cd14f2a..60fed849da 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSLocaleDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSLocaleDefDependencyHandler.java @@ -52,7 +52,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSiteDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSiteDefDependencyHandler.java index 7fb76504df..1f00bca2a5 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSiteDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSiteDefDependencyHandler.java @@ -57,7 +57,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSlotDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSlotDefDependencyHandler.java index 33a18855c9..c7a9a2f3db 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSlotDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSSlotDefDependencyHandler.java @@ -55,7 +55,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTemplateDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTemplateDefDependencyHandler.java index 2a683c6f1d..60fef66c8f 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTemplateDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTemplateDefDependencyHandler.java @@ -60,7 +60,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTranslationSettingsDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTranslationSettingsDefDependencyHandler.java index e82429a8bb..473e6a6717 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTranslationSettingsDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSTranslationSettingsDefDependencyHandler.java @@ -44,7 +44,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.SAXException; /** diff --git a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSVariantDefDependencyHandler.java b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSVariantDefDependencyHandler.java index 90b6fbc1c8..b91410ea31 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSVariantDefDependencyHandler.java +++ b/deployer/src/main/java/com/percussion/deployer/server/dependencies/PSVariantDefDependencyHandler.java @@ -42,7 +42,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Class to handle packaging and deploying a variant definition. */ public class PSVariantDefDependencyHandler extends PSDataObjectDependencyHandler { diff --git a/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSPackageUninstaller.java b/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSPackageUninstaller.java index 0107d06fa2..319602685f 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSPackageUninstaller.java +++ b/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSPackageUninstaller.java @@ -46,7 +46,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Uninstalls elements of the supplied package and updates the status of package info. */ public class PSPackageUninstaller { diff --git a/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSUninstallResult.java b/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSUninstallResult.java index 5ed503d77a..eef7a35c28 100644 --- a/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSUninstallResult.java +++ b/deployer/src/main/java/com/percussion/deployer/server/uninstall/PSUninstallResult.java @@ -17,7 +17,7 @@ package com.percussion.deployer.server.uninstall; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Implementation of {@link IPSUninstallResult}, see interface for details. */ public class PSUninstallResult implements IPSUninstallResult { diff --git a/deployer/src/main/java/com/percussion/rx/config/PSConfigValidation.java b/deployer/src/main/java/com/percussion/rx/config/PSConfigValidation.java index 86ffbe443c..aabd347a9e 100644 --- a/deployer/src/main/java/com/percussion/rx/config/PSConfigValidation.java +++ b/deployer/src/main/java/com/percussion/rx/config/PSConfigValidation.java @@ -17,9 +17,9 @@ package com.percussion.rx.config; import com.percussion.services.catalog.PSTypeEnum; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * This class encapsulates an error or warning validation result. This the a result of validating diff --git a/deployer/src/main/java/com/percussion/rx/config/data/PSConfigStatus.java b/deployer/src/main/java/com/percussion/rx/config/data/PSConfigStatus.java index fa9230d42d..d109c753b3 100644 --- a/deployer/src/main/java/com/percussion/rx/config/data/PSConfigStatus.java +++ b/deployer/src/main/java/com/percussion/rx/config/data/PSConfigStatus.java @@ -25,8 +25,8 @@ import javax.persistence.Id; import javax.persistence.Lob; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deployer/src/main/java/com/percussion/rx/config/data/PSDescriptorSummaryReport.java b/deployer/src/main/java/com/percussion/rx/config/data/PSDescriptorSummaryReport.java index 26e1e57034..361efcd920 100644 --- a/deployer/src/main/java/com/percussion/rx/config/data/PSDescriptorSummaryReport.java +++ b/deployer/src/main/java/com/percussion/rx/config/data/PSDescriptorSummaryReport.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; import org.apache.commons.lang3.time.FastDateFormat; /** @author erikserating */ diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSActionSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSActionSetter.java index a2db8a0076..eacec81e2a 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSActionSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSActionSetter.java @@ -37,8 +37,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDeNormalizer.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDeNormalizer.java index 6da19af597..fba5e05237 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDeNormalizer.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDeNormalizer.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.w3c.dom.Comment; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDefGenerator.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDefGenerator.java index ee70ff1465..10bdfc0896 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDefGenerator.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigDefGenerator.java @@ -27,7 +27,7 @@ import java.io.InputStream; import java.util.Iterator; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigMapper.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigMapper.java index 39761589a5..bc94a3f492 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigMapper.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigMapper.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigNormalizer.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigNormalizer.java index 2aa92225cc..0e5e752d34 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigNormalizer.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigNormalizer.java @@ -31,7 +31,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigRegistrationMgr.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigRegistrationMgr.java index 965607ca0c..7c906c60fd 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigRegistrationMgr.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigRegistrationMgr.java @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigService.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigService.java index 5bbc931c54..f126f4edd5 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigService.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigService.java @@ -51,7 +51,7 @@ import java.util.Set; import javax.xml.bind.JAXBException; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigStatusMgr.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigStatusMgr.java index b47dec8699..aaf854a873 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigStatusMgr.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigStatusMgr.java @@ -30,7 +30,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.springframework.transaction.annotation.Transactional; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigUtils.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigUtils.java index ed6c716f26..36374554c3 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigUtils.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSConfigUtils.java @@ -64,7 +64,7 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeFieldSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeFieldSetter.java index bfe8e32b6d..b6aff01753 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeFieldSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeFieldSetter.java @@ -50,7 +50,7 @@ import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class is responsible to set properties for a field in a Content Type. diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeSetter.java index 49dd20b846..014152075e 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeSetter.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class is responsible to set properties for a Content Type. diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSContextSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSContextSetter.java index 1883d6f03e..bb2d4d2abc 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSContextSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSContextSetter.java @@ -24,7 +24,7 @@ import com.percussion.services.sitemgr.IPSPublishingContext; import com.percussion.utils.guid.IPSGuid; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This setter is used to set Context properties. diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSDefaultConfigGenerator.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSDefaultConfigGenerator.java index 67e85bbc44..58a212e93e 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSDefaultConfigGenerator.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSDefaultConfigGenerator.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSEditionSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSEditionSetter.java index 2506eb4028..577b55d198 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSEditionSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSEditionSetter.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The Edition property setter. diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSImplConfigLoader.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSImplConfigLoader.java index 650b812085..2aa39c078d 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSImplConfigLoader.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSImplConfigLoader.java @@ -18,7 +18,7 @@ import com.percussion.rx.config.IPSConfigHandler; import com.percussion.util.PSOsTool; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.context.support.FileSystemXmlApplicationContext; /** diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeConfigHandler.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeConfigHandler.java index e86df2d740..e2d85d35f6 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeConfigHandler.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeConfigHandler.java @@ -36,9 +36,9 @@ import java.util.List; import java.util.Map; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * The handler for configuring Location Scheme objects. diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeSetter.java index 6311a71b76..5d8faec36f 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSLocationSchemeSetter.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSObjectConfigHandler.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSObjectConfigHandler.java index ff1874b167..7be8c868f5 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSObjectConfigHandler.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSObjectConfigHandler.java @@ -31,9 +31,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * This implementation of configure handler is for configuring design objects. Walks through all the diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigEffectSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigEffectSetter.java index d346f86f00..9a89bc4e42 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigEffectSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigEffectSetter.java @@ -33,7 +33,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Setter for the relationship configuration effects. As it is a distributed property and as well diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigSetter.java index bf637e7720..0bd234b332 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSRelationshipConfigSetter.java @@ -34,7 +34,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Relationship configuration setter to set the following three properties. shallowCloning, diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSSimplePropertySetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSSimplePropertySetter.java index 84b75d3abd..277d42ee1d 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSSimplePropertySetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSSimplePropertySetter.java @@ -27,9 +27,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.SimpleTypeConverter; diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteConfigHandler.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteConfigHandler.java index bd01167f74..8f7dcd39a7 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteConfigHandler.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteConfigHandler.java @@ -28,9 +28,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * The handler for configuring Site objects. diff --git a/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteSetter.java b/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteSetter.java index 6b2b2c54fb..ff7daeca52 100644 --- a/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteSetter.java +++ b/deployer/src/main/java/com/percussion/rx/config/impl/PSSiteSetter.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This setter is used to set Site properties. diff --git a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageService.java b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageService.java index d2dca65ca6..18025dc69f 100644 --- a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageService.java +++ b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageService.java @@ -43,7 +43,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; diff --git a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageServiceHelper.java b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageServiceHelper.java index 3a5415d57a..83935bd51f 100644 --- a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageServiceHelper.java +++ b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageServiceHelper.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageUninstall.java b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageUninstall.java index 4a6e498c05..214202f0a4 100644 --- a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageUninstall.java +++ b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageUninstall.java @@ -36,7 +36,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageVisibility.java b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageVisibility.java index 1bd6f0eafe..e9fddf61fa 100644 --- a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageVisibility.java +++ b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPackageVisibility.java @@ -49,7 +49,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPkgUiResponse.java b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPkgUiResponse.java index 337a669f92..ca40520136 100644 --- a/deployer/src/main/java/com/percussion/rx/services/deployer/PSPkgUiResponse.java +++ b/deployer/src/main/java/com/percussion/rx/services/deployer/PSPkgUiResponse.java @@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Class to represent error m_message. diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSIdName.java b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSIdName.java index aa1740e4b9..1d2bdf1421 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSIdName.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSIdName.java @@ -24,8 +24,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgDependency.java b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgDependency.java index 0601e3dda0..ba98a984f5 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgDependency.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgDependency.java @@ -25,8 +25,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElement.java b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElement.java index 6ece670bfe..a8b2f1054d 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElement.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElement.java @@ -25,8 +25,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElementDependency.java b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElementDependency.java index 0ad1c0150e..453f829c44 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElementDependency.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgElementDependency.java @@ -25,8 +25,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgInfo.java b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgInfo.java index c7433ec188..768f38b7e6 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgInfo.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/data/PSPkgInfo.java @@ -26,9 +26,9 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSIdNameService.java b/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSIdNameService.java index 0f5b8fcc37..55c55c517d 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSIdNameService.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSIdNameService.java @@ -33,7 +33,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.springframework.transaction.annotation.Transactional; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgElemVersionUpdater.java b/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgElemVersionUpdater.java index ddb5ff60f8..bfabff38ca 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgElemVersionUpdater.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgElemVersionUpdater.java @@ -23,7 +23,7 @@ import com.percussion.services.pkginfo.utils.PSPkgHelper; import com.percussion.utils.guid.IPSGuid; import java.util.Collection; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class facilitates the updating of package element version information after configuration diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgInfoService.java b/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgInfoService.java index f727403c49..449a877edf 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgInfoService.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/impl/PSPkgInfoService.java @@ -35,7 +35,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSIdNameHelper.java b/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSIdNameHelper.java index 14dbe4a645..769174c215 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSIdNameHelper.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSIdNameHelper.java @@ -25,7 +25,7 @@ import com.percussion.utils.guid.IPSGuid; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The purpose of this class is to provide a set of utilities for converting package (formerly MSM) diff --git a/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSPkgHelper.java b/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSPkgHelper.java index bf1cd8cd0e..07e4a27403 100644 --- a/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSPkgHelper.java +++ b/deployer/src/main/java/com/percussion/services/pkginfo/utils/PSPkgHelper.java @@ -38,7 +38,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Utility class which provides support for detecting modifications to packaged elements. */ public class PSPkgHelper { diff --git a/modules/CMLight-Main-cactus-tests/pom.xml b/modules/CMLight-Main-cactus-tests/pom.xml index 50fbb79c0d..af65276e11 100644 --- a/modules/CMLight-Main-cactus-tests/pom.xml +++ b/modules/CMLight-Main-cactus-tests/pom.xml @@ -210,11 +210,6 @@ junit junit test - - - commons-lang - commons-lang - provided saxon diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/cms/objectstore/server/PSBinaryFileValueTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/cms/objectstore/server/PSBinaryFileValueTest.java index 6349926f34..b28d3cfe37 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/cms/objectstore/server/PSBinaryFileValueTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/cms/objectstore/server/PSBinaryFileValueTest.java @@ -32,7 +32,7 @@ import com.percussion.webservices.security.IPSSecurityWs; import com.percussion.webservices.security.PSSecurityWsLocator; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/deployer/server/PSLocalDeployerClientTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/deployer/server/PSLocalDeployerClientTest.java index fdbda98a72..6d8c6d16f5 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/deployer/server/PSLocalDeployerClientTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/deployer/server/PSLocalDeployerClientTest.java @@ -23,7 +23,7 @@ import com.percussion.utils.request.PSRequestInfo; import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.junit.experimental.categories.Category; import java.io.File; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/fastforward/managednav/PSManagedNavServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/fastforward/managednav/PSManagedNavServiceTest.java index a68ebdc4d8..8129b636d5 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/fastforward/managednav/PSManagedNavServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/fastforward/managednav/PSManagedNavServiceTest.java @@ -32,7 +32,7 @@ import com.percussion.webservices.security.IPSSecurityWs; import com.percussion.webservices.security.PSSecurityWsLocator; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.experimental.categories.Category; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/itemmanagement/service/PSItemWorkflowServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/itemmanagement/service/PSItemWorkflowServiceTest.java index ea6c7ca54e..b86050074c 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/itemmanagement/service/PSItemWorkflowServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/itemmanagement/service/PSItemWorkflowServiceTest.java @@ -42,7 +42,7 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.webservices.PSWebserviceUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Collections; import java.util.HashSet; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinkServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinkServiceTest.java index 275d890ee7..477d1672f4 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinkServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinkServiceTest.java @@ -40,8 +40,8 @@ import com.percussion.share.service.exception.PSDataServiceException; import com.percussion.share.service.exception.PSValidationException; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinksHtmlAndRIchTextTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinksHtmlAndRIchTextTest.java index cd5299360a..1d609d3c6a 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinksHtmlAndRIchTextTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/linkmanagement/service/PSManagedLinksHtmlAndRIchTextTest.java @@ -40,7 +40,7 @@ import java.util.Properties; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSPageServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSPageServiceTest.java index 0462c3de5d..9879983c26 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSPageServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSPageServiceTest.java @@ -19,9 +19,9 @@ import static com.percussion.assetmanagement.service.impl.PSPreviewPageUtils.getOrphanedAssetsSummaries; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.data.PSAssetWidgetRelationship; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSRenderLinkServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSRenderLinkServiceTest.java index 8b3399601f..d19489bd79 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSRenderLinkServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSRenderLinkServiceTest.java @@ -32,7 +32,7 @@ import com.percussion.utils.testing.IntegrationTest; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; import java.io.File; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSTemplateServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSTemplateServiceTest.java index 796049fa72..89382ca853 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSTemplateServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSTemplateServiceTest.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; @Category(IntegrationTest.class) diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSWidgetDialogGenerator.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSWidgetDialogGenerator.java index 0d35308e99..bc37d0246a 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSWidgetDialogGenerator.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pagemanagement/service/PSWidgetDialogGenerator.java @@ -37,7 +37,7 @@ import com.percussion.test.PSServletTestCase; import com.percussion.util.PSProperties; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Test; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pathmanagement/web/service/PSDesignPathItemServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pathmanagement/web/service/PSDesignPathItemServiceTest.java index c37bf45bf8..3b6d6fa079 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pathmanagement/web/service/PSDesignPathItemServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/pathmanagement/web/service/PSDesignPathItemServiceTest.java @@ -37,7 +37,7 @@ import junit.framework.Assert; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Ignore; @org.junit.experimental.categories.Category(IntegrationTest.class) diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSContentTypeSetterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSContentTypeSetterTest.java index 9cf573790f..d7b9053235 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSContentTypeSetterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSContentTypeSetterTest.java @@ -47,7 +47,7 @@ import com.percussion.utils.testing.IntegrationTest; import com.percussion.utils.types.PSPair; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; import java.util.ArrayList; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSSiteSetterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSSiteSetterTest.java index 39c3d45d15..c73fea117e 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSSiteSetterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSSiteSetterTest.java @@ -28,7 +28,7 @@ import com.percussion.services.sitemgr.PSSiteManagerLocator; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; import java.util.HashMap; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/services/deployer/PSPackageVisibilityTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/services/deployer/PSPackageVisibilityTest.java index 817f8086b2..00c74ba5d1 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/services/deployer/PSPackageVisibilityTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/services/deployer/PSPackageVisibilityTest.java @@ -22,7 +22,7 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.junit.experimental.categories.Category; import java.util.ArrayList; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/filter/PSFilterServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/filter/PSFilterServiceTest.java index 61aff24d89..8ecd9cabb5 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/filter/PSFilterServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/filter/PSFilterServiceTest.java @@ -32,7 +32,7 @@ import com.percussion.utils.testing.IntegrationTest; import com.percussion.utils.xml.PSInvalidXmlException; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.experimental.categories.Category; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/publisher/impl/PSChangedContentListGeneratorTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/publisher/impl/PSChangedContentListGeneratorTest.java index 83e0e1839a..cf81b116f7 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/publisher/impl/PSChangedContentListGeneratorTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/publisher/impl/PSChangedContentListGeneratorTest.java @@ -36,7 +36,7 @@ import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/touchitem/impl/PSCrossSiteTestCase.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/touchitem/impl/PSCrossSiteTestCase.java index 4712d4b683..a5f54fb8af 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/touchitem/impl/PSCrossSiteTestCase.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/touchitem/impl/PSCrossSiteTestCase.java @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; @Category(IntegrationTest.class) public abstract class PSCrossSiteTestCase extends ServletTestCase diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSHtmlUtilsTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSHtmlUtilsTest.java index d38e828e22..f230f85dd1 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSHtmlUtilsTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSHtmlUtilsTest.java @@ -22,7 +22,7 @@ import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.helpers.IOUtils; import org.junit.Test; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSNameGeneratorTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSNameGeneratorTest.java index 2a53fe879b..bd94ad7ad2 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSNameGeneratorTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/share/dao/PSNameGeneratorTest.java @@ -21,7 +21,7 @@ import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; @Category(IntegrationTest.class) diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/importer/helpers/PSTemplateCreationHelperTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/importer/helpers/PSTemplateCreationHelperTest.java index d7af6404e3..e22de56e53 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/importer/helpers/PSTemplateCreationHelperTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/importer/helpers/PSTemplateCreationHelperTest.java @@ -41,7 +41,7 @@ import com.percussion.utils.testing.IntegrationTest; import com.percussion.webservices.security.IPSSecurityWs; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.experimental.categories.Category; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSIncrementalPublishTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSIncrementalPublishTest.java index 0ef0f3e81a..e2f23632ab 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSIncrementalPublishTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSIncrementalPublishTest.java @@ -50,7 +50,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSSiteSuckerTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSSiteSuckerTest.java index 0d65c1ef84..b3aa1297ea 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSSiteSuckerTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/sitemanage/service/PSSiteSuckerTest.java @@ -27,7 +27,7 @@ import com.percussion.test.PSServletTestCase; import com.percussion.utils.testing.IntegrationTest; import com.percussion.webservices.security.PSSecurityWsLocator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.experimental.categories.Category; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/test/PSServletTestCase.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/test/PSServletTestCase.java index fbfe0d89ac..268b6620a1 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/test/PSServletTestCase.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/test/PSServletTestCase.java @@ -19,7 +19,7 @@ import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/user/service/impl/PSUserServiceTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/user/service/impl/PSUserServiceTest.java index 850dde2b65..b7bc3fbdbf 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/user/service/impl/PSUserServiceTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/user/service/impl/PSUserServiceTest.java @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/aop/security/impl/PSSecurityAopTestImplBase.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/aop/security/impl/PSSecurityAopTestImplBase.java index 7b4e4155b0..0dc6aeb152 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/aop/security/impl/PSSecurityAopTestImplBase.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/aop/security/impl/PSSecurityAopTestImplBase.java @@ -28,7 +28,7 @@ import com.percussion.webservices.*; import com.percussion.webservices.aop.security.PSSecurityAopTest; import com.percussion.webservices.aop.security.data.PSMockDesignObject; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.ArrayList; import java.util.Collection; @@ -108,7 +108,7 @@ protected List loadDesignObjects(String name, boolean lock, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSTypeEnum.INTERNAL.name(), dguid.longValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(dguid, error); } @@ -147,7 +147,7 @@ protected PSMockDesignObject loadDesignObject(boolean lock, obj.getClass().getName(), obj.getGuid().longValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e), e.getLocker(), + ExceptionUtils.getStackTrace(e), e.getLocker(), e.getRemainigTime()); } } @@ -252,7 +252,7 @@ else if (obj instanceof PSMockDesignObject) PSWebserviceErrors.createErrorMessage(code, PSTypeEnum.INTERNAL.name(), desObj.getGuid().longValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); ex.addError(desObj.getGuid(), error); } diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/security/PSSecurityWsTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/security/PSSecurityWsTest.java index 239537b7c4..03b77a916c 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/security/PSSecurityWsTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/security/PSSecurityWsTest.java @@ -29,7 +29,7 @@ import com.percussion.utils.testing.IntegrationTest; import org.apache.cactus.ServletTestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverterTest.java index 864c4d568b..a91c5336c8 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverterTest.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSFieldConverterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSFieldConverterTest.java index c9d24d22fe..5fce2528f3 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSFieldConverterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSFieldConverterTest.java @@ -34,7 +34,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSItemConverterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSItemConverterTest.java index 8f2c7b2c6d..326ccb9ba0 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSItemConverterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSItemConverterTest.java @@ -53,7 +53,7 @@ import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSSearchFieldConverterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSSearchFieldConverterTest.java index 93ca02385d..068716a1be 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSSearchFieldConverterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSSearchFieldConverterTest.java @@ -23,7 +23,7 @@ import com.percussion.utils.testing.IntegrationTest; import com.percussion.webservices.transformation.converter.PSSearchFieldConverter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSTemplateSlotConverterTest.java b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSTemplateSlotConverterTest.java index 271f01e013..183985720a 100644 --- a/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSTemplateSlotConverterTest.java +++ b/modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/transformation/converter/PSTemplateSlotConverterTest.java @@ -34,7 +34,7 @@ import java.util.Map; import com.percussion.webservices.transformation.converter.PSTemplateSlotConverter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.experimental.categories.Category; /** diff --git a/modules/ContentUI/pom.xml b/modules/ContentUI/pom.xml index 7488938581..75560f8cac 100644 --- a/modules/ContentUI/pom.xml +++ b/modules/ContentUI/pom.xml @@ -36,10 +36,6 @@ ${project.parent.version} - - commons-lang - commons-lang - org.json json diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAClientServlet.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAClientServlet.java index 6ba8e3666c..5b1a9733ee 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAClientServlet.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAClientServlet.java @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Servlet that calls a AA client action to provide a specific response for a request made by the diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAObjectId.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAObjectId.java index 31e4438c82..bfad69d020 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAObjectId.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAObjectId.java @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.Map; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAUtils.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAUtils.java index bea042616f..91b50e2125 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAUtils.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAUtils.java @@ -26,7 +26,7 @@ import com.percussion.services.relationship.IPSRelationshipService; import com.percussion.services.relationship.PSRelationshipServiceLocator; import com.percussion.util.IPSHtmlParameters; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/PSAAClientActionException.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/PSAAClientActionException.java index 115f3da84e..64cec67c39 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/PSAAClientActionException.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/PSAAClientActionException.java @@ -17,7 +17,7 @@ package com.percussion.content.ui.aa.actions; import java.lang.reflect.InvocationTargetException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * An exception that is used when a error or exception occurs when executing an AA client action. If diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAAActionBase.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAAActionBase.java index 26cec9b887..f2f03be91b 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAAActionBase.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAAActionBase.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; /** diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSActionUtil.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSActionUtil.java index e2989c00c2..51977415bd 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSActionUtil.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSActionUtil.java @@ -57,7 +57,7 @@ import net.htmlparser.jericho.StartTag; import net.htmlparser.jericho.StartTagType; import net.htmlparser.jericho.Tag; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; /** Various utility methods that are used by one or more client actions. */ diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAutoLinkGenerationProperties.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAutoLinkGenerationProperties.java index 0f3103d95a..0dd39d32a2 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAutoLinkGenerationProperties.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSAutoLinkGenerationProperties.java @@ -29,8 +29,7 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.text.StrTokenizer; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -231,9 +230,12 @@ public Collection>> getManagedSitesAndAliases() { */ private Set parse(String text, boolean lowerCase) { Set tokens = new HashSet(); - StrTokenizer toker = StrTokenizer.getCSVInstance(text); - while (toker.hasNext()) { - String token = StringUtils.trimToNull(toker.nextToken()); + // commons-lang 2.x had org.apache.commons.lang.text.StrTokenizer.getCSVInstance(); + // that class is removed in commons-lang3 3.12+. Inline the CSV split with + // StringUtils.split (which trims per-token as part of its contract) and avoid + // adding a new commons-csv dependency for one call site. + for (String raw : StringUtils.split(text, ',')) { + String token = StringUtils.trimToNull(raw); if (token != null) tokens.add(lowerCase ? token.toLowerCase() : token); } return tokens; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateFolderAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateFolderAction.java index c2fd0aaef6..51f8acfc53 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateFolderAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateFolderAction.java @@ -22,7 +22,7 @@ import com.percussion.content.ui.browse.PSContentBrowser; import com.percussion.util.IPSHtmlParameters; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Implementation of the "canCreateFolder" action. */ public class PSCanCreateFolderAction extends PSAAActionBase { diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateItemAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateItemAction.java index 9a2b465a39..5e28ab25a4 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateItemAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCanCreateItemAction.java @@ -22,7 +22,7 @@ import com.percussion.content.ui.browse.PSContentBrowser; import com.percussion.util.IPSHtmlParameters; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Implementation of the "canCreateItem" action. */ public class PSCanCreateItemAction extends PSAAActionBase { diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSConvertLinksToManagedAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSConvertLinksToManagedAction.java index 87e82bc4da..b7280ab14f 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSConvertLinksToManagedAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSConvertLinksToManagedAction.java @@ -84,7 +84,7 @@ import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCreateItemAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCreateItemAction.java index 8a300cffad..2b5c7e78ed 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCreateItemAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSCreateItemAction.java @@ -57,7 +57,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetActionVisibilityAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetActionVisibilityAction.java index da455f2193..bf9524266a 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetActionVisibilityAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetActionVisibilityAction.java @@ -48,7 +48,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; /** diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetAllowedContentTypeForSlotAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetAllowedContentTypeForSlotAction.java index fd141d255a..37138a6a5e 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetAllowedContentTypeForSlotAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetAllowedContentTypeForSlotAction.java @@ -30,7 +30,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetCreateItemUrlAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetCreateItemUrlAction.java index 27111b3831..fa2f944e43 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetCreateItemUrlAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetCreateItemUrlAction.java @@ -21,7 +21,7 @@ import com.percussion.content.ui.browse.PSContentBrowser; import com.percussion.util.IPSHtmlParameters; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; /** */ diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetFieldContentAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetFieldContentAction.java index 60a6b9d31e..a9272de404 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetFieldContentAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetFieldContentAction.java @@ -25,7 +25,7 @@ import com.percussion.utils.types.PSPair; import java.nio.charset.StandardCharsets; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Retrieves the assembled html content for the specified field. Expects an objectid for the diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetIdByPathAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetIdByPathAction.java index ec8c1bf9e8..66a8b5a68e 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetIdByPathAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetIdByPathAction.java @@ -26,7 +26,7 @@ import com.percussion.webservices.content.IPSContentWs; import com.percussion.webservices.content.PSContentWsLocator; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetInlinelinkParentsAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetInlinelinkParentsAction.java index 4589cf8c06..237a8cf45a 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetInlinelinkParentsAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetInlinelinkParentsAction.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemPathAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemPathAction.java index 8165162013..bbc02ed348 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemPathAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemPathAction.java @@ -28,7 +28,7 @@ import com.percussion.webservices.content.IPSContentWs; import com.percussion.webservices.content.PSContentWsLocator; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Gets the path corresponding to the supplied item id. Builds the path by getting the folder path diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemSortRankAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemSortRankAction.java index d36affc7ef..a9ece3dd46 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemSortRankAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemSortRankAction.java @@ -23,7 +23,7 @@ import com.percussion.content.ui.aa.actions.PSActionResponse; import com.percussion.util.IPSHtmlParameters; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Returns the sort rank of the items relationship. Expects sys_relationshipid parameter. Returns diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemTemplatesForSlotAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemTemplatesForSlotAction.java index 218a8904c5..7f98035a7c 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemTemplatesForSlotAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetItemTemplatesForSlotAction.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSlotContentAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSlotContentAction.java index 81a092e577..0ea2ee6741 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSlotContentAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSlotContentAction.java @@ -26,7 +26,7 @@ import com.percussion.utils.types.PSPair; import java.nio.charset.StandardCharsets; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Retrieves the assembled html content for the specified slot. Expects an objectid for the snippet. diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetContentAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetContentAction.java index 777da74072..7aff6f1830 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetContentAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetContentAction.java @@ -26,7 +26,7 @@ import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.types.PSPair; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Retrieves the assembled html content for the specified snippet. Expects an objectid for the diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetPickerSlotContentAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetPickerSlotContentAction.java index 6ae23df1de..457c8067b7 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetPickerSlotContentAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetSnippetPickerSlotContentAction.java @@ -42,7 +42,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Gets the slot content that is used for snippet picker dialog. Builds the slot content by getting diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetUrlAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetUrlAction.java index 83b46869fc..de3ffc7f72 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetUrlAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetUrlAction.java @@ -86,7 +86,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveAction.java index 50e26ec398..771239dce7 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveAction.java @@ -23,7 +23,7 @@ import com.percussion.error.PSException; import com.percussion.server.IPSRequestContext; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * An action that will move a slot item up or down by one position or move the item to a specified diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveToSlotAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveToSlotAction.java index 8e86e2a6cc..21e11ed268 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveToSlotAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSMoveToSlotAction.java @@ -30,7 +30,7 @@ import com.percussion.util.IPSHtmlParameters; import java.util.Collection; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; /** diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSSetContentEditorFieldValueAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSSetContentEditorFieldValueAction.java index e50f46de55..debc128a3e 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSSetContentEditorFieldValueAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSSetContentEditorFieldValueAction.java @@ -38,7 +38,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSUpdateItemAction.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSUpdateItemAction.java index cf3bccc6fe..81619d54a1 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSUpdateItemAction.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSUpdateItemAction.java @@ -25,7 +25,7 @@ import com.percussion.server.IPSRequestContext; import com.percussion.util.IPSHtmlParameters; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; /** diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/browse/PSContentBrowser.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/browse/PSContentBrowser.java index 1b5a5a8d81..62f6e71f7c 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/browse/PSContentBrowser.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/browse/PSContentBrowser.java @@ -17,11 +17,11 @@ package com.percussion.content.ui.browse; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.StringUtils.substringAfterLast; -import static org.apache.commons.lang.StringUtils.substringBeforeLast; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.StringUtils.substringAfterLast; +import static org.apache.commons.lang3.StringUtils.substringBeforeLast; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.PSComponentSummary; @@ -61,7 +61,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; diff --git a/modules/ContentUI/src/main/java/com/percussion/content/ui/search/PSSearchResult.java b/modules/ContentUI/src/main/java/com/percussion/content/ui/search/PSSearchResult.java index a17f7ad3ac..57fbfd73b5 100644 --- a/modules/ContentUI/src/main/java/com/percussion/content/ui/search/PSSearchResult.java +++ b/modules/ContentUI/src/main/java/com/percussion/content/ui/search/PSSearchResult.java @@ -53,7 +53,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/modules/DesktopContentExplorer/pom.xml b/modules/DesktopContentExplorer/pom.xml index 78675683d8..2543f0e321 100644 --- a/modules/DesktopContentExplorer/pom.xml +++ b/modules/DesktopContentExplorer/pom.xml @@ -126,10 +126,6 @@ perc-help ${project.parent.version} - - commons-lang - commons-lang - org.apache.logging.log4j log4j-api diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSACLNewUserDialog.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSACLNewUserDialog.java index e5628b2afe..3b3b88a5e5 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSACLNewUserDialog.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSACLNewUserDialog.java @@ -256,7 +256,7 @@ public boolean equals(Object object) { ProviderType that = (ProviderType) object; - return new org.apache.commons.lang.builder.EqualsBuilder() + return new org.apache.commons.lang3.builder.EqualsBuilder() .appendSuper(super.equals(object)) .append(m_typeId, that.m_typeId) .append(m_typeName, that.m_typeName) @@ -265,7 +265,7 @@ public boolean equals(Object object) { } public int hashCode() { - return new org.apache.commons.lang.builder.HashCodeBuilder(17, 37) + return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37) .appendSuper(super.hashCode()) .append(m_typeId) .append(m_typeName) diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionBar.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionBar.java index 69e6ae0f0a..22696fe7aa 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionBar.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionBar.java @@ -53,7 +53,7 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.UIManager; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** The top-level action bar for the applet. */ public class PSActionBar extends JPanel diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionManager.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionManager.java index e94ba61fd3..98cdb2fb4c 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionManager.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSActionManager.java @@ -126,7 +126,7 @@ import javax.xml.parsers.ParserConfigurationException; import netscape.javascript.JSException; import netscape.javascript.JSObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSCESessionManager.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSCESessionManager.java index 446d221344..2fa36bd19c 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSCESessionManager.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSCESessionManager.java @@ -37,7 +37,7 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplet.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplet.java index ecb457e683..9a080829bf 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplet.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplet.java @@ -87,7 +87,7 @@ import javax.xml.parsers.ParserConfigurationException; import netscape.javascript.JSException; import netscape.javascript.JSObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplication.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplication.java index 21f8b898a5..67f1fa43ae 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplication.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerApplication.java @@ -40,7 +40,7 @@ import javax.swing.UIManager; import javax.swing.text.DefaultEditorKit; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerFrame.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerFrame.java index 126fbdcd50..b2700c055e 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerFrame.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerFrame.java @@ -54,7 +54,7 @@ import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.SwingUtilities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class PSContentExplorerFrame extends PSDesktopExplorerWindow diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerLoginPanel.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerLoginPanel.java index 2c9854fea9..7b1ba1b99c 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerLoginPanel.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerLoginPanel.java @@ -74,7 +74,7 @@ import javax.swing.border.EtchedBorder; import javax.swing.plaf.basic.BasicComboBoxRenderer; import org.apache.axis.AxisFault; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerUtils.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerUtils.java index 069901af94..6e9b0b4c8e 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerUtils.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSContentExplorerUtils.java @@ -35,7 +35,7 @@ import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.TransformerFactory; import javax.xml.xpath.XPathFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class PSContentExplorerUtils { diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSExecutableSearch.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSExecutableSearch.java index 90d695285c..45a22ea8ac 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSExecutableSearch.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSExecutableSearch.java @@ -53,7 +53,7 @@ import java.util.Map; import java.util.Set; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSFolderActionManager.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSFolderActionManager.java index 48450fa926..f5a265f294 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSFolderActionManager.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSFolderActionManager.java @@ -61,7 +61,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSItemRelationshipsManager.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSItemRelationshipsManager.java index f46bae6043..155bbfe723 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSItemRelationshipsManager.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSItemRelationshipsManager.java @@ -43,7 +43,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSMainDisplayPanel.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSMainDisplayPanel.java index 90cb7cb019..f7c7edcc21 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSMainDisplayPanel.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/PSMainDisplayPanel.java @@ -86,7 +86,7 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; /** diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSCommunityCataloger.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSCommunityCataloger.java index 034b087eb3..eb4e1a49b9 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSCommunityCataloger.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSCommunityCataloger.java @@ -87,14 +87,14 @@ public boolean equals(Object object) { PSCommunityCataloger that = (PSCommunityCataloger) object; - return new org.apache.commons.lang.builder.EqualsBuilder() + return new org.apache.commons.lang3.builder.EqualsBuilder() .appendSuper(super.equals(object)) .append(m_collCommunities, that.m_collCommunities) .isEquals(); } public int hashCode() { - return new org.apache.commons.lang.builder.HashCodeBuilder(17, 37) + return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37) .appendSuper(super.hashCode()) .append(m_collCommunities) .toHashCode(); diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSRoleCataloger.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSRoleCataloger.java index eef562e4cb..89a79224a5 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSRoleCataloger.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSRoleCataloger.java @@ -85,14 +85,14 @@ public boolean equals(Object object) { PSRoleCataloger that = (PSRoleCataloger) object; - return new org.apache.commons.lang.builder.EqualsBuilder() + return new org.apache.commons.lang3.builder.EqualsBuilder() .appendSuper(super.equals(object)) .append(m_collRoles, that.m_collRoles) .isEquals(); } public int hashCode() { - return new org.apache.commons.lang.builder.HashCodeBuilder(17, 37) + return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37) .appendSuper(super.hashCode()) .append(m_collRoles) .toHashCode(); diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSSubjectCataloger.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSSubjectCataloger.java index 461df24d59..067cf4d0f1 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSSubjectCataloger.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/catalogers/PSSubjectCataloger.java @@ -87,14 +87,14 @@ public boolean equals(Object object) { PSSubjectCataloger that = (PSSubjectCataloger) object; - return new org.apache.commons.lang.builder.EqualsBuilder() + return new org.apache.commons.lang3.builder.EqualsBuilder() .appendSuper(super.equals(object)) .append(m_collSubjects, that.m_collSubjects) .isEquals(); } public int hashCode() { - return new org.apache.commons.lang.builder.HashCodeBuilder(17, 37) + return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37) .appendSuper(super.hashCode()) .append(m_collSubjects) .toHashCode(); diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/BrowserProps.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/BrowserProps.java index c298fff6b8..31df615647 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/BrowserProps.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/BrowserProps.java @@ -17,7 +17,7 @@ package com.percussion.cx.javafx; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class BrowserProps { diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSDesktopExplorerWindow.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSDesktopExplorerWindow.java index 8e436e90fe..af46dd98a7 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSDesktopExplorerWindow.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSDesktopExplorerWindow.java @@ -39,7 +39,7 @@ import javax.swing.JFrame; import javax.swing.SwingUtilities; import netscape.javascript.JSObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jetbrains.annotations.NotNull; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSFileSaver.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSFileSaver.java index 488b09e348..97b374bcd3 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSFileSaver.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSFileSaver.java @@ -28,7 +28,7 @@ import javafx.stage.FileChooser; import javafx.stage.Stage; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSSimpleSwingBrowser.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSSimpleSwingBrowser.java index bcb0a7efc6..821317aa7a 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSSimpleSwingBrowser.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSSimpleSwingBrowser.java @@ -72,7 +72,7 @@ import javax.swing.JTextField; import javax.swing.SwingUtilities; import netscape.javascript.JSObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class PSSimpleSwingBrowser extends PSDesktopExplorerWindow { diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSWindowManager.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSWindowManager.java index e5e3ea6f0c..fd90dce8bf 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSWindowManager.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/javafx/PSWindowManager.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import javax.swing.SwingUtilities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class PSWindowManager { diff --git a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/objectstore/PSNode.java b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/objectstore/PSNode.java index b4b3668dc4..6528e7fa96 100644 --- a/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/objectstore/PSNode.java +++ b/modules/DesktopContentExplorer/src/main/java/com/percussion/cx/objectstore/PSNode.java @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/modules/ServerUIComponents/pom.xml b/modules/ServerUIComponents/pom.xml index dd76300831..5dea5bf716 100644 --- a/modules/ServerUIComponents/pom.xml +++ b/modules/ServerUIComponents/pom.xml @@ -35,10 +35,6 @@ oro 2.0.8 - - commons-lang - commons-lang - diff --git a/modules/ServerUIComponents/src/main/java/com/percussion/search/ui/PSSearchFieldEditor.java b/modules/ServerUIComponents/src/main/java/com/percussion/search/ui/PSSearchFieldEditor.java index ad88d534d9..118c79d120 100644 --- a/modules/ServerUIComponents/src/main/java/com/percussion/search/ui/PSSearchFieldEditor.java +++ b/modules/ServerUIComponents/src/main/java/com/percussion/search/ui/PSSearchFieldEditor.java @@ -65,7 +65,7 @@ import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/modules/TableFactory/pom.xml b/modules/TableFactory/pom.xml index ea34683a63..2af8043e86 100644 --- a/modules/TableFactory/pom.xml +++ b/modules/TableFactory/pom.xml @@ -109,11 +109,6 @@ commons-collections compile - - commons-lang - commons-lang - compile - diff --git a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcDbmsDef.java b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcDbmsDef.java index 36e46ada3d..60e5d18b76 100644 --- a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcDbmsDef.java +++ b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcDbmsDef.java @@ -50,7 +50,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.sql.DataSource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcImportExportHelper.java b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcImportExportHelper.java index 2d70b3f783..1c1d9d00b9 100644 --- a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcImportExportHelper.java +++ b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcImportExportHelper.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSJdbcImportExportHelper { public static String OPTION_DB_EXPORT = "-dbexport"; diff --git a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcKey.java b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcKey.java index 9776658d42..163f094416 100644 --- a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcKey.java +++ b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcKey.java @@ -17,7 +17,7 @@ package com.percussion.tablefactory; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; diff --git a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcStatementFactory.java b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcStatementFactory.java index d91e9cd07a..1e37188bb9 100644 --- a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcStatementFactory.java +++ b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcStatementFactory.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcTableSchema.java b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcTableSchema.java index e8905a43f1..929002482d 100644 --- a/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcTableSchema.java +++ b/modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcTableSchema.java @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/TableFactory/src/test/java/com/percussion/tablefactory/PSJdbcTableSchemaTest.java b/modules/TableFactory/src/test/java/com/percussion/tablefactory/PSJdbcTableSchemaTest.java index c9df8eeef9..ddee421576 100644 --- a/modules/TableFactory/src/test/java/com/percussion/tablefactory/PSJdbcTableSchemaTest.java +++ b/modules/TableFactory/src/test/java/com/percussion/tablefactory/PSJdbcTableSchemaTest.java @@ -24,7 +24,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-landingpage/src/main/java/com/percussion/soln/landingpage/LandingPageFolderEffect.java b/modules/extensions-landingpage/src/main/java/com/percussion/soln/landingpage/LandingPageFolderEffect.java index eeeca6be69..f6dc1f0c82 100644 --- a/modules/extensions-landingpage/src/main/java/com/percussion/soln/landingpage/LandingPageFolderEffect.java +++ b/modules/extensions-landingpage/src/main/java/com/percussion/soln/landingpage/LandingPageFolderEffect.java @@ -76,8 +76,8 @@ import static java.text.MessageFormat.format; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.apache.commons.lang.Validate.noNullElements; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.noNullElements; +import static org.apache.commons.lang3.Validate.notNull; /** * Creates a landing page relationship with the navon and diff --git a/modules/extensions-linkback/pom.xml b/modules/extensions-linkback/pom.xml index 312c53ad60..74c7fd7e0c 100644 --- a/modules/extensions-linkback/pom.xml +++ b/modules/extensions-linkback/pom.xml @@ -55,11 +55,6 @@ commons-codec provided - - commons-lang - commons-lang - provided - com.percussion rxutils diff --git a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/codec/impl/StringLinkBackTokenImpl.java b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/codec/impl/StringLinkBackTokenImpl.java index 2f442721b2..1957b4adc1 100644 --- a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/codec/impl/StringLinkBackTokenImpl.java +++ b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/codec/impl/StringLinkBackTokenImpl.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/ActiveAssemblyLinkbackController.java b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/ActiveAssemblyLinkbackController.java index 216d8cb9fb..cb14dbb42f 100644 --- a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/ActiveAssemblyLinkbackController.java +++ b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/ActiveAssemblyLinkbackController.java @@ -22,7 +22,7 @@ import com.percussion.util.IPSHtmlParameters; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/GenericLinkbackController.java b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/GenericLinkbackController.java index 1c7a1a2d2d..4734bfc558 100644 --- a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/GenericLinkbackController.java +++ b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/servlet/GenericLinkbackController.java @@ -27,7 +27,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/utils/ItemSummaryFinder.java b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/utils/ItemSummaryFinder.java index 61ad24d55b..4778cfdf13 100644 --- a/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/utils/ItemSummaryFinder.java +++ b/modules/extensions-linkback/src/main/java/com/percussion/soln/linkback/utils/ItemSummaryFinder.java @@ -22,7 +22,7 @@ import com.percussion.error.PSException; import com.percussion.services.legacy.IPSCmsContentSummaries; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-main/pom.xml b/modules/extensions-main/pom.xml index 6145da2f97..f62dfd27e9 100644 --- a/modules/extensions-main/pom.xml +++ b/modules/extensions-main/pom.xml @@ -63,10 +63,6 @@ junit test - - commons-lang - commons-lang - commons-logging commons-logging diff --git a/modules/extensions-main/src/main/java/com/percussion/cas/PSGeneratePubLocation.java b/modules/extensions-main/src/main/java/com/percussion/cas/PSGeneratePubLocation.java index 2afe025af2..a94d186148 100644 --- a/modules/extensions-main/src/main/java/com/percussion/cas/PSGeneratePubLocation.java +++ b/modules/extensions-main/src/main/java/com/percussion/cas/PSGeneratePubLocation.java @@ -77,7 +77,7 @@ import java.util.List; import java.util.Map; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-main/src/main/java/com/percussion/cas/PSSysTemplateToSysVariantid.java b/modules/extensions-main/src/main/java/com/percussion/cas/PSSysTemplateToSysVariantid.java index 7d116bb9fc..45d09fbaf0 100644 --- a/modules/extensions-main/src/main/java/com/percussion/cas/PSSysTemplateToSysVariantid.java +++ b/modules/extensions-main/src/main/java/com/percussion/cas/PSSysTemplateToSysVariantid.java @@ -31,7 +31,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/modules/extensions-main/src/main/java/com/percussion/cms/PSGetInlineVariantBody.java b/modules/extensions-main/src/main/java/com/percussion/cms/PSGetInlineVariantBody.java index a2494fa99c..0b4ecf7752 100644 --- a/modules/extensions-main/src/main/java/com/percussion/cms/PSGetInlineVariantBody.java +++ b/modules/extensions-main/src/main/java/com/percussion/cms/PSGetInlineVariantBody.java @@ -25,7 +25,7 @@ import com.percussion.server.IPSRequestContext; import com.percussion.services.assembly.jexl.PSDocumentUtils; import com.percussion.services.utils.general.PSAssemblyServiceUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/cx/PSGetAadItemTypeIconPaths.java b/modules/extensions-main/src/main/java/com/percussion/cx/PSGetAadItemTypeIconPaths.java index e6370affdf..60ff640cc2 100644 --- a/modules/extensions-main/src/main/java/com/percussion/cx/PSGetAadItemTypeIconPaths.java +++ b/modules/extensions-main/src/main/java/com/percussion/cx/PSGetAadItemTypeIconPaths.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-main/src/main/java/com/percussion/cx/PSGetItemTypeIconPaths.java b/modules/extensions-main/src/main/java/com/percussion/cx/PSGetItemTypeIconPaths.java index d332789d39..2fcb42a049 100644 --- a/modules/extensions-main/src/main/java/com/percussion/cx/PSGetItemTypeIconPaths.java +++ b/modules/extensions-main/src/main/java/com/percussion/cx/PSGetItemTypeIconPaths.java @@ -34,7 +34,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/cms/PSSelectAASlots.java b/modules/extensions-main/src/main/java/com/percussion/extensions/cms/PSSelectAASlots.java index bf0d6d5d14..e060b2e054 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/cms/PSSelectAASlots.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/cms/PSSelectAASlots.java @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/encoding/PSItemInputSanitizerTransformer.java b/modules/extensions-main/src/main/java/com/percussion/extensions/encoding/PSItemInputSanitizerTransformer.java index 2ed173a6fa..9d7506f19d 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/encoding/PSItemInputSanitizerTransformer.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/encoding/PSItemInputSanitizerTransformer.java @@ -28,7 +28,7 @@ import com.percussion.server.IPSRequestContext; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.safety.Safelist; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSProxyQueryResource.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSProxyQueryResource.java index e7224d5fb0..b558883b12 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSProxyQueryResource.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSProxyQueryResource.java @@ -50,7 +50,7 @@ import org.apache.commons.httpclient.cookie.CookiePolicy; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.params.HttpMethodParams; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormat.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormat.java index 440cbdb640..d40ef14be0 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormat.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormat.java @@ -24,7 +24,7 @@ import com.percussion.util.PSDataTypeConverter; import java.text.ParseException; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The PSSimpleJavaUdf_dateFormat class formats a date according to a user supplied pattern. diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormatEx.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormatEx.java index 918f22423f..751dde4af5 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormatEx.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_dateFormatEx.java @@ -23,7 +23,7 @@ import com.percussion.util.PSDataTypeConverter; import java.text.ParseException; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The PSSimpleJavaUdf_dateFormatEx class formats a date according to a user supplied pattern. diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_encodeForUrl.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_encodeForUrl.java index bce0524d96..ec012fceda 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_encodeForUrl.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSSimpleJavaUdf_encodeForUrl.java @@ -20,7 +20,7 @@ import com.percussion.server.IPSRequestContext; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Takes a string and encodes it so it is safe to use as a URL query param value. diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSTouchItemsWorkflowAction.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSTouchItemsWorkflowAction.java index 2fb3eb4729..8256b9731c 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSTouchItemsWorkflowAction.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSTouchItemsWorkflowAction.java @@ -16,7 +16,7 @@ */ package com.percussion.extensions.general; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.extension.IPSWorkFlowContext; import com.percussion.extension.IPSWorkflowAction; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateFile.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateFile.java index c09517bf62..561c6c97c3 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateFile.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateFile.java @@ -20,7 +20,7 @@ import com.percussion.server.IPSRequestContext; import com.percussion.util.IPSHtmlParameters; import com.percussion.util.PSPurgableTempFile; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Validates that either no source file was supplied, null or empty, or that the diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateString.java b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateString.java index 3f31895ee5..44974e9abd 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateString.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/general/PSValidateString.java @@ -19,7 +19,7 @@ import com.percussion.data.PSConversionException; import com.percussion.extension.PSSimpleJavaUdfExtension; import com.percussion.server.IPSRequestContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Checks if a string is empty, null, or whitespace. */ public class PSValidateString extends PSSimpleJavaUdfExtension { diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyBooleanValues.java b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyBooleanValues.java index 8135f35b70..11e46073bb 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyBooleanValues.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyBooleanValues.java @@ -29,7 +29,7 @@ import com.percussion.server.PSConsole; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyGuidValues.java b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyGuidValues.java index c9119c4c31..46c7a57d8a 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyGuidValues.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyGuidValues.java @@ -29,7 +29,7 @@ import com.percussion.server.PSConsole; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyIntegerValues.java b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyIntegerValues.java index 86a9d53164..cd4b33bf57 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyIntegerValues.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyIntegerValues.java @@ -29,7 +29,7 @@ import com.percussion.server.PSConsole; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyNumericValues.java b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyNumericValues.java index 57d6f1ca39..f8486c45b6 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyNumericValues.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyNumericValues.java @@ -29,7 +29,7 @@ import com.percussion.server.PSConsole; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyPathValues.java b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyPathValues.java index c4c34e9374..3a787f7dc7 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyPathValues.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyPathValues.java @@ -31,7 +31,7 @@ import java.io.File; import java.nio.file.InvalidPathException; import java.nio.file.Paths; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyTheseCharacters.java b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyTheseCharacters.java index a12e0f4886..365edd0c16 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyTheseCharacters.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/security/PSAllowOnlyTheseCharacters.java @@ -29,7 +29,7 @@ import com.percussion.server.PSConsole; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSFormEncode.java b/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSFormEncode.java index ed8627ad18..dc05623522 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSFormEncode.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSFormEncode.java @@ -24,7 +24,7 @@ import com.percussion.extension.PSExtensionParams; import com.percussion.server.IPSRequestContext; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Will turn a <form> tag into a <div> tag that has a special attribute marker to diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSTrimStringValue.java b/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSTrimStringValue.java index 454a776d0b..9791c6b453 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSTrimStringValue.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/translations/PSTrimStringValue.java @@ -23,7 +23,7 @@ import com.percussion.extension.PSExtensionParams; import com.percussion.server.IPSRequestContext; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Evaluate a JEXL expression for input. The arguments are: diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSExtensionParamsHelper.java b/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSExtensionParamsHelper.java index e9979ab1a7..a86102cf40 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSExtensionParamsHelper.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSExtensionParamsHelper.java @@ -17,7 +17,7 @@ package com.percussion.extensions.utils; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import com.percussion.design.objectstore.IPSReplacementValue; import com.percussion.extension.IPSExtensionDef; @@ -29,7 +29,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.BooleanConverter; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSTidyUtils.java b/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSTidyUtils.java index df6c0e1cb9..bb5892aeec 100644 --- a/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSTidyUtils.java +++ b/modules/extensions-main/src/main/java/com/percussion/extensions/utils/PSTidyUtils.java @@ -17,7 +17,7 @@ package com.percussion.extensions.utils; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.extension.PSExtensionProcessingException; import com.percussion.share.service.exception.PSExtractHTMLException; @@ -26,7 +26,7 @@ import com.percussion.xmldom.PSXmlDomUtils; import java.io.IOException; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-main/src/main/java/com/percussion/filter/DefaultPasswordFilter.java b/modules/extensions-main/src/main/java/com/percussion/filter/DefaultPasswordFilter.java index 3fda7b4316..0736f003f8 100644 --- a/modules/extensions-main/src/main/java/com/percussion/filter/DefaultPasswordFilter.java +++ b/modules/extensions-main/src/main/java/com/percussion/filter/DefaultPasswordFilter.java @@ -21,7 +21,7 @@ import com.percussion.security.PSPasswordHandler; import java.io.File; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-main/src/main/java/com/percussion/validate/PSValidateRequired.java b/modules/extensions-main/src/main/java/com/percussion/validate/PSValidateRequired.java index eedde32dc8..c692db4222 100644 --- a/modules/extensions-main/src/main/java/com/percussion/validate/PSValidateRequired.java +++ b/modules/extensions-main/src/main/java/com/percussion/validate/PSValidateRequired.java @@ -22,7 +22,7 @@ import com.percussion.extension.PSExtensionParams; import com.percussion.server.IPSRequestContext; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Check that the value argument exists diff --git a/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextCleanup.java b/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextCleanup.java index 3cf94e8d7f..71b13a611f 100644 --- a/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextCleanup.java +++ b/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextCleanup.java @@ -38,7 +38,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Collection; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.nodes.Attributes; diff --git a/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextToDom.java b/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextToDom.java index 47d7bfd3a1..03f0c32c98 100644 --- a/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextToDom.java +++ b/modules/extensions-main/src/main/java/com/percussion/xmldom/PSXdTextToDom.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/modules/extensions-sfp/pom.xml b/modules/extensions-sfp/pom.xml index c0a1278225..8ce4da68ba 100644 --- a/modules/extensions-sfp/pom.xml +++ b/modules/extensions-sfp/pom.xml @@ -44,11 +44,6 @@ jcr compile - - commons-lang - commons-lang - compile - org.jmock jmock diff --git a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/calendar/PSCalendarMonthModel.java b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/calendar/PSCalendarMonthModel.java index e9cc2850d5..1a34201799 100644 --- a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/calendar/PSCalendarMonthModel.java +++ b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/calendar/PSCalendarMonthModel.java @@ -30,7 +30,7 @@ import javax.jcr.RepositoryException; import org.apache.commons.collections.MultiHashMap; import org.apache.commons.collections.MultiMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSBuildRelationshipsFromIdsExit.java b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSBuildRelationshipsFromIdsExit.java index b9aa929031..f781ab31ae 100644 --- a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSBuildRelationshipsFromIdsExit.java +++ b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSBuildRelationshipsFromIdsExit.java @@ -30,7 +30,7 @@ import com.percussion.services.assembly.PSAssemblyException; import com.percussion.util.IPSHtmlParameters; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipBuilder.java b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipBuilder.java index a93056c00b..becc4f2bcf 100644 --- a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipBuilder.java +++ b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipBuilder.java @@ -32,7 +32,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipParser.java b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipParser.java index d0eaf66394..936bbd36a7 100644 --- a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipParser.java +++ b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSChildRelationshipParser.java @@ -22,7 +22,7 @@ import com.percussion.services.assembly.IPSTemplateSlot; import com.percussion.services.assembly.PSAssemblyException; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Uses the assembly service and relationship api to query relationships. diff --git a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSExtractIdsFromSlotExit.java b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSExtractIdsFromSlotExit.java index c7228ee5d1..8e7885591e 100644 --- a/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSExtractIdsFromSlotExit.java +++ b/modules/extensions-sfp/src/main/java/com/percussion/fastforward/relationship/PSExtractIdsFromSlotExit.java @@ -26,7 +26,7 @@ import com.percussion.util.IPSHtmlParameters; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-workflow/pom.xml b/modules/extensions-workflow/pom.xml index d638376fb0..286197e198 100644 --- a/modules/extensions-workflow/pom.xml +++ b/modules/extensions-workflow/pom.xml @@ -72,11 +72,6 @@ commons-email provided - - commons-lang - commons-lang - provided - com.sun.mail javax.mail diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAddPossibleTransitionsEx.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAddPossibleTransitionsEx.java index 81c78ba38f..42e769ad4a 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAddPossibleTransitionsEx.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAddPossibleTransitionsEx.java @@ -44,7 +44,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAuthenticateUser.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAuthenticateUser.java index c444e70193..5501fa6aca 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAuthenticateUser.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitAuthenticateUser.java @@ -39,7 +39,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitDeleteWfCtypeAssociations.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitDeleteWfCtypeAssociations.java index 390e76c233..54404dc9ba 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitDeleteWfCtypeAssociations.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitDeleteWfCtypeAssociations.java @@ -40,7 +40,7 @@ import java.util.ArrayList; import java.util.List; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitNotifyAssignees.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitNotifyAssignees.java index 1d4c82bc9a..4c6349cddc 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitNotifyAssignees.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSExitNotifyAssignees.java @@ -89,7 +89,7 @@ import java.util.Set; import javax.jcr.RepositoryException; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSGetCheckoutStatus.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSGetCheckoutStatus.java index b50492a924..5b2c8ecfcd 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSGetCheckoutStatus.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSGetCheckoutStatus.java @@ -29,7 +29,7 @@ import java.sql.Connection; import java.sql.SQLException; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSWorkflowRoleInfoStatic.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSWorkflowRoleInfoStatic.java index b2d5713ea9..173296fabe 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSWorkflowRoleInfoStatic.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/PSWorkflowRoleInfoStatic.java @@ -18,7 +18,7 @@ import static com.percussion.server.PSServer.getProperty; import static java.util.Collections.singletonList; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSComponentSummary; import com.percussion.design.objectstore.PSAttribute; diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSJavaxMailProgram.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSJavaxMailProgram.java index ba6baa7992..1a686ef0ce 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSJavaxMailProgram.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSJavaxMailProgram.java @@ -27,7 +27,7 @@ import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This is the default implementation of the Mail Program interface IPSMailProgram that diff --git a/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSSecureMailProgram.java b/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSSecureMailProgram.java index ef4b9e52d6..85ba5b1a30 100644 --- a/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSSecureMailProgram.java +++ b/modules/extensions-workflow/src/main/java/com/percussion/workflow/mail/PSSecureMailProgram.java @@ -22,7 +22,7 @@ import com.percussion.security.PSEncryptProperties; import com.percussion.security.PSEncryptor; import com.percussion.utils.io.PathUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.MultiPartEmail; import org.apache.logging.log4j.LogManager; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/DeliveryRequest.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/DeliveryRequest.java index 83615303e9..c7410b5c72 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/DeliveryRequest.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/DeliveryRequest.java @@ -17,8 +17,8 @@ package com.percussion.soln.p13n.delivery; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.percussion.soln.p13n.delivery.data.DeliveryListItem; import com.percussion.soln.p13n.tracking.VisitorProfile; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryItem.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryItem.java index 603d493544..846a4799d3 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryItem.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryItem.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryListItem.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryListItem.java index 96b5905b3a..ee827d83c0 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryListItem.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/data/DeliveryListItem.java @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import com.percussion.soln.p13n.delivery.IDeliverySnippetFilter; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliveryContext.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliveryContext.java index fc874856d3..46be59fce7 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliveryContext.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliveryContext.java @@ -19,7 +19,7 @@ import static com.percussion.soln.p13n.delivery.impl.DeliverySegmentUtil.getVisitorProfileSegments; import static com.percussion.soln.p13n.delivery.impl.DeliverySegmentUtil.weightDescending; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliverySegmentUtil.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliverySegmentUtil.java index f03e37cf95..a91c818688 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliverySegmentUtil.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/DeliverySegmentUtil.java @@ -17,7 +17,7 @@ package com.percussion.soln.p13n.delivery.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/SnippetFilterChain.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/SnippetFilterChain.java index f2b43935cc..b45753e3a8 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/SnippetFilterChain.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/impl/SnippetFilterChain.java @@ -23,9 +23,9 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.builder.StandardToStringStyle; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.StandardToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ListSizeFilter.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ListSizeFilter.java index 8cb7ac77d5..9d95fcd55c 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ListSizeFilter.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ListSizeFilter.java @@ -18,7 +18,7 @@ package com.percussion.soln.p13n.delivery.snipfilter.impl; import static com.percussion.soln.p13n.delivery.snipfilter.DeliverySnippetFilterUtil.*; -import static org.apache.commons.lang.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.*; import java.util.ArrayList; import java.util.List; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ScoreRangeFilter.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ScoreRangeFilter.java index d844f0ca82..6e6d34b3c9 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ScoreRangeFilter.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/delivery/snipfilter/impl/ScoreRangeFilter.java @@ -17,13 +17,13 @@ package com.percussion.soln.p13n.delivery.snipfilter.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.util.List; import javax.jcr.RepositoryException; -import org.apache.commons.lang.math.DoubleRange; +import org.apache.commons.lang3.math.DoubleRange; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorLocation.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorLocation.java index dd1f51e1f4..9955d19bb8 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorLocation.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorLocation.java @@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlTransient; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.percussion.soln.p13n.tracking.location.IVisitorLocationService; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorProfile.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorProfile.java index b1910a97d2..5d33ff5c47 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorProfile.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorProfile.java @@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingActionRequest.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingActionRequest.java index 303768c7a9..4a4aaad158 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingActionRequest.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingActionRequest.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.percussion.soln.p13n.tracking.VisitorTrackingRequest; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingRequest.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingRequest.java index 3b38202108..67d572bd33 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingRequest.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/VisitorTrackingRequest.java @@ -17,8 +17,8 @@ package com.percussion.soln.p13n.tracking; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * A visitor tracking request includes either the profile id diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/AbstractVisitorTrackingAction.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/AbstractVisitorTrackingAction.java index dd8040da3b..9a8776fad6 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/AbstractVisitorTrackingAction.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/AbstractVisitorTrackingAction.java @@ -17,7 +17,7 @@ package com.percussion.soln.p13n.tracking.action; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.soln.p13n.tracking.IVisitorProfileDataService; import com.percussion.soln.p13n.tracking.IVisitorTrackingAction; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/impl/VisitorTrackingActionLogin.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/impl/VisitorTrackingActionLogin.java index 99d14db1bd..901b9406ec 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/impl/VisitorTrackingActionLogin.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/action/impl/VisitorTrackingActionLogin.java @@ -19,14 +19,14 @@ import static com.percussion.soln.p13n.tracking.impl.SegmentWeightUtil.mergeSegmentWeights; import static com.percussion.soln.p13n.tracking.impl.SegmentWeightUtil.setSegmentWeights; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/impl/VisitorTrackingService.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/impl/VisitorTrackingService.java index b597fec916..d473bbf529 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/impl/VisitorTrackingService.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/impl/VisitorTrackingService.java @@ -17,8 +17,8 @@ package com.percussion.soln.p13n.tracking.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import java.util.Collections; import java.util.HashMap; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/TrackRestClient.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/TrackRestClient.java index 60310cf6e4..ace5940d88 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/TrackRestClient.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/TrackRestClient.java @@ -21,7 +21,7 @@ import static com.percussion.soln.p13n.tracking.web.VisitorTrackingWebUtils.jsonToResponse; import static com.percussion.soln.p13n.tracking.web.VisitorTrackingWebUtils.parameterizeTrackingRequest; import static com.percussion.soln.p13n.tracking.web.VisitorTrackingWebUtils.setVisitorProfileToCookie; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.io.IOException; import java.net.URI; diff --git a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/VisitorTrackingWebUtils.java b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/VisitorTrackingWebUtils.java index 3153681af7..4db2e0961f 100644 --- a/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/VisitorTrackingWebUtils.java +++ b/modules/p13n-api/src/main/java/com/percussion/soln/p13n/tracking/web/VisitorTrackingWebUtils.java @@ -17,9 +17,9 @@ package com.percussion.soln.p13n.tracking.web; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import java.util.Date; import java.util.Enumeration; diff --git a/modules/p13n-api/src/test/java/com/percussion/soln/p13n/tracking/web/TestWebServer.java b/modules/p13n-api/src/test/java/com/percussion/soln/p13n/tracking/web/TestWebServer.java index 1c76908b3d..d7fa36e209 100644 --- a/modules/p13n-api/src/test/java/com/percussion/soln/p13n/tracking/web/TestWebServer.java +++ b/modules/p13n-api/src/test/java/com/percussion/soln/p13n/tracking/web/TestWebServer.java @@ -20,8 +20,8 @@ */ package test.percussion.soln.p13n.tracking.web; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/modules/perc-ant/pom.xml b/modules/perc-ant/pom.xml index 236166066c..e9a6577865 100644 --- a/modules/perc-ant/pom.xml +++ b/modules/perc-ant/pom.xml @@ -126,10 +126,6 @@ - - commons-lang - commons-lang - org.apache.commons commons-lang3 diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/gui/PSRxBuildInput.java b/modules/perc-ant/src/main/java/com/percussion/ant/gui/PSRxBuildInput.java index 94387ba381..9ff272c678 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/gui/PSRxBuildInput.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/gui/PSRxBuildInput.java @@ -34,7 +34,7 @@ import java.util.zip.ZipFile; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tools.ant.Project; diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSBackupFiles.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSBackupFiles.java index a551ac887b..2de2fdf3d8 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSBackupFiles.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSBackupFiles.java @@ -22,7 +22,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.BuildException; /** diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSCheckInstallLog.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSCheckInstallLog.java index 99c343435d..db17fb8a15 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSCheckInstallLog.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSCheckInstallLog.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.BuildException; /** diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSMakeLasagna.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSMakeLasagna.java index f6f22405f5..0383471cc4 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSMakeLasagna.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSMakeLasagna.java @@ -25,7 +25,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateDTSConfiguration.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateDTSConfiguration.java index 671457b20b..5e23c328a7 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateDTSConfiguration.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateDTSConfiguration.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.Project; /** diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateJettyConfigFromJBoss.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateJettyConfigFromJBoss.java index 893370d8c8..25021ee240 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateJettyConfigFromJBoss.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpdateJettyConfigFromJBoss.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; import org.apache.commons.exec.CommandLine; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tools.ant.BuildException; diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeRelationshipConfig.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeRelationshipConfig.java index aef5034541..de5bc5d154 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeRelationshipConfig.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeRelationshipConfig.java @@ -31,7 +31,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeServerPageTags.java b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeServerPageTags.java index 6edf182204..8b89aa8cc4 100644 --- a/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeServerPageTags.java +++ b/modules/perc-ant/src/main/java/com/percussion/ant/install/PSUpgradeServerPageTags.java @@ -27,7 +27,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/modules/perc-auditlog/pom.xml b/modules/perc-auditlog/pom.xml index 26ebf20bf7..99a96d7309 100644 --- a/modules/perc-auditlog/pom.xml +++ b/modules/perc-auditlog/pom.xml @@ -50,11 +50,6 @@ tika-core provided - - commons-lang - commons-lang - provided - com.percussion rxutils diff --git a/modules/perc-auditlog/src/main/java/com/percussion/auditlog/PSAuditLogService.java b/modules/perc-auditlog/src/main/java/com/percussion/auditlog/PSAuditLogService.java index 9e806ea942..ac3fd822bd 100644 --- a/modules/perc-auditlog/src/main/java/com/percussion/auditlog/PSAuditLogService.java +++ b/modules/perc-auditlog/src/main/java/com/percussion/auditlog/PSAuditLogService.java @@ -27,7 +27,7 @@ import com.percussion.utils.io.PathUtils; import java.io.File; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-distribution-tree/pom.xml b/modules/perc-distribution-tree/pom.xml index 5faa59d4ec..b6092c4819 100644 --- a/modules/perc-distribution-tree/pom.xml +++ b/modules/perc-distribution-tree/pom.xml @@ -61,11 +61,6 @@ spring-context ${spring.version} - - commons-lang - commons-lang - ${commons.lang.version} - org.springframework spring-core diff --git a/modules/perc-i18n/pom.xml b/modules/perc-i18n/pom.xml index 6e4b174f63..2b9fbb4b43 100644 --- a/modules/perc-i18n/pom.xml +++ b/modules/perc-i18n/pom.xml @@ -93,11 +93,6 @@ xml-apis compile - - commons-lang - commons-lang - compile - com.percussion tablefactory diff --git a/modules/perc-i18n/src/main/java/com/percussion/i18n/PSI18nUtils.java b/modules/perc-i18n/src/main/java/com/percussion/i18n/PSI18nUtils.java index 12b79be108..c30e553388 100644 --- a/modules/perc-i18n/src/main/java/com/percussion/i18n/PSI18nUtils.java +++ b/modules/perc-i18n/src/main/java/com/percussion/i18n/PSI18nUtils.java @@ -30,7 +30,7 @@ import java.util.Locale; import java.util.Set; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSCmsTablesSectionHandler.java b/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSCmsTablesSectionHandler.java index dd96649031..f4ae8a84ca 100644 --- a/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSCmsTablesSectionHandler.java +++ b/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSCmsTablesSectionHandler.java @@ -41,7 +41,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -154,7 +154,7 @@ public IPSTmxDocument process(Element cfgData) throws PSActionProcessingExceptio } catch (Exception e) // catch any exception { PSCommandLineProcessor.logMessage( - "processFailedError", e.getMessage() + " Stack: " + ExceptionUtils.getFullStackTrace(e)); + "processFailedError", e.getMessage() + " Stack: " + ExceptionUtils.getStackTrace(e)); throw new PSSectionProcessingException(e.getMessage(), e); } finally { endDotSession(); diff --git a/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSJspHandler.java b/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSJspHandler.java index 994d6564c2..cb243ddc43 100644 --- a/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSJspHandler.java +++ b/modules/perc-i18n/src/main/java/com/percussion/i18n/rxlt/PSJspHandler.java @@ -31,7 +31,7 @@ import java.util.Objects; import java.util.Set; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/modules/perc-taxonomy/pom.xml b/modules/perc-taxonomy/pom.xml index ecdbd83b0a..db162379e0 100644 --- a/modules/perc-taxonomy/pom.xml +++ b/modules/perc-taxonomy/pom.xml @@ -71,11 +71,6 @@ junit test - - commons-lang - commons-lang - provided - commons-logging commons-logging diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyJexl.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyJexl.java index 0af5748bf7..32acd3d863 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyJexl.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyJexl.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomySecurityHelper.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomySecurityHelper.java index 89580c8ee1..18a725f3b6 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomySecurityHelper.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomySecurityHelper.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.safety.Safelist; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyTextConverter.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyTextConverter.java index f1a8510a28..0b2640ff7c 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyTextConverter.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/TaxonomyTextConverter.java @@ -28,8 +28,8 @@ import java.util.Collection; import java.util.Vector; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Query; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/domain/Node.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/domain/Node.java index d500eb72e6..151954f2b8 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/domain/Node.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/domain/Node.java @@ -20,7 +20,7 @@ import java.sql.Timestamp; import java.util.Collection; import java.util.HashSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Taxonomy Node class to represent information about its taxons. */ public class Node implements Comparable { diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxNodeList.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxNodeList.java index 98a81c025c..a6a52bd549 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxNodeList.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxNodeList.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A List of TaxNode objects that provides methods for formatting the contained information. diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxValues.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxValues.java index d689004b36..2c6f427b5f 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxValues.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/jexl/TaxValues.java @@ -17,7 +17,7 @@ package com.percussion.taxonomy.jexl; import java.util.ArrayList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class TaxValues extends ArrayList { /** diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateNodeDAO.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateNodeDAO.java index f124d61e28..3df87c729b 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateNodeDAO.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateNodeDAO.java @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.CacheMode; import org.hibernate.HibernateException; import org.hibernate.Query; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateValueDAO.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateValueDAO.java index ae0c8f0a7d..8351bcde62 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateValueDAO.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/repository/HibernateValueDAO.java @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/service/TaxonomyService.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/service/TaxonomyService.java index 970562ffcf..b14de7f188 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/service/TaxonomyService.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/service/TaxonomyService.java @@ -16,7 +16,7 @@ */ package com.percussion.taxonomy.service; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.taxonomy.domain.Attribute; import com.percussion.taxonomy.domain.Node; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractControllerWithSecurityChecks.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractControllerWithSecurityChecks.java index 24865d98b4..01da1a773d 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractControllerWithSecurityChecks.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractControllerWithSecurityChecks.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; // TODO: Update this with annotations public class AbstractControllerWithSecurityChecks { diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractXMLProviderController.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractXMLProviderController.java index 6043c35da1..6891eedb10 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractXMLProviderController.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/AbstractXMLProviderController.java @@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.simpleframework.xml.core.Persister; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonEditorController.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonEditorController.java index 5b22ac0e60..d878190b11 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonEditorController.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonEditorController.java @@ -33,7 +33,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonomyController.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonomyController.java index 0a71a43a8e..b5c1429d5a 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonomyController.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/TaxonomyController.java @@ -16,7 +16,7 @@ */ package com.percussion.taxonomy.web; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.cms.objectstore.server.PSItemDefManager; @@ -45,7 +45,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Controller; diff --git a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/XMLProviderController.java b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/XMLProviderController.java index ed3bde45e4..9c91e08261 100644 --- a/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/XMLProviderController.java +++ b/modules/perc-taxonomy/src/main/java/com/percussion/taxonomy/web/XMLProviderController.java @@ -26,9 +26,9 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.text.StringEscapeUtils; import org.springframework.stereotype.Controller; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-thumbnail/pom.xml b/modules/perc-thumbnail/pom.xml index 56987008e8..68b8c98e85 100644 --- a/modules/perc-thumbnail/pom.xml +++ b/modules/perc-thumbnail/pom.xml @@ -130,11 +130,6 @@ commons-io compile - - commons-lang - commons-lang - compile - com.lmax disruptor diff --git a/modules/perc-thumbnail/src/main/java/com/percussion/thumbnail/PSScreenCapture.java b/modules/perc-thumbnail/src/main/java/com/percussion/thumbnail/PSScreenCapture.java index 036caf3ef8..4d55bc4bcd 100644 --- a/modules/perc-thumbnail/src/main/java/com/percussion/thumbnail/PSScreenCapture.java +++ b/modules/perc-thumbnail/src/main/java/com/percussion/thumbnail/PSScreenCapture.java @@ -26,7 +26,7 @@ import java.io.InputStream; import java.util.Properties; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/pom.xml b/modules/perc-toolkit/pom.xml index 3cd1704e35..7d95cd0745 100644 --- a/modules/perc-toolkit/pom.xml +++ b/modules/perc-toolkit/pom.xml @@ -137,11 +137,6 @@ commons-fileupload provided - - commons-lang - commons-lang - provided - org.jsoup jsoup diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/DefaultPageTemplateBean.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/DefaultPageTemplateBean.java index b5129b577c..25b17edfa2 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/DefaultPageTemplateBean.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/DefaultPageTemplateBean.java @@ -30,7 +30,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/LinkBuilderBean.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/LinkBuilderBean.java index 23001f61a4..01f4a6dd26 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/LinkBuilderBean.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/LinkBuilderBean.java @@ -22,7 +22,7 @@ import com.percussion.services.sitemgr.IPSPublishingContext; import com.percussion.services.sitemgr.IPSSite; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Link Builder service implementation as a Spring bean. diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/SiteEditionLookUpServiceImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/SiteEditionLookUpServiceImpl.java index c266437d68..2fbc1c0c68 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/SiteEditionLookUpServiceImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/service/impl/SiteEditionLookUpServiceImpl.java @@ -42,7 +42,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/servlet/DemandPreviewController.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/servlet/DemandPreviewController.java index 2f889e3b28..9cdf50be9a 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/servlet/DemandPreviewController.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/demandpreview/servlet/DemandPreviewController.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeoutException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/editiontasks/PSExampleEditionTask.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/editiontasks/PSExampleEditionTask.java index 5ef0ef0748..4d9b14ac34 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/editiontasks/PSExampleEditionTask.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/editiontasks/PSExampleEditionTask.java @@ -27,7 +27,7 @@ import java.io.File; import java.util.Date; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/effects/PSFolderOwnerSubfolderEffect.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/effects/PSFolderOwnerSubfolderEffect.java index bae3f1bf16..7418926dde 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/effects/PSFolderOwnerSubfolderEffect.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/effects/PSFolderOwnerSubfolderEffect.java @@ -34,7 +34,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Adds an item to a folder where its parent resides. Unlike the FolderFollowerEffect, the item is diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOReverseSlotContentFinder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOReverseSlotContentFinder.java index a62f31bdc7..967f715cea 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOReverseSlotContentFinder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOReverseSlotContentFinder.java @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Set; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOSQLContentFinder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOSQLContentFinder.java index 3680d34e8a..21d9b1958d 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOSQLContentFinder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSOSQLContentFinder.java @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Set; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSParameterizedLegacyAutoSlotContentFinder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSParameterizedLegacyAutoSlotContentFinder.java index c966a90d12..e0bfaf3fb5 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSParameterizedLegacyAutoSlotContentFinder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/finder/PSParameterizedLegacyAutoSlotContentFinder.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/fop/FopAssembler.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/fop/FopAssembler.java index 5c40f56be4..9783f0d83a 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/fop/FopAssembler.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/fop/FopAssembler.java @@ -46,7 +46,7 @@ import javax.xml.transform.sax.SAXResult; import javax.xml.transform.sax.SAXSource; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.fop.apps.*; import org.apache.fop.configuration.Configuration; import org.apache.fop.configuration.DefaultConfigurationBuilder; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/data/ImageMetaData.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/data/ImageMetaData.java index 9e017c2dd8..4d9970f6a5 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/data/ImageMetaData.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/data/ImageMetaData.java @@ -17,7 +17,7 @@ package com.percussion.pso.imageedit.data; import java.io.Serializable; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; public class ImageMetaData implements Serializable { diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/AbstractTemplateExpanderAdaptor.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/AbstractTemplateExpanderAdaptor.java index 28c1d11e16..779deb395e 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/AbstractTemplateExpanderAdaptor.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/AbstractTemplateExpanderAdaptor.java @@ -44,7 +44,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/ImageSizeTemplateExpander.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/ImageSizeTemplateExpander.java index 6a48ba45b7..62bf3203ea 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/ImageSizeTemplateExpander.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/ImageSizeTemplateExpander.java @@ -29,7 +29,7 @@ import java.util.Map; import javax.jcr.Node; import javax.jcr.NodeIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/cache/impl/ImageCacheManagerImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/cache/impl/ImageCacheManagerImpl.java index 95a9e1b48b..5ffd2c5c96 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/cache/impl/ImageCacheManagerImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/cache/impl/ImageCacheManagerImpl.java @@ -21,7 +21,7 @@ import com.percussion.pso.imageedit.services.cache.ImageCacheManager; import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/impl/ImageSizeDefinitionManagerImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/impl/ImageSizeDefinitionManagerImpl.java index 4533d3b6a3..a82130b6ad 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/impl/ImageSizeDefinitionManagerImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/impl/ImageSizeDefinitionManagerImpl.java @@ -20,7 +20,7 @@ import com.percussion.pso.imageedit.services.ImageSizeDefinitionManager; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/jexl/ImageEditorTools.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/jexl/ImageEditorTools.java index badeeeb3f7..f858f0b0c7 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/jexl/ImageEditorTools.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/services/jexl/ImageEditorTools.java @@ -34,7 +34,7 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/BinaryImageController.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/BinaryImageController.java index 6ed030a7c5..882e25b6de 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/BinaryImageController.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/BinaryImageController.java @@ -22,7 +22,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/ImageEditorWizard.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/ImageEditorWizard.java index 6dbed2c2f5..dad44df117 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/ImageEditorWizard.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/ImageEditorWizard.java @@ -40,8 +40,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.ui.ModelMap; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageEditorTestPageController.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageEditorTestPageController.java index 918c14c87d..06fcf5b097 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageEditorTestPageController.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageEditorTestPageController.java @@ -24,7 +24,7 @@ import com.percussion.util.IPSHtmlParameters; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageItemSupport.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageItemSupport.java index 88e66970d8..e0bc633ed1 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageItemSupport.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageItemSupport.java @@ -46,7 +46,7 @@ import java.util.Map; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImpl.java index 581c8cb09b..23b2e22148 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImpl.java @@ -34,8 +34,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageResizeManagerImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageResizeManagerImpl.java index e88f0c3270..1252973997 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageResizeManagerImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageResizeManagerImpl.java @@ -29,7 +29,7 @@ import javax.imageio.ImageWriteParam; import javax.imageio.ImageWriter; import javax.imageio.stream.MemoryCacheImageOutputStream; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageUrlBuilderImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageUrlBuilderImpl.java index d2851fe209..2e8ea47c42 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageUrlBuilderImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/imageedit/web/impl/ImageUrlBuilderImpl.java @@ -17,7 +17,7 @@ package com.percussion.pso.imageedit.web.impl; import com.percussion.pso.imageedit.web.ImageUrlBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOListTools.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOListTools.java index 9b5fc80781..891b052d38 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOListTools.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOListTools.java @@ -31,8 +31,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOQueryTools.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOQueryTools.java index 6aaa948c6f..f2f373086f 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOQueryTools.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOQueryTools.java @@ -35,7 +35,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSORelationshipTools.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSORelationshipTools.java index 3f5f6596eb..2dfb5078b5 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSORelationshipTools.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSORelationshipTools.java @@ -43,7 +43,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOSlotTools.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOSlotTools.java index db4d5939b6..a341742ade 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOSlotTools.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/jexl/PSOSlotTools.java @@ -38,8 +38,8 @@ import java.util.Map; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSONextNumberUDF.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSONextNumberUDF.java index d33145e19d..f4045b1d2c 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSONextNumberUDF.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSONextNumberUDF.java @@ -23,7 +23,7 @@ import com.percussion.fastforward.utils.PSUtils; import com.percussion.server.IPSRequestContext; import java.sql.SQLException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSOProxyQueryResource.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSOProxyQueryResource.java index 221960ca2d..70de4c23ec 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSOProxyQueryResource.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/legacy/PSOProxyQueryResource.java @@ -36,7 +36,7 @@ import java.util.Map.Entry; import javax.servlet.ServletException; import org.apache.commons.httpclient.HttpException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionPreviewController.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionPreviewController.java index 312b6cdc56..e496ce0c81 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionPreviewController.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionPreviewController.java @@ -32,7 +32,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionSiteForwardingController.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionSiteForwardingController.java index 2ace4e5798..79be8e8af5 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionSiteForwardingController.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActionSiteForwardingController.java @@ -34,7 +34,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActiveAssemblyUrlBuilder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActiveAssemblyUrlBuilder.java index 3a1edaf4cb..1d79043d7d 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActiveAssemblyUrlBuilder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/ActiveAssemblyUrlBuilder.java @@ -22,7 +22,7 @@ import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultiSiteResolutionController.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultiSiteResolutionController.java index 5429995a31..047ff7056d 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultiSiteResolutionController.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultiSiteResolutionController.java @@ -32,7 +32,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultipartResolverEncoding.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultipartResolverEncoding.java index 35c8ed5b7f..f6a8e9e950 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultipartResolverEncoding.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/MultipartResolverEncoding.java @@ -17,7 +17,7 @@ package com.percussion.pso.preview; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.multipart.MultipartResolver; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/PSOAction.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/PSOAction.java index d4c5701c01..d6a8b6f3e3 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/PSOAction.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/PSOAction.java @@ -19,7 +19,7 @@ import com.percussion.xml.PSXmlDocumentBuilder; import java.util.Iterator; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/SiteFolderFinderImpl.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/SiteFolderFinderImpl.java index 07f245fb7b..2a1232b7af 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/SiteFolderFinderImpl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/preview/SiteFolderFinderImpl.java @@ -31,7 +31,7 @@ import com.percussion.webservices.security.PSSecurityWsLocator; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSActiveAssemblyRelationshipBuilder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSActiveAssemblyRelationshipBuilder.java index 878b08f420..ccc5dbb95f 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSActiveAssemblyRelationshipBuilder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSActiveAssemblyRelationshipBuilder.java @@ -30,7 +30,7 @@ import com.percussion.services.assembly.PSAssemblyServiceLocator; import com.percussion.util.IPSHtmlParameters; import java.util.Collection; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSRelationshipHelperService.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSRelationshipHelperService.java index 9076514994..f4f1b1cc58 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSRelationshipHelperService.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/PSRelationshipHelperService.java @@ -61,7 +61,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/exit/PSExtensionHelper.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/exit/PSExtensionHelper.java index a30b8b7b6f..f1bfba5378 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/exit/PSExtensionHelper.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/relationshipbuilder/exit/PSExtensionHelper.java @@ -39,7 +39,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/tasks/TrashTask.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/tasks/TrashTask.java index 21c918feca..934cdf1886 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/tasks/TrashTask.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/tasks/TrashTask.java @@ -102,7 +102,7 @@ import java.util.Map.Entry; import java.util.Set; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOCopyParameter.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOCopyParameter.java index 8aadebb551..40536135d0 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOCopyParameter.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOCopyParameter.java @@ -27,7 +27,7 @@ import com.percussion.server.IPSRequestContext; import com.percussion.server.PSRequestValidationException; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSODateAdjust.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSODateAdjust.java index 51c3a42cdb..06aa44ece0 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSODateAdjust.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSODateAdjust.java @@ -28,7 +28,7 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOThumbnailGenerator.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOThumbnailGenerator.java index dbfefe95c0..bd68c4b5c8 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOThumbnailGenerator.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/transform/PSOThumbnailGenerator.java @@ -56,8 +56,8 @@ import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageOutputStream; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Node; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/AbstractTemplateExpander.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/AbstractTemplateExpander.java index c2b1591945..a6dc4974e1 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/AbstractTemplateExpander.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/AbstractTemplateExpander.java @@ -43,7 +43,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/MutableHttpServletRequestWrapper.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/MutableHttpServletRequestWrapper.java index b1d33bc819..be6596c8ae 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/MutableHttpServletRequestWrapper.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/MutableHttpServletRequestWrapper.java @@ -27,7 +27,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * An HttpServletRequestWrapper that allows modification of the request parameters and headers. This diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOExtensionParamsHelper.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOExtensionParamsHelper.java index ef7d80bc7b..3073a3f7b9 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOExtensionParamsHelper.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOExtensionParamsHelper.java @@ -16,7 +16,7 @@ */ package com.percussion.pso.utils; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import com.percussion.design.objectstore.IPSReplacementValue; import com.percussion.extension.IPSExtensionDef; @@ -28,7 +28,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.BooleanConverter; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOItemSummaryFinder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOItemSummaryFinder.java index ba3a2f33e0..cb08900881 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOItemSummaryFinder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PSOItemSummaryFinder.java @@ -28,7 +28,7 @@ import com.percussion.services.legacy.IPSCmsContentSummaries; import com.percussion.services.legacy.PSCmsContentSummariesLocator; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PathCleanupUtils.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PathCleanupUtils.java index bcb80bbee7..14a616de3a 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PathCleanupUtils.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/PathCleanupUtils.java @@ -17,7 +17,7 @@ package com.percussion.pso.utils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PathCleanupUtils { diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/RxItemUtils.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/RxItemUtils.java index 0684e9bce3..90b5cb8b1c 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/RxItemUtils.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/utils/RxItemUtils.java @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.List; import javax.activation.DataSource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOAbstractItemValidationExit.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOAbstractItemValidationExit.java index 4443d58545..78816ac6e3 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOAbstractItemValidationExit.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOAbstractItemValidationExit.java @@ -33,7 +33,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSODateRangeFieldValidator.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSODateRangeFieldValidator.java index 711080e51e..c9362594da 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSODateRangeFieldValidator.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSODateRangeFieldValidator.java @@ -27,8 +27,8 @@ import java.io.File; import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOFileUploadValidation.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOFileUploadValidation.java index 9579ad79dd..f7af4e40ba 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOFileUploadValidation.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOFileUploadValidation.java @@ -24,7 +24,7 @@ import com.percussion.extension.PSExtensionException; import com.percussion.server.IPSRequestContext; import com.percussion.util.PSPurgableTempFile; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOItemXMLSupport.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOItemXMLSupport.java index fa9bc3f342..8d6f6dffca 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOItemXMLSupport.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOItemXMLSupport.java @@ -19,7 +19,7 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSORequiredFieldsItemValidation.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSORequiredFieldsItemValidation.java index f47e8b20d1..07c09edbbb 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSORequiredFieldsItemValidation.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSORequiredFieldsItemValidation.java @@ -21,8 +21,8 @@ import com.percussion.util.IPSHtmlParameters; import com.percussion.util.PSItemErrorDoc; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOUniqueFieldWithInFoldersValidator.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOUniqueFieldWithInFoldersValidator.java index daf3d66bb0..73d1bd390e 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOUniqueFieldWithInFoldersValidator.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/validation/PSOUniqueFieldWithInFoldersValidator.java @@ -51,7 +51,7 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOPublishContent.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOPublishContent.java index e863e655cc..86bb4b96c1 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOPublishContent.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOPublishContent.java @@ -28,7 +28,7 @@ import com.percussion.extension.PSExtensionProcessingException; import com.percussion.server.IPSRequestContext; import com.percussion.util.IPSHtmlParameters; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOSwitchCommunityWorkflowAction.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOSwitchCommunityWorkflowAction.java index 94c5bb4384..91f5edfb81 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOSwitchCommunityWorkflowAction.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOSwitchCommunityWorkflowAction.java @@ -56,7 +56,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWFActionService.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWFActionService.java index 7ab424ef0f..c0d75eb63a 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWFActionService.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWFActionService.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWorkflowInfoFinder.java b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWorkflowInfoFinder.java index 1225de67f3..6257f0a5e6 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWorkflowInfoFinder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/pso/workflow/PSOWorkflowInfoFinder.java @@ -33,7 +33,7 @@ import com.percussion.webservices.system.PSSystemWsLocator; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/soln/jcr/NodeUtils.java b/modules/perc-toolkit/src/main/java/com/percussion/soln/jcr/NodeUtils.java index bed38e5610..e9323594e0 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/soln/jcr/NodeUtils.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/soln/jcr/NodeUtils.java @@ -17,8 +17,8 @@ package com.percussion.soln.jcr; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.contentmgr.IPSNodeDefinition; import java.beans.PropertyDescriptor; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/JCRQueryBuilder.java b/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/JCRQueryBuilder.java index fb6f5755ac..8169ad635c 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/JCRQueryBuilder.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/JCRQueryBuilder.java @@ -20,10 +20,10 @@ import static java.text.MessageFormat.format; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.join; -import static org.apache.commons.lang.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.removeEnd; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/ListBuilderJexl.java b/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/ListBuilderJexl.java index 8677c44daa..d30812d091 100644 --- a/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/ListBuilderJexl.java +++ b/modules/perc-toolkit/src/main/java/com/percussion/soln/listbuilder/ListBuilderJexl.java @@ -18,10 +18,10 @@ package com.percussion.soln.listbuilder; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.extension.*; import com.percussion.services.assembly.IPSAssemblyItem; diff --git a/modules/perc-toolkit/src/test/java/test/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImplTest.java b/modules/perc-toolkit/src/test/java/test/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImplTest.java index cf2d482123..ff1525c293 100644 --- a/modules/perc-toolkit/src/test/java/test/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImplTest.java +++ b/modules/perc-toolkit/src/test/java/test/percussion/pso/imageedit/web/impl/ImagePersistenceManagerImplTest.java @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jmock.Expectations; diff --git a/modules/redirect-tool/pom.xml b/modules/redirect-tool/pom.xml index 49873f8820..2d407355c9 100644 --- a/modules/redirect-tool/pom.xml +++ b/modules/redirect-tool/pom.xml @@ -130,10 +130,5 @@ 5.7.1 compile - - commons-lang - commons-lang - test - \ No newline at end of file diff --git a/modules/segmentation-api/src/main/java/com/percussion/soln/segment/Segment.java b/modules/segmentation-api/src/main/java/com/percussion/soln/segment/Segment.java index 7377cdaa7d..8b5f4d8b95 100644 --- a/modules/segmentation-api/src/main/java/com/percussion/soln/segment/Segment.java +++ b/modules/segmentation-api/src/main/java/com/percussion/soln/segment/Segment.java @@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.StandardToStringStyle; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.StandardToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; @XmlRootElement(name = "Segment") diff --git a/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSExtensionHelper.java b/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSExtensionHelper.java index 0b9300f55d..54aa5b0721 100644 --- a/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSExtensionHelper.java +++ b/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSExtensionHelper.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSOExtensionParamsHelper.java b/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSOExtensionParamsHelper.java index e23d615a35..bbd23363de 100644 --- a/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSOExtensionParamsHelper.java +++ b/modules/segmentation-rx/src/main/java/com/percussion/soln/relationshipbuilder/exit/PSOExtensionParamsHelper.java @@ -17,7 +17,7 @@ package com.percussion.soln.relationshipbuilder.exit; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import java.util.HashMap; import java.util.Iterator; @@ -26,7 +26,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.BooleanConverter; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/modules/segmentation-rx/src/main/java/com/percussion/soln/segment/rx/RxSegmentService.java b/modules/segmentation-rx/src/main/java/com/percussion/soln/segment/rx/RxSegmentService.java index 5e92cec879..56b7e890b8 100644 --- a/modules/segmentation-rx/src/main/java/com/percussion/soln/segment/rx/RxSegmentService.java +++ b/modules/segmentation-rx/src/main/java/com/percussion/soln/segment/rx/RxSegmentService.java @@ -28,7 +28,7 @@ import javax.jws.WebService; import javax.ws.rs.Path; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSInputValidatorFilter.java b/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSInputValidatorFilter.java index 6d44b31d18..12ad6c0b4b 100644 --- a/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSInputValidatorFilter.java +++ b/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSInputValidatorFilter.java @@ -15,8 +15,8 @@ */ package com.percussion.utils.servlet; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import java.io.IOException; diff --git a/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSServletUtils.java b/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSServletUtils.java index 924fc339b0..037b9544f4 100644 --- a/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSServletUtils.java +++ b/modules/servletutils/src/main/java/com/percussion/utils/servlet/PSServletUtils.java @@ -24,7 +24,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.mock.web.MockHttpServletResponse; /** diff --git a/modules/utils/pom.xml b/modules/utils/pom.xml index 79b55d643c..b8af9d5b04 100644 --- a/modules/utils/pom.xml +++ b/modules/utils/pom.xml @@ -59,10 +59,6 @@ commons-io commons-io - - commons-lang - commons-lang - org.apache.commons commons-lang3 diff --git a/modules/utils/src/main/java/com/percussion/error/PSException.java b/modules/utils/src/main/java/com/percussion/error/PSException.java index b201ceabf2..5eb846d9f4 100644 --- a/modules/utils/src/main/java/com/percussion/error/PSException.java +++ b/modules/utils/src/main/java/com/percussion/error/PSException.java @@ -18,7 +18,7 @@ package com.percussion.error; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The PSException class is the base class for all internal exceptions. It contains the basic diff --git a/modules/utils/src/main/java/com/percussion/error/PSSqlException.java b/modules/utils/src/main/java/com/percussion/error/PSSqlException.java index 1fc8c728c7..a3de9cc29c 100644 --- a/modules/utils/src/main/java/com/percussion/error/PSSqlException.java +++ b/modules/utils/src/main/java/com/percussion/error/PSSqlException.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Locale; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The PSSqlException class extends the JDBC SQLException class, additionally implementing our diff --git a/modules/utils/src/main/java/com/percussion/html/PSHtmlUtils.java b/modules/utils/src/main/java/com/percussion/html/PSHtmlUtils.java index c91867296d..36a4389d8d 100644 --- a/modules/utils/src/main/java/com/percussion/html/PSHtmlUtils.java +++ b/modules/utils/src/main/java/com/percussion/html/PSHtmlUtils.java @@ -25,7 +25,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.Jsoup; diff --git a/modules/utils/src/main/java/com/percussion/install/InstallUtil.java b/modules/utils/src/main/java/com/percussion/install/InstallUtil.java index 9beb969620..5afdc1b178 100644 --- a/modules/utils/src/main/java/com/percussion/install/InstallUtil.java +++ b/modules/utils/src/main/java/com/percussion/install/InstallUtil.java @@ -63,7 +63,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.io.IOCase; import org.apache.commons.io.filefilter.PrefixFileFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/utils/src/main/java/com/percussion/services/catalog/PSTypeEnum.java b/modules/utils/src/main/java/com/percussion/services/catalog/PSTypeEnum.java index 4f1c6e9683..4682dec875 100644 --- a/modules/utils/src/main/java/com/percussion/services/catalog/PSTypeEnum.java +++ b/modules/utils/src/main/java/com/percussion/services/catalog/PSTypeEnum.java @@ -16,7 +16,7 @@ */ package com.percussion.services.catalog; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This enum lists all types in the system that participate in cataloging. The ordinal value of diff --git a/modules/utils/src/main/java/com/percussion/services/guidmgr/data/PSGuid.java b/modules/utils/src/main/java/com/percussion/services/guidmgr/data/PSGuid.java index 59a1e2b342..5be7628200 100644 --- a/modules/utils/src/main/java/com/percussion/services/guidmgr/data/PSGuid.java +++ b/modules/utils/src/main/java/com/percussion/services/guidmgr/data/PSGuid.java @@ -18,8 +18,8 @@ import com.percussion.services.catalog.PSTypeEnum; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * This class encapsulates guids and converts them to and from user readable and machine formats. diff --git a/modules/utils/src/main/java/com/percussion/services/utils/xml/PSXmlSerializationHelper.java b/modules/utils/src/main/java/com/percussion/services/utils/xml/PSXmlSerializationHelper.java index 047e56ed2a..abe39b1c5a 100644 --- a/modules/utils/src/main/java/com/percussion/services/utils/xml/PSXmlSerializationHelper.java +++ b/modules/utils/src/main/java/com/percussion/services/utils/xml/PSXmlSerializationHelper.java @@ -52,7 +52,7 @@ import org.apache.commons.betwixt.strategy.NameMapper; import org.apache.commons.betwixt.strategy.PropertySuppressionStrategy; import org.apache.commons.betwixt.strategy.TypeBindingStrategy; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/utils/src/main/java/com/percussion/util/FunctionalUtils.java b/modules/utils/src/main/java/com/percussion/util/FunctionalUtils.java index 649e970548..d8f249bf1f 100644 --- a/modules/utils/src/main/java/com/percussion/util/FunctionalUtils.java +++ b/modules/utils/src/main/java/com/percussion/util/FunctionalUtils.java @@ -20,7 +20,7 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Stream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class FunctionalUtils { diff --git a/modules/utils/src/main/java/com/percussion/util/PSBaseHttpUtils.java b/modules/utils/src/main/java/com/percussion/util/PSBaseHttpUtils.java index f9fd9d789e..aceae1ecf4 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSBaseHttpUtils.java +++ b/modules/utils/src/main/java/com/percussion/util/PSBaseHttpUtils.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSBaseHttpUtils { diff --git a/modules/utils/src/main/java/com/percussion/util/PSDataTypeConverter.java b/modules/utils/src/main/java/com/percussion/util/PSDataTypeConverter.java index f8e0f0dbab..a293414e09 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSDataTypeConverter.java +++ b/modules/utils/src/main/java/com/percussion/util/PSDataTypeConverter.java @@ -26,7 +26,7 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.stream.IntStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; /** This class provides utility methods for converting between different java datatypes. */ diff --git a/modules/utils/src/main/java/com/percussion/util/PSHttpConnection.java b/modules/utils/src/main/java/com/percussion/util/PSHttpConnection.java index b9145880dc..ba77231f21 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSHttpConnection.java +++ b/modules/utils/src/main/java/com/percussion/util/PSHttpConnection.java @@ -33,7 +33,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONException; diff --git a/modules/utils/src/main/java/com/percussion/util/PSPathUtil.java b/modules/utils/src/main/java/com/percussion/util/PSPathUtil.java index 4527127ded..766b403233 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSPathUtil.java +++ b/modules/utils/src/main/java/com/percussion/util/PSPathUtil.java @@ -16,7 +16,7 @@ */ package com.percussion.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Utilities for working with paths */ public class PSPathUtil { diff --git a/modules/utils/src/main/java/com/percussion/util/PSSqlHelper.java b/modules/utils/src/main/java/com/percussion/util/PSSqlHelper.java index 5bcf71e46b..6b192db4ee 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSSqlHelper.java +++ b/modules/utils/src/main/java/com/percussion/util/PSSqlHelper.java @@ -47,7 +47,7 @@ import java.util.ArrayList; import java.util.Properties; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/utils/src/main/java/com/percussion/util/PSStringTemplate.java b/modules/utils/src/main/java/com/percussion/util/PSStringTemplate.java index 063381afb4..8c4d914134 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSStringTemplate.java +++ b/modules/utils/src/main/java/com/percussion/util/PSStringTemplate.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author DougRand diff --git a/modules/utils/src/main/java/com/percussion/util/PSXMLDomUtil.java b/modules/utils/src/main/java/com/percussion/util/PSXMLDomUtil.java index 02b7bf4fb7..bcc401aabb 100644 --- a/modules/utils/src/main/java/com/percussion/util/PSXMLDomUtil.java +++ b/modules/utils/src/main/java/com/percussion/util/PSXMLDomUtil.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyAccessException.java b/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyAccessException.java index 2f9f32860c..1b7e183fe6 100644 --- a/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyAccessException.java +++ b/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyAccessException.java @@ -16,7 +16,7 @@ */ package com.percussion.utils.beans; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This exception represents an error with a property access. As it is not an expected error, it diff --git a/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyWrapper.java b/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyWrapper.java index 05731c6c43..ca9f518abf 100644 --- a/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyWrapper.java +++ b/modules/utils/src/main/java/com/percussion/utils/beans/PSPropertyWrapper.java @@ -23,8 +23,8 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Provides a simple wrapper that allows access to an object "property" by referencing the java get diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSJettyConnectors.java b/modules/utils/src/main/java/com/percussion/utils/container/PSJettyConnectors.java index 374f5aae71..f576e42c62 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSJettyConnectors.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSJettyConnectors.java @@ -31,7 +31,7 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; public class PSJettyConnectors extends PSAbstractConnectors { diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSJndiDatasourceImpl.java b/modules/utils/src/main/java/com/percussion/utils/container/PSJndiDatasourceImpl.java index 3ba92b071c..363e9dc1ab 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSJndiDatasourceImpl.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSJndiDatasourceImpl.java @@ -18,7 +18,7 @@ package com.percussion.utils.container; import com.percussion.utils.string.PSStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSJndiDatasourceImpl implements IPSJndiDatasource { diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSMissingApplicationPolicyException.java b/modules/utils/src/main/java/com/percussion/utils/container/PSMissingApplicationPolicyException.java index 1a8a99f875..9e62e6a5f1 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSMissingApplicationPolicyException.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSMissingApplicationPolicyException.java @@ -18,7 +18,7 @@ import com.percussion.utils.container.jboss.IPSJBossErrors; import com.percussion.utils.exceptions.PSBaseException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Indicates a specified application policy is not found. */ public class PSMissingApplicationPolicyException extends PSBaseException { diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSPortInfo.java b/modules/utils/src/main/java/com/percussion/utils/container/PSPortInfo.java index 21438ecffa..6300384c58 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSPortInfo.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSPortInfo.java @@ -16,7 +16,7 @@ */ package com.percussion.utils.container; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Defines the configuration of single named port. */ public class PSPortInfo { diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSSecureCredentials.java b/modules/utils/src/main/java/com/percussion/utils/container/PSSecureCredentials.java index fc6c9d1345..d6ecc10e40 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSSecureCredentials.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSSecureCredentials.java @@ -24,7 +24,7 @@ import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSServicePortAttrDef.java b/modules/utils/src/main/java/com/percussion/utils/container/PSServicePortAttrDef.java index 421b631a44..63e7fbbfce 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSServicePortAttrDef.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSServicePortAttrDef.java @@ -16,7 +16,7 @@ */ package com.percussion.utils.container; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Defines the mbean name and attribute to use to access a port value in a JBoss service config diff --git a/modules/utils/src/main/java/com/percussion/utils/container/PSStaticContainerUtils.java b/modules/utils/src/main/java/com/percussion/utils/container/PSStaticContainerUtils.java index 392531555a..ee2e143d1e 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/PSStaticContainerUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/PSStaticContainerUtils.java @@ -31,7 +31,7 @@ import java.util.Properties; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/utils/src/main/java/com/percussion/utils/container/adapters/JBossDatasourceConfigurationAdapter.java b/modules/utils/src/main/java/com/percussion/utils/container/adapters/JBossDatasourceConfigurationAdapter.java index 896c850aee..3b37e9fa15 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/adapters/JBossDatasourceConfigurationAdapter.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/adapters/JBossDatasourceConfigurationAdapter.java @@ -46,7 +46,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/utils/src/main/java/com/percussion/utils/container/adapters/JettyDatasourceConfigurationAdapter.java b/modules/utils/src/main/java/com/percussion/utils/container/adapters/JettyDatasourceConfigurationAdapter.java index 79ca760ffa..8aed5b293c 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/adapters/JettyDatasourceConfigurationAdapter.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/adapters/JettyDatasourceConfigurationAdapter.java @@ -60,8 +60,8 @@ import java.util.stream.Collectors; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/utils/src/main/java/com/percussion/utils/container/jboss/PSJBossJndiDatasource.java b/modules/utils/src/main/java/com/percussion/utils/container/jboss/PSJBossJndiDatasource.java index 5e47dd1db5..00a078355b 100644 --- a/modules/utils/src/main/java/com/percussion/utils/container/jboss/PSJBossJndiDatasource.java +++ b/modules/utils/src/main/java/com/percussion/utils/container/jboss/PSJBossJndiDatasource.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Objects; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/utils/src/main/java/com/percussion/utils/io/PathUtils.java b/modules/utils/src/main/java/com/percussion/utils/io/PathUtils.java index ab638aef27..01c5afd5e7 100644 --- a/modules/utils/src/main/java/com/percussion/utils/io/PathUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/io/PathUtils.java @@ -25,7 +25,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSConnectionDetail.java b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSConnectionDetail.java index 141310ef52..8d350a3122 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSConnectionDetail.java +++ b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSConnectionDetail.java @@ -18,7 +18,7 @@ import java.text.MessageFormat; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Provides specific details about a connection's properties */ public class PSConnectionDetail { diff --git a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceConfig.java b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceConfig.java index dee91782c0..d45e3a962a 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceConfig.java +++ b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceConfig.java @@ -20,7 +20,7 @@ import com.percussion.utils.spring.PSSpringBeanUtils; import com.percussion.utils.xml.PSInvalidXmlException; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceResolver.java b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceResolver.java index aa3ca95c65..19d0d16293 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceResolver.java +++ b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDatasourceResolver.java @@ -28,7 +28,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDriverHelper.java b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDriverHelper.java index 162c66b42b..1b55ba456b 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDriverHelper.java +++ b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSDriverHelper.java @@ -22,7 +22,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.sql.Driver; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** This class provides utilities for loading jdbc drivers. */ public class PSDriverHelper { diff --git a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSJdbcUtils.java b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSJdbcUtils.java index c03563acc4..d1956f082b 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jdbc/PSJdbcUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/jdbc/PSJdbcUtils.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Utility class for JDBC operations */ public class PSJdbcUtils { diff --git a/modules/utils/src/main/java/com/percussion/utils/jexl/PSJexlEvaluator.java b/modules/utils/src/main/java/com/percussion/utils/jexl/PSJexlEvaluator.java index 773d25ad79..80faa3bc44 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jexl/PSJexlEvaluator.java +++ b/modules/utils/src/main/java/com/percussion/utils/jexl/PSJexlEvaluator.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.jexl3.JexlException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/utils/src/main/java/com/percussion/utils/jndi/PSNamingContextHelper.java b/modules/utils/src/main/java/com/percussion/utils/jndi/PSNamingContextHelper.java index 8f3c833888..131f2385a0 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jndi/PSNamingContextHelper.java +++ b/modules/utils/src/main/java/com/percussion/utils/jndi/PSNamingContextHelper.java @@ -21,7 +21,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Takes a set of property values and binds them into the jndi context to allow later lookups to diff --git a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSBaseValue.java b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSBaseValue.java index 0078f450e4..7eb0682dea 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSBaseValue.java +++ b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSBaseValue.java @@ -18,8 +18,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Base implementation class for JCR values diff --git a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSMultiProperty.java b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSMultiProperty.java index e29e7243f0..9868bb6b64 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSMultiProperty.java +++ b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSMultiProperty.java @@ -39,10 +39,10 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.version.VersionException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Represents JSR-170 properties that can contain a set of values diff --git a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSNamePatternFilter.java b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSNamePatternFilter.java index 413e8faefb..cd2bc59c8d 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSNamePatternFilter.java +++ b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSNamePatternFilter.java @@ -20,7 +20,7 @@ import javax.jcr.Item; import javax.jcr.RepositoryException; import org.apache.commons.collections4.Predicate; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A name pattern filter handles objects that fulfill the Item interface or uses the diff --git a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPath.java b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPath.java index 80deee950b..3d76e3033c 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPath.java +++ b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPath.java @@ -16,8 +16,8 @@ */ package com.percussion.utils.jsr170; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Represents an absolute or relative JSR-170 path. A path is made up of path elements. Each element diff --git a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPropertyDefinition.java b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPropertyDefinition.java index af9892ca46..d956f59822 100644 --- a/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPropertyDefinition.java +++ b/modules/utils/src/main/java/com/percussion/utils/jsr170/PSPropertyDefinition.java @@ -20,7 +20,7 @@ import javax.jcr.Value; import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.PropertyDefinition; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Basic property definition implementation, not all fields implemented diff --git a/modules/utils/src/main/java/com/percussion/utils/request/PSRequestInfoBase.java b/modules/utils/src/main/java/com/percussion/utils/request/PSRequestInfoBase.java index db24d2a49f..0f58063abf 100644 --- a/modules/utils/src/main/java/com/percussion/utils/request/PSRequestInfoBase.java +++ b/modules/utils/src/main/java/com/percussion/utils/request/PSRequestInfoBase.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class stores a variety of per request information. This is initialized in a servlet at the diff --git a/modules/utils/src/main/java/com/percussion/utils/security/PSRemoteUserCallback.java b/modules/utils/src/main/java/com/percussion/utils/security/PSRemoteUserCallback.java index df222bac73..e406eb1e21 100644 --- a/modules/utils/src/main/java/com/percussion/utils/security/PSRemoteUserCallback.java +++ b/modules/utils/src/main/java/com/percussion/utils/security/PSRemoteUserCallback.java @@ -17,7 +17,7 @@ package com.percussion.utils.security; import javax.security.auth.callback.Callback; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Used to get the remote user name of an already authenticated user. */ public class PSRemoteUserCallback implements Callback { diff --git a/modules/utils/src/main/java/com/percussion/utils/security/PSSecurityUtility.java b/modules/utils/src/main/java/com/percussion/utils/security/PSSecurityUtility.java index 2c215ff058..2562c328e8 100644 --- a/modules/utils/src/main/java/com/percussion/utils/security/PSSecurityUtility.java +++ b/modules/utils/src/main/java/com/percussion/utils/security/PSSecurityUtility.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.security.SecureRandom; import java.util.Properties; -import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringBeanUtils.java b/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringBeanUtils.java index ffd2eafd1c..b1ecd77a36 100644 --- a/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringBeanUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringBeanUtils.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringConfiguration.java b/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringConfiguration.java index 99d00b32df..f10d2edb97 100644 --- a/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringConfiguration.java +++ b/modules/utils/src/main/java/com/percussion/utils/spring/PSSpringConfiguration.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/utils/src/main/java/com/percussion/utils/string/PSFolderStringUtils.java b/modules/utils/src/main/java/com/percussion/utils/string/PSFolderStringUtils.java index 7f9ece9a19..775e8beb01 100644 --- a/modules/utils/src/main/java/com/percussion/utils/string/PSFolderStringUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/string/PSFolderStringUtils.java @@ -18,7 +18,7 @@ import com.percussion.utils.jsr170.PSPath; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Methods to manipulate strings that express folder paths diff --git a/modules/utils/src/main/java/com/percussion/utils/string/PSPatternMatch.java b/modules/utils/src/main/java/com/percussion/utils/string/PSPatternMatch.java index dcf63dd396..058e696125 100644 --- a/modules/utils/src/main/java/com/percussion/utils/string/PSPatternMatch.java +++ b/modules/utils/src/main/java/com/percussion/utils/string/PSPatternMatch.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This is used to determine if a string matches a SQL like pattern, "%abc%". diff --git a/modules/utils/src/main/java/com/percussion/utils/string/PSStringUtils.java b/modules/utils/src/main/java/com/percussion/utils/string/PSStringUtils.java index 31b6b224dd..b897f024f4 100644 --- a/modules/utils/src/main/java/com/percussion/utils/string/PSStringUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/string/PSStringUtils.java @@ -16,7 +16,7 @@ */ package com.percussion.utils.string; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.utils.jsr170.PSPath; import java.awt.*; @@ -24,8 +24,8 @@ import java.awt.geom.Rectangle2D; import java.nio.charset.Charset; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; /** * Useful string utilities diff --git a/modules/utils/src/main/java/com/percussion/utils/string/PSXmlPIUtils.java b/modules/utils/src/main/java/com/percussion/utils/string/PSXmlPIUtils.java index b9462fc261..62982d1eba 100644 --- a/modules/utils/src/main/java/com/percussion/utils/string/PSXmlPIUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/string/PSXmlPIUtils.java @@ -19,7 +19,7 @@ import com.percussion.utils.types.PSPair; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/modules/utils/src/main/java/com/percussion/utils/tomcat/PSTomcatConnector.java b/modules/utils/src/main/java/com/percussion/utils/tomcat/PSTomcatConnector.java index a49d7e88d2..8a5d57b99e 100644 --- a/modules/utils/src/main/java/com/percussion/utils/tomcat/PSTomcatConnector.java +++ b/modules/utils/src/main/java/com/percussion/utils/tomcat/PSTomcatConnector.java @@ -32,8 +32,8 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/modules/utils/src/main/java/com/percussion/utils/tools/PSParseFragments.java b/modules/utils/src/main/java/com/percussion/utils/tools/PSParseFragments.java index f4185ed5cb..dadf397dc5 100644 --- a/modules/utils/src/main/java/com/percussion/utils/tools/PSParseFragments.java +++ b/modules/utils/src/main/java/com/percussion/utils/tools/PSParseFragments.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A utility class used to parse a string that contains multiple fragments. Each fragment is diff --git a/modules/utils/src/main/java/com/percussion/utils/types/PSPair.java b/modules/utils/src/main/java/com/percussion/utils/types/PSPair.java index 5c8ff2c700..8a7f71399e 100644 --- a/modules/utils/src/main/java/com/percussion/utils/types/PSPair.java +++ b/modules/utils/src/main/java/com/percussion/utils/types/PSPair.java @@ -16,10 +16,10 @@ */ package com.percussion.utils.types; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * This class holds a generic pair of objects diff --git a/modules/utils/src/main/java/com/percussion/utils/xml/PSEntityResolver.java b/modules/utils/src/main/java/com/percussion/utils/xml/PSEntityResolver.java index 99c1065bf5..9a8a4edd92 100644 --- a/modules/utils/src/main/java/com/percussion/utils/xml/PSEntityResolver.java +++ b/modules/utils/src/main/java/com/percussion/utils/xml/PSEntityResolver.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xml.sax.EntityResolver; diff --git a/modules/utils/src/main/java/com/percussion/utils/xml/PSSaxHelper.java b/modules/utils/src/main/java/com/percussion/utils/xml/PSSaxHelper.java index 3b344449a1..9c562a7444 100644 --- a/modules/utils/src/main/java/com/percussion/utils/xml/PSSaxHelper.java +++ b/modules/utils/src/main/java/com/percussion/utils/xml/PSSaxHelper.java @@ -34,7 +34,7 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.BOMInputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/modules/utils/src/main/java/com/percussion/utils/xml/PSXmlUtils.java b/modules/utils/src/main/java/com/percussion/utils/xml/PSXmlUtils.java index 8bfca90d40..fdf6fe6a2d 100644 --- a/modules/utils/src/main/java/com/percussion/utils/xml/PSXmlUtils.java +++ b/modules/utils/src/main/java/com/percussion/utils/xml/PSXmlUtils.java @@ -23,7 +23,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; diff --git a/modules/utils/src/main/java/com/percussion/xml/PSXmlDocumentBuilder.java b/modules/utils/src/main/java/com/percussion/xml/PSXmlDocumentBuilder.java index 7537ffe452..d46638db7c 100644 --- a/modules/utils/src/main/java/com/percussion/xml/PSXmlDocumentBuilder.java +++ b/modules/utils/src/main/java/com/percussion/xml/PSXmlDocumentBuilder.java @@ -49,7 +49,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.DOMException; diff --git a/modules/utils/src/test/java/com/percussion/utils/beans/PSPropertyWrapperTest.java b/modules/utils/src/test/java/com/percussion/utils/beans/PSPropertyWrapperTest.java index 13bbda3bb1..bc39b5404a 100644 --- a/modules/utils/src/test/java/com/percussion/utils/beans/PSPropertyWrapperTest.java +++ b/modules/utils/src/test/java/com/percussion/utils/beans/PSPropertyWrapperTest.java @@ -17,7 +17,7 @@ package com.percussion.utils.beans; import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Unit test for the property wrapper class. Uses a static class to create objects to test with. diff --git a/modules/utils/src/test/java/com/percussion/utils/tools/PSBaseXmlConfigTest.java b/modules/utils/src/test/java/com/percussion/utils/tools/PSBaseXmlConfigTest.java index bc77fa8cd2..e6af1bff7a 100644 --- a/modules/utils/src/test/java/com/percussion/utils/tools/PSBaseXmlConfigTest.java +++ b/modules/utils/src/test/java/com/percussion/utils/tools/PSBaseXmlConfigTest.java @@ -34,8 +34,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/modules/utils/src/test/java/com/percussion/utils/tools/PSTestUtils.java b/modules/utils/src/test/java/com/percussion/utils/tools/PSTestUtils.java index cdf20b5e02..b3d3acae0d 100644 --- a/modules/utils/src/test/java/com/percussion/utils/tools/PSTestUtils.java +++ b/modules/utils/src/test/java/com/percussion/utils/tools/PSTestUtils.java @@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Class of unit test utility functions. */ public class PSTestUtils { diff --git a/modules/utils/src/test/java/com/percussion/xml/PSXmlValidatorTest.java b/modules/utils/src/test/java/com/percussion/xml/PSXmlValidatorTest.java index 06880db491..6a1f1121cd 100644 --- a/modules/utils/src/test/java/com/percussion/xml/PSXmlValidatorTest.java +++ b/modules/utils/src/test/java/com/percussion/xml/PSXmlValidatorTest.java @@ -24,7 +24,7 @@ import java.io.FileWriter; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/pom.xml b/pom.xml index b18b8cf184..9f2b4711e7 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,6 @@ 1.28.0 1.6.0 2.21.0 - 2.6 3.20.0 3.6.1 1.3 @@ -587,12 +586,8 @@ - - - commons-lang - commons-lang - ${commons.lang.version} - + org.apache.commons commons-lang3 diff --git a/projects/sitemanage/pom.xml b/projects/sitemanage/pom.xml index caff0159b0..b7be57bcc2 100644 --- a/projects/sitemanage/pom.xml +++ b/projects/sitemanage/pom.xml @@ -347,11 +347,6 @@ javax.ws.rs-api compile - - commons-lang - commons-lang - compile - saxon saxon diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/data/PSContentActivity.java b/projects/sitemanage/src/main/java/com/percussion/activity/data/PSContentActivity.java index b145fe35c9..6ecf8ee50a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/data/PSContentActivity.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/data/PSContentActivity.java @@ -18,7 +18,7 @@ package com.percussion.activity.data; import com.fasterxml.jackson.annotation.JsonRootName; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This object holds the activity details of the items under named site or site folder or type of diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/data/PSEffectiveness.java b/projects/sitemanage/src/main/java/com/percussion/activity/data/PSEffectiveness.java index bbf7482759..11fbff1cd5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/data/PSEffectiveness.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/data/PSEffectiveness.java @@ -17,7 +17,7 @@ package com.percussion.activity.data; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.fasterxml.jackson.annotation.JsonRootName; import net.sf.oval.constraint.NotEmpty; diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/data/PSTrafficDetailsRequest.java b/projects/sitemanage/src/main/java/com/percussion/activity/data/PSTrafficDetailsRequest.java index 98acad8fd4..c0b48a9051 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/data/PSTrafficDetailsRequest.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/data/PSTrafficDetailsRequest.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonRootName; import com.percussion.analytics.service.IPSAnalyticsProviderQueryService; import java.io.Serializable; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** A request object used for getting the traffic details data from the rest service. */ @JsonRootName(value = "TrafficDetailsRequest") diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSActivityService.java b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSActivityService.java index 572f7e5c6c..5bbfd65292 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSActivityService.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSActivityService.java @@ -23,8 +23,8 @@ import static com.percussion.itemmanagement.service.impl.PSWorkflowHelper.WF_TAKE_DOWN_TRANSITION; import static com.percussion.pagemanagement.service.IPSPageService.PAGE_CONTENT_TYPE; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.activity.data.PSActivityNode; import com.percussion.activity.data.PSContentActivity; @@ -68,8 +68,8 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.time.StopWatch; import org.apache.commons.lang3.time.FastDateFormat; +import org.apache.commons.lang3.time.StopWatch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSContentActivityService.java b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSContentActivityService.java index 0f41cd3c76..5f60c07acf 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSContentActivityService.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSContentActivityService.java @@ -58,9 +58,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.lang3.time.StopWatch; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessDataHandler.java b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessDataHandler.java index 9accd11123..22420ef037 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessDataHandler.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessDataHandler.java @@ -16,7 +16,7 @@ */ package com.percussion.activity.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.activity.data.PSContentActivity; import com.percussion.activity.data.PSEffectiveness; diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessService.java b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessService.java index dd0607c4ec..46488dc9cb 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessService.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSEffectivenessService.java @@ -16,7 +16,7 @@ */ package com.percussion.activity.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.activity.data.PSContentActivity; import com.percussion.activity.data.PSEffectiveness; diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficDataHandler.java b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficDataHandler.java index 19b3a96701..60a43f8594 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficDataHandler.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficDataHandler.java @@ -16,7 +16,7 @@ */ package com.percussion.activity.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.activity.data.*; import com.percussion.activity.service.IPSTrafficService; @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This handler which provides sample effectiveness data from an xml file. diff --git a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficService.java b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficService.java index d84300e272..743388a12d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficService.java +++ b/projects/sitemanage/src/main/java/com/percussion/activity/service/impl/PSTrafficService.java @@ -52,7 +52,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/analytics/data/PSAnalyticsProviderConfig.java b/projects/sitemanage/src/main/java/com/percussion/analytics/data/PSAnalyticsProviderConfig.java index 520019f95a..819307ecc6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/analytics/data/PSAnalyticsProviderConfig.java +++ b/projects/sitemanage/src/main/java/com/percussion/analytics/data/PSAnalyticsProviderConfig.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Simple data class to represent the analytics provider config diff --git a/projects/sitemanage/src/main/java/com/percussion/analytics/data/impl/PSAnalyticsQueryResult.java b/projects/sitemanage/src/main/java/com/percussion/analytics/data/impl/PSAnalyticsQueryResult.java index c0ba31b036..1f45b2a14a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/analytics/data/impl/PSAnalyticsQueryResult.java +++ b/projects/sitemanage/src/main/java/com/percussion/analytics/data/impl/PSAnalyticsQueryResult.java @@ -22,7 +22,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author erikserating */ public class PSAnalyticsQueryResult implements IPSAnalyticsQueryResult { diff --git a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderRestService.java b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderRestService.java index b0e1548556..b0a92ee5bf 100644 --- a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderRestService.java @@ -36,7 +36,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; import org.apache.logging.log4j.LogManager; diff --git a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderService.java b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderService.java index d0c43fc568..493405e37a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderService.java +++ b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/PSAnalyticsProviderService.java @@ -37,7 +37,7 @@ import com.percussion.util.PSSiteManageBean; import com.percussion.utils.io.PathUtils; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderHelper.java b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderHelper.java index 679ae7c076..89ba4eb359 100644 --- a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderHelper.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderQueryHandler.java b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderQueryHandler.java index 67436b4b09..e8d7427ac2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderQueryHandler.java +++ b/projects/sitemanage/src/main/java/com/percussion/analytics/service/impl/google/PSGoogleAnalyticsProviderQueryHandler.java @@ -16,8 +16,8 @@ */ package com.percussion.analytics.service.impl.google; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.google.analytics.data.v1beta.BetaAnalyticsDataClient; import com.google.analytics.data.v1beta.DateRange; @@ -44,7 +44,7 @@ import com.percussion.utils.date.PSDateRange; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/AclAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/AclAdaptor.java index a7c9e951d6..c47f008060 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/AclAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/AclAdaptor.java @@ -33,7 +33,7 @@ import com.percussion.util.PSSiteManageBean; import java.util.List; import javax.ws.rs.NotFoundException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/AssetAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/AssetAdaptor.java index edc4d00634..a872618975 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/AssetAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/AssetAdaptor.java @@ -17,7 +17,7 @@ package com.percussion.apibridge; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -97,9 +97,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.NullArgumentException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -185,7 +184,7 @@ public Collection getSharedAssets(URI baseURI, String path, String type) // Type OR Path must be specified, error if both are blank. if (StringUtils.isBlank(path) && StringUtils.isBlank(type)) { - throw new NullArgumentException(StringUtils.isBlank(path) ? "path" : "type"); + throw new NullPointerException(StringUtils.isBlank(path) ? "path" : "type"); } try { path = URLDecoder.decode(path, "UTF-8"); diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/ContextAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/ContextAdaptor.java index a51ebaba23..6c26c61856 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/ContextAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/ContextAdaptor.java @@ -32,7 +32,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @PSSiteManageBean public class ContextAdaptor implements IContextsAdaptor { diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/DeliveryTypeAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/DeliveryTypeAdaptor.java index a3ae8be5ba..0f640de193 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/DeliveryTypeAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/DeliveryTypeAdaptor.java @@ -34,7 +34,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @PSSiteManageBean public class DeliveryTypeAdaptor implements IDeliveryTypeAdaptor { diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/FolderAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/FolderAdaptor.java index f03596c5ad..3cfab6f1e8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/FolderAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/FolderAdaptor.java @@ -19,8 +19,8 @@ import static com.percussion.webservices.PSWebserviceUtils.getItemSummary; import static com.percussion.webservices.PSWebserviceUtils.isItemCheckedOutToUser; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.PSCloningOptions; @@ -100,7 +100,7 @@ import java.util.List; import javax.ws.rs.NotFoundException; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/PageAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/PageAdaptor.java index 985a625244..d3490ca6e4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/PageAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/PageAdaptor.java @@ -109,7 +109,7 @@ import java.util.Map.Entry; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/UrlParts.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/UrlParts.java index 646392c3f7..db26c8a5fc 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/UrlParts.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/UrlParts.java @@ -17,7 +17,7 @@ package com.percussion.apibridge; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; class UrlParts { String site = ""; diff --git a/projects/sitemanage/src/main/java/com/percussion/apibridge/UserAdaptor.java b/projects/sitemanage/src/main/java/com/percussion/apibridge/UserAdaptor.java index e1f79af59e..04f7979ea4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/apibridge/UserAdaptor.java +++ b/projects/sitemanage/src/main/java/com/percussion/apibridge/UserAdaptor.java @@ -57,7 +57,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetDao.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetDao.java index a39f7f84c9..6b7da66181 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetDao.java @@ -16,8 +16,8 @@ */ package com.percussion.assetmanagement.dao.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; import com.percussion.assetmanagement.dao.IPSAssetDao; import com.percussion.assetmanagement.data.PSAsset; @@ -44,7 +44,7 @@ import javax.jcr.RepositoryException; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetRenameItemInputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetRenameItemInputTransformer.java index 0f7e6e86c2..1ede77e14d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetRenameItemInputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/dao/impl/PSAssetRenameItemInputTransformer.java @@ -20,10 +20,10 @@ import static java.text.MessageFormat.format; import static org.apache.commons.collections.MapUtils.getInteger; import static org.apache.commons.collections.MapUtils.getString; -import static org.apache.commons.lang.StringUtils.endsWith; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.endsWith; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.cms.PSCmsException; import com.percussion.extension.IPSExtensionDef; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAbstractAssetRequest.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAbstractAssetRequest.java index 56861551dd..f4dd8bcf78 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAbstractAssetRequest.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAbstractAssetRequest.java @@ -17,7 +17,7 @@ package com.percussion.assetmanagement.data; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Base class for all service requests to create assets during bulk upload. */ public abstract class PSAbstractAssetRequest { diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAssetWidgetRelationship.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAssetWidgetRelationship.java index 06e45ec718..12600e0f32 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAssetWidgetRelationship.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSAssetWidgetRelationship.java @@ -16,7 +16,7 @@ */ package com.percussion.assetmanagement.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.data.PSAbstractDataObject; import javax.xml.bind.annotation.XmlRootElement; @@ -25,7 +25,7 @@ import net.sf.oval.constraint.NotEmpty; import net.sf.oval.constraint.NotNegative; import net.sf.oval.constraint.NotNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Defines a relationship between a page or template, widget, and asset. diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSExtractedAssetRequest.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSExtractedAssetRequest.java index 170c2c4d6b..28b3e59447 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSExtractedAssetRequest.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSExtractedAssetRequest.java @@ -17,7 +17,7 @@ package com.percussion.assetmanagement.data; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Used to request the creation of an asset whose content is extracted from an uploaded file. */ public class PSExtractedAssetRequest extends PSAbstractAssetRequest { diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSUnusedAssetSummary.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSUnusedAssetSummary.java index 9ca0eafc02..7bf69a14a3 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSUnusedAssetSummary.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/data/PSUnusedAssetSummary.java @@ -16,7 +16,7 @@ */ package com.percussion.assetmanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.fasterxml.jackson.annotation.JsonRootName; import com.percussion.share.data.IPSItemSummary; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/data/PSFormSummary.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/data/PSFormSummary.java index ba92994231..e5fb8d5f6b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/data/PSFormSummary.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/data/PSFormSummary.java @@ -16,8 +16,8 @@ */ package com.percussion.assetmanagement.forms.data; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.fasterxml.jackson.annotation.JsonRootName; import com.percussion.itemmanagement.data.IPSEditableItem; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoiner.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoiner.java index 33181358b0..afe2bc59f1 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoiner.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoiner.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.supercsv.io.CsvMapReader; import org.supercsv.io.CsvMapWriter; import org.supercsv.io.ICsvMapReader; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataService.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataService.java index fda28feac6..1c87814e54 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataService.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataService.java @@ -19,7 +19,7 @@ import static com.percussion.share.service.exception.PSParameterValidationUtils.rejectIfBlank; import static com.percussion.share.web.service.PSRestServicePathConstants.FIND_ALL_PATH; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.forms.data.PSFormSummary; import com.percussion.assetmanagement.forms.data.PSFormSummaryList; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetNewFolderPathResolver.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetNewFolderPathResolver.java index e3d6c7b9f3..9cb22ec78d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetNewFolderPathResolver.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetNewFolderPathResolver.java @@ -16,8 +16,8 @@ */ package com.percussion.assetmanagement.service.impl; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.service.impl.PSAssetNewFolderPathResolver.PSResolvedFolderPath.PSResolvedFolderPathType; import com.percussion.pagemanagement.data.PSPageSummary; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetRestService.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetRestService.java index 34c57462a0..c0c8249b17 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetRestService.java @@ -19,10 +19,10 @@ import static com.percussion.assetmanagement.service.impl.PSPreviewPageUtils.getOrphanedAssetsSummaries; import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.activity.service.IPSActivityService; import com.percussion.assetmanagement.data.PSAsset; @@ -104,7 +104,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetService.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetService.java index d966b37601..4ed07363a7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetService.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetService.java @@ -20,15 +20,15 @@ import static com.percussion.share.service.exception.PSParameterValidationUtils.rejectIfNull; import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.isNotEmpty; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.StringUtils.substringAfterLast; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.StringUtils.substringAfterLast; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.dao.IPSAssetDao; import com.percussion.assetmanagement.data.PSAbstractAssetRequest; @@ -139,7 +139,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadFolderPathMap.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadFolderPathMap.java index 3a3e79fd22..c5f2d772a7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadFolderPathMap.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadFolderPathMap.java @@ -16,8 +16,8 @@ */ package com.percussion.assetmanagement.service.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAssetSummary; import com.percussion.assetmanagement.service.IPSAssetService; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadServlet.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadServlet.java index 5e27140b56..770bf51c68 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadServlet.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSAssetUploadServlet.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONException; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSPreviewPageUtils.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSPreviewPageUtils.java index 34cbf5061c..56795a36f6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSPreviewPageUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSPreviewPageUtils.java @@ -20,7 +20,7 @@ import static com.percussion.pagemanagement.assembler.PSWidgetContentFinderUtils.getMatchRelationship; import static com.percussion.pagemanagement.data.PSRegionTreeUtils.getEmptyWidgetRegions; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSOrphanedAssetSummary; import com.percussion.design.objectstore.PSRelationship; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSTextToImageServlet.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSTextToImageServlet.java index 5e66b7ca18..4ec6f1e0b8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSTextToImageServlet.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSTextToImageServlet.java @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipDao.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipDao.java index 0b306ce0a8..0d2123439f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipDao.java @@ -18,7 +18,7 @@ package com.percussion.assetmanagement.service.impl; import static com.percussion.util.PSSqlHelper.qualifyTableName; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import com.percussion.cms.IPSConstants; import com.percussion.error.PSExceptionUtils; diff --git a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipService.java b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipService.java index a1c8dedb90..30b07fe471 100644 --- a/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipService.java +++ b/projects/sitemanage/src/main/java/com/percussion/assetmanagement/service/impl/PSWidgetAssetRelationshipService.java @@ -24,10 +24,10 @@ import static com.percussion.webservices.PSWebserviceUtils.getItemSummary; import static java.util.Arrays.asList; import static org.apache.commons.collections.CollectionUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.split; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.split; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.dao.IPSAssetDao; import com.percussion.assetmanagement.data.PSAsset; @@ -85,7 +85,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/category/data/PSCategoryLockInfo.java b/projects/sitemanage/src/main/java/com/percussion/category/data/PSCategoryLockInfo.java index f7d16194e7..8fa76f8931 100644 --- a/projects/sitemanage/src/main/java/com/percussion/category/data/PSCategoryLockInfo.java +++ b/projects/sitemanage/src/main/java/com/percussion/category/data/PSCategoryLockInfo.java @@ -27,7 +27,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONException; diff --git a/projects/sitemanage/src/main/java/com/percussion/category/extension/PSCategoryPostExit.java b/projects/sitemanage/src/main/java/com/percussion/category/extension/PSCategoryPostExit.java index 90f4638830..d1af093111 100644 --- a/projects/sitemanage/src/main/java/com/percussion/category/extension/PSCategoryPostExit.java +++ b/projects/sitemanage/src/main/java/com/percussion/category/extension/PSCategoryPostExit.java @@ -30,7 +30,7 @@ import java.io.File; import java.io.IOException; import java.io.StringReader; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/projects/sitemanage/src/main/java/com/percussion/category/marshaller/PSCategoryUnMarshaller.java b/projects/sitemanage/src/main/java/com/percussion/category/marshaller/PSCategoryUnMarshaller.java index 08494e5726..033e564f1d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/category/marshaller/PSCategoryUnMarshaller.java +++ b/projects/sitemanage/src/main/java/com/percussion/category/marshaller/PSCategoryUnMarshaller.java @@ -35,7 +35,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.context.annotation.Lazy; diff --git a/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryService.java b/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryService.java index 35e4196deb..ff5eec101f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryService.java +++ b/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryService.java @@ -53,7 +53,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONException; diff --git a/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryServiceUtil.java b/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryServiceUtil.java index 7e605c6720..c4231b8c69 100644 --- a/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryServiceUtil.java +++ b/projects/sitemanage/src/main/java/com/percussion/category/service/impl/PSCategoryServiceUtil.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONArray; diff --git a/projects/sitemanage/src/main/java/com/percussion/cloudservice/impl/PSCloudService.java b/projects/sitemanage/src/main/java/com/percussion/cloudservice/impl/PSCloudService.java index d04e34e4aa..4dcf355cd4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/cloudservice/impl/PSCloudService.java +++ b/projects/sitemanage/src/main/java/com/percussion/cloudservice/impl/PSCloudService.java @@ -44,7 +44,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/comments/service/impl/PSCommentsService.java b/projects/sitemanage/src/main/java/com/percussion/comments/service/impl/PSCommentsService.java index 1196e1cb47..d5e42184ee 100644 --- a/projects/sitemanage/src/main/java/com/percussion/comments/service/impl/PSCommentsService.java +++ b/projects/sitemanage/src/main/java/com/percussion/comments/service/impl/PSCommentsService.java @@ -16,9 +16,9 @@ */ package com.percussion.comments.service.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.comments.data.PSComment; import com.percussion.comments.data.PSCommentIds; @@ -66,8 +66,8 @@ import net.sf.json.JSONNull; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSBaseMatchingMigrationRule.java b/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSBaseMatchingMigrationRule.java index d18ab84109..3dbf41ba6b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSBaseMatchingMigrationRule.java +++ b/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSBaseMatchingMigrationRule.java @@ -21,8 +21,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSClassNameMatcher.java b/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSClassNameMatcher.java index 23777a42f0..dd026880f5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSClassNameMatcher.java +++ b/projects/sitemanage/src/main/java/com/percussion/contentmigration/rules/PSClassNameMatcher.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.jsoup.nodes.Element; /** diff --git a/projects/sitemanage/src/main/java/com/percussion/contentmigration/service/impl/PSContentMigrationService.java b/projects/sitemanage/src/main/java/com/percussion/contentmigration/service/impl/PSContentMigrationService.java index f9b703fc94..4831de5ad3 100644 --- a/projects/sitemanage/src/main/java/com/percussion/contentmigration/service/impl/PSContentMigrationService.java +++ b/projects/sitemanage/src/main/java/com/percussion/contentmigration/service/impl/PSContentMigrationService.java @@ -49,8 +49,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.Jsoup; diff --git a/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSFileSystemService.java b/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSFileSystemService.java index 19cbda9eeb..038d3499da 100644 --- a/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSFileSystemService.java +++ b/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSFileSystemService.java @@ -44,8 +44,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; /** * An {@link IPSFileSystemService} implementation to handle file system operations, specially under diff --git a/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSWebResourcesRestService.java b/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSWebResourcesRestService.java index 67d79991fa..5c8dd78fe1 100644 --- a/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSWebResourcesRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/designmanagement/service/impl/PSWebResourcesRestService.java @@ -44,7 +44,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody; import org.apache.logging.log4j.LogManager; diff --git a/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoQueue.java b/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoQueue.java index 237fa36e63..614081355b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoQueue.java +++ b/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoQueue.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONArray; diff --git a/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoService.java b/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoService.java index aa5b3c34a4..b807f2a683 100644 --- a/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoService.java +++ b/projects/sitemanage/src/main/java/com/percussion/feeds/service/impl/PSFeedsInfoService.java @@ -16,7 +16,7 @@ */ package com.percussion.feeds.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.PSRelationshipFilter; diff --git a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/data/PSFolderItem.java b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/data/PSFolderItem.java index 2bad2c63b5..24d619502b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/data/PSFolderItem.java +++ b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/data/PSFolderItem.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Object that will be serialized for the workflow tab. Used to list the sites and asset folders diff --git a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderRestService.java b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderRestService.java index 3502478391..52d83b0928 100644 --- a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderRestService.java @@ -42,7 +42,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderService.java b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderService.java index d52ba85dc2..1eddb86675 100644 --- a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderService.java +++ b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSFolderService.java @@ -56,8 +56,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSGetAssignedFoldersJob.java b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSGetAssignedFoldersJob.java index ea6cb0fe05..bb79f56c0b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSGetAssignedFoldersJob.java +++ b/projects/sitemanage/src/main/java/com/percussion/foldermanagement/service/impl/PSGetAssignedFoldersJob.java @@ -21,7 +21,7 @@ import com.percussion.foldermanagement.service.IPSFolderService; import com.percussion.share.async.impl.PSAsyncJob; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/integrations/ems/rest/PSEmsRestService.java b/projects/sitemanage/src/main/java/com/percussion/integrations/ems/rest/PSEmsRestService.java index 2bdf2fe59f..06b49a97d7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/integrations/ems/rest/PSEmsRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/integrations/ems/rest/PSEmsRestService.java @@ -17,7 +17,7 @@ package com.percussion.integrations.ems.rest; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.fasterxml.jackson.databind.ObjectMapper; import com.percussion.delivery.client.PSDeliveryClient; diff --git a/projects/sitemanage/src/main/java/com/percussion/integrations/siteimprove/task/impl/PSSiteimproveEditionTask.java b/projects/sitemanage/src/main/java/com/percussion/integrations/siteimprove/task/impl/PSSiteimproveEditionTask.java index 97a8f92129..dc8b0ccbc1 100644 --- a/projects/sitemanage/src/main/java/com/percussion/integrations/siteimprove/task/impl/PSSiteimproveEditionTask.java +++ b/projects/sitemanage/src/main/java/com/percussion/integrations/siteimprove/task/impl/PSSiteimproveEditionTask.java @@ -48,7 +48,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTask.java b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTask.java index 794eab7c40..757a690557 100644 --- a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTask.java +++ b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTask.java @@ -32,8 +32,8 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; diff --git a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTaskProperty.java b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTaskProperty.java index e10f744900..967e0ff9bc 100644 --- a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTaskProperty.java +++ b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/data/PSIntegrityTaskProperty.java @@ -22,9 +22,9 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/impl/PSIntegrityCheckerService.java b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/impl/PSIntegrityCheckerService.java index 429699de54..8ee188e537 100644 --- a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/impl/PSIntegrityCheckerService.java +++ b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/impl/PSIntegrityCheckerService.java @@ -17,7 +17,7 @@ package com.percussion.integritymanagement.service.impl; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import com.percussion.assetmanagement.data.PSAbstractAssetRequest; import com.percussion.assetmanagement.data.PSAbstractAssetRequest.AssetType; diff --git a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/rest/impl/PSIntegrityCheckerRestService.java b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/rest/impl/PSIntegrityCheckerRestService.java index f52f8ff2c3..e5a8805f56 100644 --- a/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/rest/impl/PSIntegrityCheckerRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/integritymanagement/service/rest/impl/PSIntegrityCheckerRestService.java @@ -34,7 +34,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/PSLivePublishChangeHandler.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/PSLivePublishChangeHandler.java index d1f37bfbe3..db60638d8e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/PSLivePublishChangeHandler.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/PSLivePublishChangeHandler.java @@ -55,7 +55,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemDates.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemDates.java index c71e3f8e17..f167f57249 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemDates.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemDates.java @@ -16,8 +16,8 @@ */ package com.percussion.itemmanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.data.PSAbstractDataObject; import javax.xml.bind.annotation.XmlRootElement; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemUserInfo.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemUserInfo.java index e52e0efd37..8969988754 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemUserInfo.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSItemUserInfo.java @@ -16,8 +16,8 @@ */ package com.percussion.itemmanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.data.PSAbstractDataObject; import javax.xml.bind.annotation.XmlRootElement; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSRevision.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSRevision.java index 98bde69100..c5aea9e66a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSRevision.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/data/PSRevision.java @@ -17,7 +17,7 @@ package com.percussion.itemmanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.fasterxml.jackson.annotation.JsonRootName; import com.percussion.share.data.PSAbstractDataObject; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/extension/PSGenerateReadOnlyLink.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/extension/PSGenerateReadOnlyLink.java index 19883597fd..be62765100 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/extension/PSGenerateReadOnlyLink.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/extension/PSGenerateReadOnlyLink.java @@ -43,7 +43,7 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSAbstractWorkflowExtension.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSAbstractWorkflowExtension.java index 4cd26edc29..fe6e6c3a46 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSAbstractWorkflowExtension.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSAbstractWorkflowExtension.java @@ -19,8 +19,8 @@ import static java.text.MessageFormat.format; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; import com.percussion.cms.objectstore.PSComponentSummary; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemService.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemService.java index bff4093ba3..80de89114d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemService.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemService.java @@ -130,9 +130,9 @@ import javax.ws.rs.core.MediaType; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemWorkflowService.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemWorkflowService.java index 4fbf164d40..daf1d646af 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemWorkflowService.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemWorkflowService.java @@ -25,9 +25,9 @@ import static com.percussion.webservices.PSWebserviceUtils.isItemCheckedOutToUser; import static com.percussion.webservices.PSWebserviceUtils.transitionItem; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.dao.IPSAssetDao; import com.percussion.assetmanagement.data.PSAsset; @@ -106,7 +106,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSWorkflowHelper.java b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSWorkflowHelper.java index f4746413b5..2ea3df66fc 100644 --- a/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSWorkflowHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSWorkflowHelper.java @@ -33,8 +33,8 @@ import static com.percussion.webservices.PSWebserviceUtils.transitionItem; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableCollection; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.cms.objectstore.PSComponentSummary; import com.percussion.cms.objectstore.PSFolder; diff --git a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseNetSuiteMethod.java b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseNetSuiteMethod.java index a61869da59..08a661f223 100644 --- a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseNetSuiteMethod.java +++ b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseNetSuiteMethod.java @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import net.sf.json.JSONObject; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) @XmlType( diff --git a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseStatus.java b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseStatus.java index c4b3a83d85..fae7cb60a1 100644 --- a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseStatus.java +++ b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSLicenseStatus.java @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) @XmlType( diff --git a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSModuleLicenses.java b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSModuleLicenses.java index 0ba5ba2951..cb861659ce 100644 --- a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSModuleLicenses.java +++ b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/data/PSModuleLicenses.java @@ -17,7 +17,7 @@ package com.percussion.licensemanagement.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import java.util.ArrayList; import java.util.Iterator; diff --git a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/service/impl/PSLicenseService.java b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/service/impl/PSLicenseService.java index c1b7342284..6f84cef814 100644 --- a/projects/sitemanage/src/main/java/com/percussion/licensemanagement/service/impl/PSLicenseService.java +++ b/projects/sitemanage/src/main/java/com/percussion/licensemanagement/service/impl/PSLicenseService.java @@ -17,7 +17,7 @@ package com.percussion.licensemanagement.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.fasterxml.jackson.databind.ObjectMapper; import com.percussion.delivery.service.IPSDeliveryInfoService; @@ -45,7 +45,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathInputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathInputTransformer.java index fe8e4116f7..ed2b3cc797 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathInputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathInputTransformer.java @@ -29,7 +29,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A field input transformer to process/update an item path. Expects an item path as an input, calls diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathOutputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathOutputTransformer.java index 6b4cd31404..9a7ae208b2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathOutputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathOutputTransformer.java @@ -29,7 +29,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Field output transformer to update the managed item paths on edit. This is a thin wrapper, calls diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathPreProcessor.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathPreProcessor.java index 66a2f9de27..36cbf1d4d6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathPreProcessor.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedItemPathPreProcessor.java @@ -29,7 +29,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author JaySeletz */ public class PSManagedItemPathPreProcessor extends PSDefaultExtension diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathInputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathInputTransformer.java index 370a712b80..8e7d65d3b5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathInputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathInputTransformer.java @@ -30,7 +30,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONArray; diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathOutputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathOutputTransformer.java index 40415974e6..f3b5d4c5ab 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathOutputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedJSONPayloadPathOutputTransformer.java @@ -28,7 +28,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONArray; diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkInputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkInputTransformer.java index bdb7d1011a..c829153500 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkInputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkInputTransformer.java @@ -29,7 +29,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A item input transformer to process/update any html links in the specified content. This is a diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkOutputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkOutputTransformer.java index 58225d35e0..fd74d69fbb 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkOutputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkOutputTransformer.java @@ -28,7 +28,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Field output transformer to update the managed links on edit. This is a thin wrapper, calls the diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkService.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkService.java index 29fae79ae2..f386cc589c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkService.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinkService.java @@ -17,8 +17,8 @@ package com.percussion.linkmanagement.service.impl; import static com.percussion.share.dao.PSFolderPathUtils.concatPath; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSSingleValueBuilder; import com.percussion.cms.objectstore.PSComponentSummary; @@ -71,9 +71,9 @@ import javax.jcr.PathNotFoundException; import javax.jcr.Property; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONArray; diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksConverter.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksConverter.java index 506f7c23f9..f37a0321e4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksConverter.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksConverter.java @@ -33,7 +33,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.Jsoup; diff --git a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksPostProcessor.java b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksPostProcessor.java index 3d1ade43eb..1b6e6ca99f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksPostProcessor.java +++ b/projects/sitemanage/src/main/java/com/percussion/linkmanagement/service/impl/PSManagedLinksPostProcessor.java @@ -30,7 +30,7 @@ import com.percussion.share.spring.PSSpringWebApplicationContextUtils; import com.percussion.util.IPSHtmlParameters; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManager.java b/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManager.java index 930375d18f..d8c650327e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManager.java +++ b/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManagerRestService.java b/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManagerRestService.java index 6763422be0..322e4973bd 100644 --- a/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManagerRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/maintenance/service/impl/PSMaintenanceManagerRestService.java @@ -26,7 +26,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/projects/sitemanage/src/main/java/com/percussion/membership/data/PSAccountSummary.java b/projects/sitemanage/src/main/java/com/percussion/membership/data/PSAccountSummary.java index da2df9b3b9..3601a1884d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/membership/data/PSAccountSummary.java +++ b/projects/sitemanage/src/main/java/com/percussion/membership/data/PSAccountSummary.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Object to change the state about of an account. diff --git a/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserGroup.java b/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserGroup.java index 8d4fc21474..77b97a78c0 100644 --- a/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserGroup.java +++ b/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserGroup.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; @XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement(name = "UserGroup") diff --git a/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserSummary.java b/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserSummary.java index 0de8bcb7a2..c430283436 100644 --- a/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserSummary.java +++ b/projects/sitemanage/src/main/java/com/percussion/membership/data/PSUserSummary.java @@ -23,7 +23,7 @@ import com.percussion.share.service.IPSDataService.DataServiceLoadException; import java.text.ParseException; import java.util.Date; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Object to hold summary data about a registered user. diff --git a/projects/sitemanage/src/main/java/com/percussion/packagemanagement/PSStartupPkgInstaller.java b/projects/sitemanage/src/main/java/com/percussion/packagemanagement/PSStartupPkgInstaller.java index c8a9712d5a..fb1c110bef 100644 --- a/projects/sitemanage/src/main/java/com/percussion/packagemanagement/PSStartupPkgInstaller.java +++ b/projects/sitemanage/src/main/java/com/percussion/packagemanagement/PSStartupPkgInstaller.java @@ -45,7 +45,7 @@ import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSAbstractMergedRegionTree.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSAbstractMergedRegionTree.java index 9d02de508c..7397c7d2fe 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSAbstractMergedRegionTree.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSAbstractMergedRegionTree.java @@ -21,8 +21,8 @@ import static com.percussion.pagemanagement.assembler.PSMergedRegion.PSMergedRegionOwner.TEMPLATE; import static com.percussion.pagemanagement.data.PSRegionTreeUtils.getChildRegions; import static java.text.MessageFormat.format; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.assembler.PSMergedRegion.PSMergedRegionOwner; import com.percussion.pagemanagement.data.PSAbstractRegion; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegion.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegion.java index e00fba244f..9799dc0f9b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegion.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegion.java @@ -21,7 +21,7 @@ import com.percussion.pagemanagement.data.PSRegionBranches; import com.percussion.pagemanagement.data.PSRegionTree; import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * A node on the merged region tree region that has been merged with {@link PSRegionTree} and {@link diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegionTree.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegionTree.java index 7aeba49475..22aae5e10d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegionTree.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMergedRegionTree.java @@ -19,8 +19,8 @@ import static com.percussion.pagemanagement.assembler.PSMergedRegion.PSMergedRegionOwner.PAGE; import static com.percussion.pagemanagement.assembler.PSMergedRegion.PSMergedRegionOwner.TEMPLATE; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.assembler.PSMergedRegion.PSMergedRegionOwner; import com.percussion.pagemanagement.data.PSAbstractRegion; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMetadataProperty.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMetadataProperty.java index 5f7e0a9b9c..f706443690 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMetadataProperty.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSMetadataProperty.java @@ -28,7 +28,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author davidpardini */ public class PSMetadataProperty { diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContext.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContext.java index 1dce98f002..3b41378906 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContext.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContext.java @@ -16,9 +16,9 @@ */ package com.percussion.pagemanagement.assembler; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.isNumeric; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNumeric; +import static org.apache.commons.lang3.Validate.notNull; import java.util.ArrayList; import java.util.List; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContextFactory.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContextFactory.java index 5e926c8f31..950fa92303 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContextFactory.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageAssemblyContextFactory.java @@ -16,9 +16,9 @@ */ package com.percussion.pagemanagement.assembler; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.assembler.PSAbstractAssemblyContext.EditType; @@ -60,7 +60,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageUtils.java index 3273de8a50..646dc77948 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageUtils.java @@ -20,12 +20,12 @@ import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.injectDependencies; import static java.text.MessageFormat.format; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.analytics.service.IPSAnalyticsProviderService; import com.percussion.category.data.PSCategory; @@ -152,8 +152,8 @@ import net.sf.json.JSONSerializer; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.commons.text.StringEscapeUtils; import org.jdom2.Document; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageVariateAssembler.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageVariateAssembler.java index 7b7ebdb300..030217c50c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageVariateAssembler.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSPageVariateAssembler.java @@ -17,7 +17,7 @@ package com.percussion.pagemanagement.assembler; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import com.percussion.pagemanagement.assembler.impl.PSAssemblyItemBridge.TemplateAndPage; import com.percussion.services.assembly.IPSAssemblyItem; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSResourceLinkAndLocationUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSResourceLinkAndLocationUtils.java index f3e3c7f66f..77a14c96f7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSResourceLinkAndLocationUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSResourceLinkAndLocationUtils.java @@ -16,14 +16,14 @@ */ package com.percussion.pagemanagement.assembler; -import static org.apache.commons.lang.StringUtils.containsAny; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.containsAny; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.PSRenderLink; import com.percussion.pagemanagement.data.PSRenderLinkContext.Mode; @@ -43,7 +43,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetContentFinderUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetContentFinderUtils.java index 13e9380b74..34a9a85221 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetContentFinderUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetContentFinderUtils.java @@ -18,10 +18,10 @@ package com.percussion.pagemanagement.assembler; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.server.PSRelationshipProcessor; @@ -45,7 +45,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetInstance.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetInstance.java index e3f0d62e30..62f9a8565d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetInstance.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/PSWidgetInstance.java @@ -21,7 +21,7 @@ import com.percussion.utils.types.PSPair; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a fully loaded widget for rendering. diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractAssemblyLocationAdapter.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractAssemblyLocationAdapter.java index 1fa989ec23..79e015abe2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractAssemblyLocationAdapter.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractAssemblyLocationAdapter.java @@ -17,8 +17,8 @@ package com.percussion.pagemanagement.assembler.impl; import static com.percussion.share.rx.PSLegacyExtensionUtils.addParameters; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.server.PSItemDefManager; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractTemplateExpanderAdapter.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractTemplateExpanderAdapter.java index b6447bd9f0..285051867f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractTemplateExpanderAdapter.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAbstractTemplateExpanderAdapter.java @@ -16,9 +16,9 @@ */ package com.percussion.pagemanagement.assembler.impl; -import static org.apache.commons.lang.Validate.noNullElements; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.noNullElements; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSComponentSummary; import com.percussion.error.PSExceptionUtils; @@ -42,7 +42,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAssemblyItemBridge.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAssemblyItemBridge.java index e213e1c6da..af1e82413b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAssemblyItemBridge.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSAssemblyItemBridge.java @@ -21,10 +21,10 @@ import static com.percussion.pagemanagement.assembler.impl.PSAssemblyConfig.PREVIEW_PAGE_BINDING_NAME; import static com.percussion.pagemanagement.assembler.impl.PSAssemblyConfig.PREVIEW_TEMPLATE_BINDING_NAME; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAssetSummary; import com.percussion.assetmanagement.service.IPSAssetService; @@ -74,7 +74,7 @@ import java.util.List; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSConcurrentRegionsAssembler.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSConcurrentRegionsAssembler.java index 131080c370..de69a27acd 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSConcurrentRegionsAssembler.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSConcurrentRegionsAssembler.java @@ -17,8 +17,8 @@ package com.percussion.pagemanagement.assembler.impl; import static com.percussion.util.IPSHtmlParameters.SYS_OVERWRITE_PREVIEW_URL_GEN; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.assembler.IPSRegionAssembler; import com.percussion.pagemanagement.assembler.IPSRegionsAssembler; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSItemIdResolver.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSItemIdResolver.java index a19f2fe011..7fb8b43eb6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSItemIdResolver.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSItemIdResolver.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.assembler.impl; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; import com.percussion.services.assembly.IPSAssemblyItem; import com.percussion.share.data.PSAbstractPersistantObject; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSLegacyLinkGenerator.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSLegacyLinkGenerator.java index baea1b2e0f..3de256fa2c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSLegacyLinkGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSLegacyLinkGenerator.java @@ -17,11 +17,11 @@ package com.percussion.pagemanagement.assembler.impl; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringEscapeUtils.unescapeXml; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; +import static org.apache.commons.text.StringEscapeUtils.unescapeXml; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.error.PSException; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderAssemblyBridge.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderAssemblyBridge.java index 0789cbd6db..742a35bfe4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderAssemblyBridge.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderAssemblyBridge.java @@ -17,10 +17,10 @@ package com.percussion.pagemanagement.assembler.impl; import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSComponentSummary; import com.percussion.error.PSExceptionUtils; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderLinkContextFactory.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderLinkContextFactory.java index e9fff0b495..23fe283ab3 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderLinkContextFactory.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSRenderLinkContextFactory.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.assembler.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.assetmanagement.data.PSAssetSummary; import com.percussion.pagemanagement.assembler.IPSRenderLinkContextFactory; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceAssemblyLocation.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceAssemblyLocation.java index 2642379e67..b532bdc295 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceAssemblyLocation.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceAssemblyLocation.java @@ -16,11 +16,11 @@ */ package com.percussion.pagemanagement.assembler.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.service.IPSAssetService; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceInstanceHelper.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceInstanceHelper.java index 41761867eb..305331570c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceInstanceHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceInstanceHelper.java @@ -21,12 +21,12 @@ import static com.percussion.pagemanagement.assembler.PSResourceLinkAndLocationUtils.validateAsPhysicalPath; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.service.IPSAssetService; @@ -61,7 +61,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -127,7 +126,14 @@ private List executeResourceLinkScript( Object rvalue = jexlEvaluator.evaluate(jexlScript); if (rvalue instanceof List) { List links = (List) rvalue; - Validate.allElementsOfType(links, PSResourceLinkAndLocation.class); + // commons-lang3 dropped `Validate.allElementsOfType`; inline the check. + for (Object link : links) { + if (!(link instanceof PSResourceLinkAndLocation)) { + throw new IllegalArgumentException( + "Expected every list element to be a PSResourceLinkAndLocation but found: " + + (link == null ? "null" : link.getClass().getName())); + } + } return links; } else if (rvalue instanceof PSResourceLinkAndLocation) { List links = new ArrayList<>(); diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceTemplateExpander.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceTemplateExpander.java index 3b3ec57d11..5a167680e5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceTemplateExpander.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/PSResourceTemplateExpander.java @@ -18,9 +18,9 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.server.PSItemDefManager; @@ -44,7 +44,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/finder/PSRelationshipWidgetContentFinder.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/finder/PSRelationshipWidgetContentFinder.java index 7bbe85d6b5..66d0e09c8a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/finder/PSRelationshipWidgetContentFinder.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/assembler/impl/finder/PSRelationshipWidgetContentFinder.java @@ -18,10 +18,10 @@ package com.percussion.pagemanagement.assembler.impl.finder; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.injectDependencies; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.server.PSItemDefManager; @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.transaction.annotation.Transactional; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSAbstractContentItemDao.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSAbstractContentItemDao.java index caa0754b47..c0bfc18cf3 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSAbstractContentItemDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSAbstractContentItemDao.java @@ -16,9 +16,9 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.guidmgr.data.PSLegacyGuid; import com.percussion.share.dao.IPSContentItemDao; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSHtmlMetadataUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSHtmlMetadataUtils.java index 6d1baa6874..8b3c35961d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSHtmlMetadataUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSHtmlMetadataUtils.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.IPSHtmlMetadata; import java.util.Map; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSMetadataDocTypeUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSMetadataDocTypeUtils.java index 8681f5c8a0..2ded6034df 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSMetadataDocTypeUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSMetadataDocTypeUtils.java @@ -20,7 +20,7 @@ import com.percussion.pagemanagement.data.PSMetadataDocTypeOptions; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Provides utilities to convert the doc type value stored in DB, and to convert the value supplied diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDao.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDao.java index e64d29113d..ef04f6c88f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDao.java @@ -16,10 +16,10 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.isNumeric; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNumeric; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.server.PSItemDefManager; @@ -51,7 +51,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDaoHelper.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDaoHelper.java index 8484de97ea..f8a15daaec 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDaoHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSPageDaoHelper.java @@ -18,9 +18,9 @@ import static com.percussion.services.utils.orm.PSDataCollectionHelper.MAX_IDS; import static com.percussion.util.PSSqlHelper.qualifyTableName; -import static org.apache.commons.lang.StringUtils.join; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.join; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.cms.objectstore.PSFolder; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionData.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionData.java index 52c738b7aa..ebe1192a5a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionData.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionData.java @@ -16,9 +16,9 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.IPSResourceDefinitionVisitor; import com.percussion.pagemanagement.data.PSResourceDefinitionGroup; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionGroupDao.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionGroupDao.java index 63ad4063b4..f400c1950c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionGroupDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionGroupDao.java @@ -17,7 +17,7 @@ package com.percussion.pagemanagement.dao.impl; import static java.util.Collections.emptyList; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.dao.IPSResourceDefinitionGroupDao; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionUniqueId.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionUniqueId.java index 3f4c563250..0f2693bcc3 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionUniqueId.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSResourceDefinitionUniqueId.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.*; import com.percussion.pagemanagement.service.IPSResourceDefinitionService; import com.percussion.pagemanagement.service.IPSResourceDefinitionService.PSResourceDefinitionInvalidIdException; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSTemplateDao.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSTemplateDao.java index a8096f209c..0782a53437 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSTemplateDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSTemplateDao.java @@ -19,10 +19,10 @@ import static com.percussion.sitemanage.service.IPSSiteSectionMetaDataService.SECTION_SYSTEM_FOLDER_NAME; import static com.percussion.sitemanage.service.IPSSiteSectionMetaDataService.TEMPLATES; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.isNumeric; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNumeric; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.dao.IPSTemplateDao; @@ -76,7 +76,7 @@ import java.util.Set; import java.util.TreeSet; import javax.annotation.PostConstruct; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetDao.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetDao.java index 582d82e413..e8835dc858 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetDao.java @@ -16,8 +16,8 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.dao.IPSWidgetDao; import com.percussion.pagemanagement.data.PSWidgetDefinition; @@ -27,7 +27,7 @@ import com.percussion.share.service.exception.PSDataServiceException; import java.io.IOException; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetItemIdGenerator.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetItemIdGenerator.java index 07c89a60ef..1f9563505b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetItemIdGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/dao/impl/PSWidgetItemIdGenerator.java @@ -16,9 +16,9 @@ */ package com.percussion.pagemanagement.dao.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSConstants; import com.percussion.pagemanagement.dao.IPSWidgetItemIdGenerator; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionTreeUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionTreeUtils.java index 9897c8272a..51d31b0ce9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionTreeUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionTreeUtils.java @@ -17,7 +17,7 @@ package com.percussion.pagemanagement.data; import static com.percussion.pagemanagement.data.PSRegionTreeUtils.getWidgetRegions; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.pagemanagement.data.PSRegionTreeUtils.PSRegionNodeWrapper.Type; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionWidgetAssociations.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionWidgetAssociations.java index 604580cb59..e9cb9f57ab 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionWidgetAssociations.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSRegionWidgetAssociations.java @@ -16,8 +16,8 @@ */ package com.percussion.pagemanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import java.io.Serializable; import java.util.Collection; @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlElementWrapper; import net.sf.oval.constraint.AssertValid; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A data object to represent widgets associated to a region. diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSResourceInstance.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSResourceInstance.java index 5326b30b07..da1de9afb4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSResourceInstance.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSResourceInstance.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.data; -import static org.apache.commons.lang.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.removeEnd; import com.percussion.pagemanagement.data.PSResourceDefinitionGroup.PSAssetResource; import com.percussion.share.data.IPSLinkableContentItem; @@ -29,7 +29,7 @@ import java.util.List; import java.util.Objects; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a fully loaded resource ready for link/rendering processing. diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSSEOStatistics.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSSEOStatistics.java index 16f99d3a4d..aed72612c4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSSEOStatistics.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSSEOStatistics.java @@ -16,8 +16,8 @@ */ package com.percussion.pagemanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.fasterxml.jackson.annotation.JsonAutoDetect; import java.util.HashSet; @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement; import net.sf.oval.constraint.NotBlank; import net.sf.oval.constraint.NotNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Encapsulates search engine optimization statistics for a Page. This includes the issues which diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSTemplate.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSTemplate.java index 9389cc3a57..cbb3842322 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSTemplate.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSTemplate.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.data; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.fasterxml.jackson.annotation.JsonRootName; import java.util.ArrayList; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfo.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfo.java index ebed1055fe..57c8111442 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfo.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfo.java @@ -18,7 +18,7 @@ import com.percussion.share.data.PSAbstractPersistantObject; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Additional information about a widget from the package that installed it. The Id is the widget diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoRequest.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoRequest.java index 8eab630db0..3430fd8cf8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoRequest.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoRequest.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ @XmlRootElement(name = "WidgetPackageInfoRequest") diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoResult.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoResult.java index f4c124cf17..874e2de572 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoResult.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/data/PSWidgetPackageInfoResult.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ @XmlRootElement(name = "WidgetPackageInfoResult") diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSExtractHtmlContent.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSExtractHtmlContent.java index bec01cf503..d3a5c2cb7f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSExtractHtmlContent.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSExtractHtmlContent.java @@ -39,7 +39,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSLandingPageFieldEditabilityRule.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSLandingPageFieldEditabilityRule.java index 7a1b5d8baa..2f83714a95 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSLandingPageFieldEditabilityRule.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSLandingPageFieldEditabilityRule.java @@ -26,7 +26,7 @@ import com.percussion.services.guidmgr.data.PSLegacyGuid; import com.percussion.utils.guid.IPSGuid; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This rule will check to see if the page is a landing page and if so, the field this rule applies diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSPageListViewProcessor.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSPageListViewProcessor.java index dd7eaaf927..f879f448a2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSPageListViewProcessor.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/extension/PSPageListViewProcessor.java @@ -32,8 +32,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/parser/PSRegionParser.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/parser/PSRegionParser.java index 6d34db6e85..4fa98d1219 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/parser/PSRegionParser.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/parser/PSRegionParser.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.parser; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; import com.percussion.pagemanagement.data.PSAbstractRegion; import com.percussion.pagemanagement.data.PSRegionCode; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageCatalogService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageCatalogService.java index 5ae8a5e4b7..ffdd754849 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageCatalogService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageCatalogService.java @@ -67,9 +67,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageChangeHandler.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageChangeHandler.java index f8d4833dc4..ae30a31a47 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageChangeHandler.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageChangeHandler.java @@ -39,7 +39,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.transaction.PlatformTransactionManager; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageRestService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageRestService.java index fec8ee6632..5a445a30ca 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageRestService.java @@ -21,8 +21,8 @@ import static com.percussion.share.web.service.PSRestServicePathConstants.LOAD_PATH; import static com.percussion.share.web.service.PSRestServicePathConstants.SAVE_PATH; import static com.percussion.share.web.service.PSRestServicePathConstants.VALIDATE_PATH; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; import com.percussion.design.objectstore.PSRelationshipConfig; import com.percussion.error.PSExceptionUtils; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageService.java index 79b0e6920d..3fe7de2e6a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageService.java @@ -21,12 +21,12 @@ import static com.percussion.pathmanagement.service.impl.PSSitePathItemService.SITE_ROOT; import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSReportFailedToRunException; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; @@ -118,9 +118,9 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.CompareToBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.CompareToBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageTemplateService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageTemplateService.java index 767e787318..d37ca236ea 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageTemplateService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSPageTemplateService.java @@ -16,8 +16,8 @@ */ package com.percussion.pagemanagement.service.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; import com.percussion.pagemanagement.dao.IPSPageDao; import com.percussion.pagemanagement.dao.IPSTemplateDao; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderLinkService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderLinkService.java index 1bc9edad3b..4f8e857cbe 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderLinkService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderLinkService.java @@ -20,11 +20,11 @@ import static com.percussion.pagemanagement.assembler.PSResourceLinkAndLocationUtils.escapePathForUrl; import static com.percussion.share.web.service.PSRestServicePathConstants.ID_PATH_PARAM; import static java.text.MessageFormat.format; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.service.IPSAssetService; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderService.java index 9a25a2fb36..30c2d09755 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSRenderService.java @@ -16,8 +16,8 @@ */ package com.percussion.pagemanagement.service.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.assembler.IPSRenderAssemblyBridge; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSResourceDefinitionUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSResourceDefinitionUtils.java index de76a95098..dba160496a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSResourceDefinitionUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSResourceDefinitionUtils.java @@ -18,9 +18,9 @@ import static org.apache.commons.collections.CollectionUtils.intersection; import static org.apache.commons.collections.CollectionUtils.isSubCollection; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.PSResourceDefinitionGroup.PSResourceDefinition; import com.percussion.pagemanagement.data.PSResourceDefinitionGroup.PSResourceDependency; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateRestService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateRestService.java index c9a68f315e..cbf225c1cd 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateRestService.java @@ -16,8 +16,8 @@ */ package com.percussion.pagemanagement.service.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.data.PSHtmlMetadata; @@ -44,7 +44,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateService.java index 8de55292ff..2fc52eb5b7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateService.java @@ -20,15 +20,15 @@ import static com.percussion.share.service.exception.PSParameterValidationUtils.rejectIfBlank; import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.substringAfterLast; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.noNullElements; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; -import static org.apache.commons.lang.math.NumberUtils.toInt; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.substringAfterLast; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.noNullElements; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; +import static org.apache.commons.lang3.math.NumberUtils.toInt; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; import com.percussion.cms.IPSConstants; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateServlet.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateServlet.java index e81e1d3077..912dabc49e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateServlet.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSTemplateServlet.java @@ -34,7 +34,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetPropertiesValidator.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetPropertiesValidator.java index 10b1ea3a57..25b16c5955 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetPropertiesValidator.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetPropertiesValidator.java @@ -20,7 +20,7 @@ import static com.percussion.pagemanagement.service.impl.PSWidgetUtils.getEnums; import static com.percussion.pagemanagement.service.impl.PSWidgetUtils.isEnum; import static java.util.Collections.sort; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.data.PSWidgetDefinition; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetService.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetService.java index d292b01e4d..55fb700291 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetService.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Map; import net.sf.json.JSONArray; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetUtils.java b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetUtils.java index 7be124eba2..5975e78c6d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pagemanagement/service/impl/PSWidgetUtils.java @@ -17,8 +17,8 @@ package com.percussion.pagemanagement.service.impl; import static java.text.MessageFormat.format; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.PSWidgetDefinition; import com.percussion.pagemanagement.data.PSWidgetDefinition.AbstractUserPref; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; /** * Utilities functions for convert/manipulating widget items, widget properties and widget diff --git a/projects/sitemanage/src/main/java/com/percussion/patch/PSSaveAssetsMaintenanceProcess.java b/projects/sitemanage/src/main/java/com/percussion/patch/PSSaveAssetsMaintenanceProcess.java index 250744d42d..055265fc51 100644 --- a/projects/sitemanage/src/main/java/com/percussion/patch/PSSaveAssetsMaintenanceProcess.java +++ b/projects/sitemanage/src/main/java/com/percussion/patch/PSSaveAssetsMaintenanceProcess.java @@ -83,7 +83,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.Jsoup; diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/data/PSPathItem.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/data/PSPathItem.java index 1e2bc63549..c6664ee766 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/data/PSPathItem.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/data/PSPathItem.java @@ -28,7 +28,7 @@ import java.util.Map; import javax.xml.bind.annotation.*; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement(name = "PathItem") diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSDispatchingPathService.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSDispatchingPathService.java index 8e83d59819..e44152dc90 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSDispatchingPathService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSDispatchingPathService.java @@ -18,8 +18,8 @@ import static java.text.MessageFormat.format; import static java.util.Collections.unmodifiableCollection; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.design.objectstore.PSRelationshipConfig; import com.percussion.error.PSExceptionUtils; @@ -66,8 +66,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSFileSystemPathItemService.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSFileSystemPathItemService.java index e562e1922e..069f1791da 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSFileSystemPathItemService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSFileSystemPathItemService.java @@ -16,7 +16,7 @@ */ package com.percussion.pathmanagement.service.impl; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import static org.springframework.util.StringUtils.trimLeadingCharacter; import static org.springframework.util.StringUtils.trimTrailingCharacter; @@ -53,7 +53,7 @@ import java.util.List; import java.util.Properties; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathItemService.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathItemService.java index 321280e051..9ac04275ab 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathItemService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathItemService.java @@ -22,11 +22,11 @@ import static com.percussion.sitemanage.service.IPSSiteSectionMetaDataService.SECTION_SYSTEM_FOLDER_NAME; import static com.percussion.webservices.PSWebserviceUtils.getItemSummary; import static com.percussion.webservices.PSWebserviceUtils.isItemCheckedOutToUser; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.substringBeforeLast; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.substringBeforeLast; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.service.IPSAssetService; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; @@ -84,7 +84,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathService.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathService.java index 4dd450845b..bce45b5e2a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathService.java @@ -67,7 +67,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.InitializingBean; diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathUtils.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathUtils.java index c15ab984af..fe23815fc6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSPathUtils.java @@ -17,7 +17,7 @@ package com.percussion.pathmanagement.service.impl; import static com.percussion.pathmanagement.service.impl.PSSitePathItemService.SITE_ROOT; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.PSInvalidContentTypeException; @@ -42,9 +42,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.CompareToBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.CompareToBuilder; /** Utility class to provide various utility methods for path services. */ public class PSPathUtils { diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSRecyclePathItemService.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSRecyclePathItemService.java index af96587075..ea2517928e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSRecyclePathItemService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSRecyclePathItemService.java @@ -17,7 +17,7 @@ package com.percussion.pathmanagement.service.impl; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.assetmanagement.service.IPSAssetService; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; diff --git a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSSitePathItemService.java b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSSitePathItemService.java index 5e863037bb..b51764c424 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSSitePathItemService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pathmanagement/service/impl/PSSitePathItemService.java @@ -16,8 +16,8 @@ */ package com.percussion.pathmanagement.service.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.service.IPSAssetService; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; diff --git a/projects/sitemanage/src/main/java/com/percussion/pubserver/impl/PSPubServerService.java b/projects/sitemanage/src/main/java/com/percussion/pubserver/impl/PSPubServerService.java index 50d2dbc5d5..0054c5686e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/pubserver/impl/PSPubServerService.java +++ b/projects/sitemanage/src/main/java/com/percussion/pubserver/impl/PSPubServerService.java @@ -17,11 +17,11 @@ import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; import static com.percussion.utils.service.impl.PSSiteConfigUtils.removeServerEntry; -import static org.apache.commons.lang.StringUtils.EMPTY; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.EMPTY; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.amazonaws.regions.Region; import com.amazonaws.regions.Regions; @@ -89,8 +89,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSPageImportQueue.java b/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSPageImportQueue.java index 49893fc53d..a1c64c3075 100644 --- a/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSPageImportQueue.java +++ b/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSPageImportQueue.java @@ -45,7 +45,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSSiteQueue.java b/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSSiteQueue.java index f7b36e79d1..03a76f2a1b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSSiteQueue.java +++ b/projects/sitemanage/src/main/java/com/percussion/queue/impl/PSSiteQueue.java @@ -18,8 +18,8 @@ package com.percussion.queue.impl; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.monitor.process.PSImportProcessMonitor; import com.percussion.server.PSRequest; diff --git a/projects/sitemanage/src/main/java/com/percussion/recent/service/impl/PSRecentService.java b/projects/sitemanage/src/main/java/com/percussion/recent/service/impl/PSRecentService.java index 22993e2dee..6fca9f34a4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/recent/service/impl/PSRecentService.java +++ b/projects/sitemanage/src/main/java/com/percussion/recent/service/impl/PSRecentService.java @@ -41,7 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/recycle/service/impl/PSRecycleService.java b/projects/sitemanage/src/main/java/com/percussion/recycle/service/impl/PSRecycleService.java index 1494774d47..75aa49685e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/recycle/service/impl/PSRecycleService.java +++ b/projects/sitemanage/src/main/java/com/percussion/recycle/service/impl/PSRecycleService.java @@ -17,7 +17,7 @@ package com.percussion.recycle.service.impl; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; diff --git a/projects/sitemanage/src/main/java/com/percussion/redirect/service/impl/PSRedirectService.java b/projects/sitemanage/src/main/java/com/percussion/redirect/service/impl/PSRedirectService.java index 5e9298bc13..a8a6054cf9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/redirect/service/impl/PSRedirectService.java +++ b/projects/sitemanage/src/main/java/com/percussion/redirect/service/impl/PSRedirectService.java @@ -45,7 +45,7 @@ import javax.ws.rs.client.Invocation; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/role/service/impl/PSRoleService.java b/projects/sitemanage/src/main/java/com/percussion/role/service/impl/PSRoleService.java index f95669fe87..f233ca04f9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/role/service/impl/PSRoleService.java +++ b/projects/sitemanage/src/main/java/com/percussion/role/service/impl/PSRoleService.java @@ -63,7 +63,7 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/data/PSSearchCriteria.java b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/data/PSSearchCriteria.java index 07490bcce6..6b6f2f59b5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/data/PSSearchCriteria.java +++ b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/data/PSSearchCriteria.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @XmlRootElement(name = "SearchCriteria") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSPageIndexService.java b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSPageIndexService.java index 086f672b61..16b6eca25f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSPageIndexService.java +++ b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSPageIndexService.java @@ -17,7 +17,7 @@ package com.percussion.searchmanagement.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.design.objectstore.PSLocator; import com.percussion.itemmanagement.service.IPSWorkflowHelper; diff --git a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchIndexFieldValueModifier.java b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchIndexFieldValueModifier.java index ef85c6e757..6058c18990 100644 --- a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchIndexFieldValueModifier.java +++ b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchIndexFieldValueModifier.java @@ -34,8 +34,8 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchService.java b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchService.java index 4e9c9665f9..c8c254041e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchService.java +++ b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSearchService.java @@ -17,7 +17,7 @@ package com.percussion.searchmanagement.service.impl; import static com.percussion.webservices.PSWebserviceUtils.getWorkflow; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import com.percussion.design.objectstore.PSField; import com.percussion.design.objectstore.PSFieldSet; @@ -70,9 +70,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.CompareToBuilder; import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.CompareToBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSharedRelationshipDeleteListener.java b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSharedRelationshipDeleteListener.java index b2d58d25eb..b7009946a6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSharedRelationshipDeleteListener.java +++ b/projects/sitemanage/src/main/java/com/percussion/searchmanagement/service/impl/PSSharedRelationshipDeleteListener.java @@ -17,8 +17,8 @@ package com.percussion.searchmanagement.service.impl; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.service.impl.PSWidgetAssetRelationshipService; import com.percussion.cms.PSRelationshipChangeEvent; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/async/PSAsyncJobStatus.java b/projects/sitemanage/src/main/java/com/percussion/share/async/PSAsyncJobStatus.java index ddbe956b8d..6c26bd7caf 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/async/PSAsyncJobStatus.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/async/PSAsyncJobStatus.java @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Represents the current status of a running asynchronous job. Includes the status as a value diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSDateUtils.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSDateUtils.java index d7607da81d..fa8ad602b9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSDateUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSDateUtils.java @@ -22,8 +22,8 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.FastDateFormat; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; /** * A utility class for date manipulation. diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSFolderPermissionUtils.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSFolderPermissionUtils.java index 00dd144b0a..fa98ed32a7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSFolderPermissionUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSFolderPermissionUtils.java @@ -18,8 +18,8 @@ import static com.percussion.role.service.IPSRoleService.ADMINISTRATOR_ROLE; import static com.percussion.role.service.IPSRoleService.DESIGNER_ROLE; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSFolder; import com.percussion.cms.objectstore.PSObjectAcl; @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.transaction.annotation.Transactional; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSGenericItemDao.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSGenericItemDao.java index e1c6bbbecc..35afd1e58e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSGenericItemDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSGenericItemDao.java @@ -16,10 +16,10 @@ */ package com.percussion.share.dao; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.IPSFieldValue; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSHtmlUtils.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSHtmlUtils.java index 2e4e62416c..23c47490c5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSHtmlUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSHtmlUtils.java @@ -19,8 +19,8 @@ import static com.percussion.xml.PSXmlDocumentBuilder.FLAG_ALLOW_NULL; import static com.percussion.xml.PSXmlDocumentBuilder.FLAG_OMIT_DOC_TYPE; import static com.percussion.xml.PSXmlDocumentBuilder.FLAG_OMIT_XML_DECL; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.extensions.utils.PSTidyUtils; import com.percussion.share.service.exception.PSExtractHTMLException; @@ -34,7 +34,7 @@ import net.htmlparser.jericho.Source; import net.htmlparser.jericho.StartTag; import net.htmlparser.jericho.Tag; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeFinder.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeFinder.java index 1011818e56..10a2f777ad 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeFinder.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeFinder.java @@ -18,8 +18,8 @@ package com.percussion.share.dao; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.contentmgr.IPSContentMgr; import com.percussion.services.contentmgr.IPSNode; @@ -36,7 +36,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeMap.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeMap.java index 3d2e143593..6008557a24 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeMap.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/PSJcrNodeMap.java @@ -16,7 +16,7 @@ */ package com.percussion.share.dao; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.util.PSPurgableTempFile; import com.percussion.utils.jsr170.PSMultiProperty; @@ -36,7 +36,7 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Lazy loaded Map of properties from a JCR Node. Updates are allowed to the map but do not actually diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItem.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItem.java index 8dc322bfec..640ea63adc 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItem.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItem.java @@ -16,7 +16,7 @@ */ package com.percussion.share.dao.impl; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; import com.percussion.share.data.IPSContentItem; import com.percussion.share.data.PSDataItemSummary; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItemDao.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItemDao.java index fc31323851..6958c4f17b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItemDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSContentItemDao.java @@ -19,10 +19,10 @@ import static com.percussion.share.dao.impl.PSLegacyExceptionUtils.convertException; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSExceptionDecorator.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSExceptionDecorator.java index 7f28dd26ca..c2daa84f10 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSExceptionDecorator.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSExceptionDecorator.java @@ -16,7 +16,7 @@ */ package com.percussion.share.dao.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; /** * This decorator wraps an existing exception making instances of this class look like the wrapped diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSFolderHelper.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSFolderHelper.java index 0baad649db..d25f65e43c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSFolderHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSFolderHelper.java @@ -28,10 +28,10 @@ import static com.percussion.webservices.PSWebserviceUtils.getWorkflow; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSComponentSummary; import com.percussion.cms.objectstore.PSFolder; @@ -109,8 +109,8 @@ import java.util.regex.Pattern; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSIdMapper.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSIdMapper.java index 7e4c367e3e..a678971e4b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSIdMapper.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSIdMapper.java @@ -16,8 +16,8 @@ */ package com.percussion.share.dao.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.design.objectstore.PSLocator; import com.percussion.services.catalog.PSTypeEnum; @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; import javax.ws.rs.ext.Provider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; /** Implements {@link IPSIdMapper}. */ diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSItemSummaryService.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSItemSummaryService.java index f8910d5659..14aba5de53 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSItemSummaryService.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSItemSummaryService.java @@ -18,8 +18,8 @@ import static java.text.MessageFormat.format; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.server.PSItemDefManager; @@ -50,7 +50,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSNameGenerator.java b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSNameGenerator.java index 61240ef87c..cc87e4822c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSNameGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/dao/impl/PSNameGenerator.java @@ -17,7 +17,7 @@ /** */ package com.percussion.share.dao.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.service.IPSIdMapper; import com.percussion.share.service.IPSNameGenerator; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/data/PSAbstractNamedObject.java b/projects/sitemanage/src/main/java/com/percussion/share/data/PSAbstractNamedObject.java index de9f2d3170..51ecde5e86 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/data/PSAbstractNamedObject.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/data/PSAbstractNamedObject.java @@ -16,7 +16,7 @@ */ package com.percussion.share.data; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import java.text.Collator; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/data/PSEnumVals.java b/projects/sitemanage/src/main/java/com/percussion/share/data/PSEnumVals.java index 0262ae7733..8e74ae267e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/data/PSEnumVals.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/data/PSEnumVals.java @@ -16,7 +16,7 @@ */ package com.percussion.share.data; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.fasterxml.jackson.annotation.JsonRootName; import java.util.ArrayList; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/data/PSPagedObjectList.java b/projects/sitemanage/src/main/java/com/percussion/share/data/PSPagedObjectList.java index 1ce3576289..b8ecaaf3a8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/data/PSPagedObjectList.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/data/PSPagedObjectList.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author miltonpividori */ public class PSPagedObjectList { diff --git a/projects/sitemanage/src/main/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformer.java b/projects/sitemanage/src/main/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformer.java index 4de61958db..b1095060e8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformer.java @@ -25,7 +25,7 @@ import com.percussion.server.IPSRequestContext; import com.percussion.server.PSRequestValidationException; import com.percussion.utils.PSJsoupPreserver; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/extension/PSRxFixStartupProcess.java b/projects/sitemanage/src/main/java/com/percussion/share/extension/PSRxFixStartupProcess.java index 8bdc81ccfd..5b474cb27d 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/extension/PSRxFixStartupProcess.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/extension/PSRxFixStartupProcess.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/extension/PSTouchFiles.java b/projects/sitemanage/src/main/java/com/percussion/share/extension/PSTouchFiles.java index b2bb99b0d9..63e55cb864 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/extension/PSTouchFiles.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/extension/PSTouchFiles.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Properties; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/rx/PSLegacyExtensionUtils.java b/projects/sitemanage/src/main/java/com/percussion/share/rx/PSLegacyExtensionUtils.java index adbad2cbb8..d4f90a9c6b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/rx/PSLegacyExtensionUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/rx/PSLegacyExtensionUtils.java @@ -16,7 +16,7 @@ */ package com.percussion.share.rx; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.extension.IPSExtensionDef; import com.percussion.server.IPSRequestContext; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/service/PSAbstractDataService.java b/projects/sitemanage/src/main/java/com/percussion/share/service/PSAbstractDataService.java index d9e2b74166..e951506cc6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/service/PSAbstractDataService.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/service/PSAbstractDataService.java @@ -18,7 +18,7 @@ import static com.percussion.share.service.exception.PSParameterValidationUtils.rejectIfNull; import static java.text.MessageFormat.format; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.share.dao.IPSGenericDao; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/service/PSSiteCopyUtils.java b/projects/sitemanage/src/main/java/com/percussion/share/service/PSSiteCopyUtils.java index fe635280d9..a803544058 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/service/PSSiteCopyUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/service/PSSiteCopyUtils.java @@ -18,8 +18,8 @@ package com.percussion.share.service; import static com.percussion.share.service.exception.PSParameterValidationUtils.validateParameters; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.data.PSMapWrapper; import com.percussion.share.service.exception.PSValidationException; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSSystemProperties.java b/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSSystemProperties.java index 8f8291905c..ee72652aea 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSSystemProperties.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSSystemProperties.java @@ -20,7 +20,7 @@ import com.percussion.share.service.IPSSystemProperties; import com.percussion.util.PSSiteManageBean; import javax.ws.rs.ext.Provider; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ @Provider diff --git a/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSThumbnailRunner.java b/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSThumbnailRunner.java index 7c09bf6d58..88b3ab80f6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSThumbnailRunner.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSThumbnailRunner.java @@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSXmlDataHandler.java b/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSXmlDataHandler.java index 17aaf3dc62..ce018441ae 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSXmlDataHandler.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/service/impl/PSXmlDataHandler.java @@ -16,7 +16,7 @@ */ package com.percussion.share.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.service.impl.jaxb.Data; import com.percussion.share.service.impl.jaxb.Property; diff --git a/projects/sitemanage/src/main/java/com/percussion/share/spring/PSFixedThreadPoolExecutorService.java b/projects/sitemanage/src/main/java/com/percussion/share/spring/PSFixedThreadPoolExecutorService.java index 5545425497..08853e4953 100644 --- a/projects/sitemanage/src/main/java/com/percussion/share/spring/PSFixedThreadPoolExecutorService.java +++ b/projects/sitemanage/src/main/java/com/percussion/share/spring/PSFixedThreadPoolExecutorService.java @@ -16,7 +16,7 @@ */ package com.percussion.share.spring; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.Validate.isTrue; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/projects/sitemanage/src/main/java/com/percussion/siteimportsummary/service/impl/PSSiteImportSummaryService.java b/projects/sitemanage/src/main/java/com/percussion/siteimportsummary/service/impl/PSSiteImportSummaryService.java index 4482b07068..6d899f1d4b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/siteimportsummary/service/impl/PSSiteImportSummaryService.java +++ b/projects/sitemanage/src/main/java/com/percussion/siteimportsummary/service/impl/PSSiteImportSummaryService.java @@ -22,7 +22,7 @@ import com.percussion.share.dao.IPSGenericDao; import com.percussion.sitesummaryservice.service.IPSSiteImportSummaryService; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteContentDao.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteContentDao.java index 1a91ebd32f..02ba488b8a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteContentDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteContentDao.java @@ -17,8 +17,8 @@ package com.percussion.sitemanage.dao.impl; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSCloningOptions; import com.percussion.cms.objectstore.PSComponentSummary; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteDao.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteDao.java index b2f5d6fe5c..822b007c85 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSiteDao.java @@ -16,8 +16,8 @@ */ package com.percussion.sitemanage.dao.impl; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSConstants; import com.percussion.error.PSException; @@ -47,7 +47,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSitePublishDao.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSitePublishDao.java index cb0026483c..456a596e4e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSitePublishDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/dao/impl/PSSitePublishDao.java @@ -19,10 +19,10 @@ import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; import static com.percussion.utils.service.impl.PSSiteConfigUtils.removeServerEntry; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.endsWith; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.endsWith; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.amazonaws.regions.Region; import com.amazonaws.regions.Regions; @@ -77,8 +77,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.derby.database.Database; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSPublishingAction.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSPublishingAction.java index 0d989f6b69..4f8c00ec0c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSPublishingAction.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSPublishingAction.java @@ -17,7 +17,7 @@ package com.percussion.sitemanage.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSPublishingAction { diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSiteArchitecture.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSiteArchitecture.java index 83b75ddd47..f690f3cd12 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSiteArchitecture.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSiteArchitecture.java @@ -19,7 +19,7 @@ import com.percussion.share.data.PSAbstractPersistantObject; import java.util.List; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @XmlRootElement(name = "SiteArchitecture") public class PSSiteArchitecture extends PSAbstractPersistantObject { diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSitePublishRequest.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSitePublishRequest.java index 334bd3f681..1f9dd7ab61 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSitePublishRequest.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/data/PSSitePublishRequest.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement; import net.sf.oval.constraint.NotBlank; import net.sf.oval.constraint.NotNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** This request object stores the information required to publish a site. */ @XmlRootElement(name = "SitePublishRequest") diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSImportFromUrlJob.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSImportFromUrlJob.java index 310757723d..c4ce1897d4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSImportFromUrlJob.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSImportFromUrlJob.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.context.annotation.Lazy; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogViewer.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogViewer.java index cbb8465988..5328a4a368 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogViewer.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogViewer.java @@ -38,7 +38,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.transaction.annotation.Transactional; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogger.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogger.java index 06cf0ec140..9b032af6d9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogger.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImportLogger.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ public class PSSiteImportLogger implements IPSSiteImportLogger { diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImporter.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImporter.java index 3f1b4c01b3..b429fe3bfd 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImporter.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/PSSiteImporter.java @@ -15,8 +15,8 @@ */ package com.percussion.sitemanage.importer; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.server.IPSHttpErrors; import com.percussion.share.dao.IPSGenericDao; @@ -39,9 +39,9 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.Connection; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/dao/impl/PSImportLogDao.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/dao/impl/PSImportLogDao.java index 657adde096..70513652f2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/dao/impl/PSImportLogDao.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/dao/impl/PSImportLogDao.java @@ -28,7 +28,7 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/data/PSImportLogEntry.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/data/PSImportLogEntry.java index 5d93dbcd80..8db832e35e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/data/PSImportLogEntry.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/data/PSImportLogEntry.java @@ -23,7 +23,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSGenericMetadataExtractorHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSGenericMetadataExtractorHelper.java index a459e314f6..80d78f78f8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSGenericMetadataExtractorHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSGenericMetadataExtractorHelper.java @@ -16,8 +16,8 @@ */ package com.percussion.sitemanage.importer.helpers.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.itemmanagement.service.IPSItemWorkflowService; import com.percussion.pagemanagement.data.IPSHtmlMetadata; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportHelper.java index b1a669891d..4dd68b74eb 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportHelper.java @@ -17,7 +17,7 @@ package com.percussion.sitemanage.importer.helpers.impl; import com.percussion.sitemanage.importer.helpers.IPSImportHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author LucasPiccoli diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportPageCreationHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportPageCreationHelper.java index ef3aa9d14a..28559366eb 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportPageCreationHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportPageCreationHelper.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.importer.helpers.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.service.IPSPageCatalogService; import com.percussion.sitemanage.data.PSPageContent; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportThemeHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportThemeHelper.java index e7d7333ac9..7e3f810b21 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportThemeHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSImportThemeHelper.java @@ -17,7 +17,7 @@ package com.percussion.sitemanage.importer.helpers.impl; import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.sitemanage.data.PSPageContent; import com.percussion.sitemanage.data.PSSiteImportCtx; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageExtractorHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageExtractorHelper.java index 248deb1393..c9b5bdc9e9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageExtractorHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageExtractorHelper.java @@ -19,7 +19,7 @@ import static com.percussion.sitemanage.importer.utils.PSManagedTagsUtils.commentTag; import static com.percussion.sitemanage.importer.utils.PSManagedTagsUtils.isManagedJSReference; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.assetmanagement.data.PSAsset; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageMetadataExtractorHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageMetadataExtractorHelper.java index afba9cb6a7..e2fa9f0f04 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageMetadataExtractorHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSPageMetadataExtractorHelper.java @@ -17,7 +17,7 @@ package com.percussion.sitemanage.importer.helpers.impl; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.itemmanagement.service.IPSItemWorkflowService; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSSiteCreationHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSSiteCreationHelper.java index 05a0e520ef..902de5da02 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSSiteCreationHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSSiteCreationHelper.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.importer.helpers.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.PSPage; import com.percussion.pagemanagement.service.IPSPageService; @@ -32,8 +32,8 @@ import com.percussion.sitesummaryservice.service.IPSSiteImportSummaryService; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -132,7 +132,7 @@ public void process(PSPageContent pageContent, PSSiteImportCtx context) // Errors in mandatory helpers are not logged in siteImportLogger, // because that log is discarded. Log the error in the server log. String message = "There was an unexpected error creating the new site."; - log.error(message + ". Caused by: " + e.getMessage() + ExceptionUtils.getFullStackTrace(e)); + log.error(message + ". Caused by: " + e.getMessage() + ExceptionUtils.getStackTrace(e)); throw new PSSiteImportException(message, e); } endTimer(); diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSTemplateCreationHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSTemplateCreationHelper.java index 1d3ef7d62c..df9bc26e74 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSTemplateCreationHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/helpers/impl/PSTemplateCreationHelper.java @@ -35,7 +35,7 @@ import com.percussion.sitemanage.importer.IPSSiteImportLogger.PSLogEntryType; import com.percussion.sitemanage.service.IPSSiteTemplateService; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSAssetCreator.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSAssetCreator.java index ef11baf67a..443fcc2ba0 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSAssetCreator.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSAssetCreator.java @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSCSSParser.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSCSSParser.java index 391e1b5a9c..abdd58f39b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSCSSParser.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSCSSParser.java @@ -16,8 +16,8 @@ */ package com.percussion.sitemanage.importer.theme; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.sitemanage.importer.IPSSiteImportLogger; import com.percussion.sitemanage.importer.IPSSiteImportLogger.PSLogEntryType; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSFileDownloader.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSFileDownloader.java index 65feba9069..76a64a5b72 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSFileDownloader.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSFileDownloader.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.importer.theme; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.server.PSRequest; import com.percussion.sitemanage.data.PSSiteImportCtx; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporter.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporter.java index 78e0eb029f..c40ca807cb 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporter.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporter.java @@ -16,11 +16,11 @@ */ package com.percussion.sitemanage.importer.theme; -import static org.apache.commons.lang.StringUtils.containsIgnoreCase; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.sitemanage.importer.IPSSiteImportLogger; import com.percussion.sitemanage.importer.helpers.impl.PSImportThemeHelper.LogCategory; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSURLConverter.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSURLConverter.java index 9f402d15ff..c5ecabdab8 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSURLConverter.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/theme/PSURLConverter.java @@ -16,8 +16,8 @@ */ package com.percussion.sitemanage.importer.theme; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; import static org.springframework.util.StringUtils.endsWithIgnoreCase; import com.percussion.services.assembly.impl.PSReplacementFilter; @@ -35,7 +35,7 @@ import java.util.Set; import java.util.regex.Pattern; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Given an Url we can calculate his fully qualified URL, convert it to a theme link and get where diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java index 8ff7fd06a7..833dd01e7b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java @@ -42,7 +42,7 @@ import java.util.Map; import javax.net.ssl.HttpsURLConnection; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; public class PSFileDownLoadJobRunner implements Runnable { private PSAssetCreator assetCreator = new PSAssetCreator(); diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSHtmlRetriever.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSHtmlRetriever.java index dadaa2687e..731f1667f1 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSHtmlRetriever.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSHtmlRetriever.java @@ -18,7 +18,7 @@ import com.percussion.sitemanage.importer.IPSConnectivity; import java.io.IOException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.jsoup.Connection; import org.jsoup.nodes.Document; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSLinkExtractor.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSLinkExtractor.java index e3d32770d8..6919b4d652 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSLinkExtractor.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSLinkExtractor.java @@ -28,7 +28,7 @@ import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSManagedTagsUtils.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSManagedTagsUtils.java index a0712b22f1..a14796a1ef 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSManagedTagsUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSManagedTagsUtils.java @@ -17,10 +17,10 @@ package com.percussion.sitemanage.importer.utils; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import java.util.List; import java.util.regex.Pattern; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSAutoPublishItem.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSAutoPublishItem.java index b746445dfd..97a17bdd18 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSAutoPublishItem.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSAutoPublishItem.java @@ -39,7 +39,7 @@ import com.percussion.sitemanage.service.IPSSitePublishService; import com.percussion.sitemanage.service.IPSSitePublishService.PubType; import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublicAssetItemFilterRule.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublicAssetItemFilterRule.java index c5dcff9ef0..5aa397e8f7 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublicAssetItemFilterRule.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublicAssetItemFilterRule.java @@ -41,7 +41,7 @@ import com.percussion.webservices.system.PSSystemWsLocator; import java.io.File; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublishingJobStatusCallbackWrapper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublishingJobStatusCallbackWrapper.java index 6038c768ac..8435a51f1b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublishingJobStatusCallbackWrapper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSPublishingJobStatusCallbackWrapper.java @@ -20,7 +20,7 @@ import com.percussion.rx.publisher.IPSPublishingJobStatusCallback; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ public class PSPublishingJobStatusCallbackWrapper implements IPSPublishingJobStatusCallback { diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteDataService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteDataService.java index 63e5db814d..c8b44442ec 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteDataService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteDataService.java @@ -24,8 +24,8 @@ import static com.percussion.utils.service.impl.PSSiteConfigUtils.removeSiteConfigurationAndTouchedFile; import static com.percussion.utils.service.impl.PSSiteConfigUtils.removeTouchedFile; import static com.percussion.utils.service.impl.PSSiteConfigUtils.updateSiteConfiguration; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -134,7 +134,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOCase; import org.apache.commons.io.filefilter.SuffixFileFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishService.java index bff734f021..d572751ec6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishService.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.service.impl; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; import com.percussion.cms.IPSConstants; @@ -81,9 +81,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.CompareToBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.CompareToBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONArray; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceHelper.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceHelper.java index e793df11dc..a730fa5922 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceHelper.java @@ -18,7 +18,7 @@ import static com.percussion.services.utils.orm.PSDataCollectionHelper.MAX_IDS; import static com.percussion.util.PSSqlHelper.qualifyTableName; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import com.percussion.assetmanagement.service.IPSAssetService; import com.percussion.cms.IPSConstants; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceWebAdapter.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceWebAdapter.java index e533b2eb5f..eb20a1448c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceWebAdapter.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishServiceWebAdapter.java @@ -61,8 +61,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishStatusService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishStatusService.java index 5b4cfc6e3f..e91c5aff1a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishStatusService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSitePublishStatusService.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.service.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.error.PSExceptionUtils; import com.percussion.rx.publisher.IPSPublisherJobStatus; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionMetaDataService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionMetaDataService.java index fa5d5d2c00..8f44072d6a 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionMetaDataService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionMetaDataService.java @@ -18,9 +18,9 @@ import static java.text.MessageFormat.format; import static java.util.Collections.emptyList; -import static org.apache.commons.lang.StringUtils.*; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.dao.IPSFolderHelper; import com.percussion.share.dao.IPSFolderHelper.PathTarget; @@ -31,7 +31,7 @@ import com.percussion.webservices.content.IPSContentWs; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionRestService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionRestService.java index 89323d11f4..46fa2ce44e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionRestService.java @@ -19,7 +19,7 @@ import static com.percussion.share.web.service.PSRestServicePathConstants.DELETE_PATH; import static com.percussion.share.web.service.PSRestServicePathConstants.ID_PATH_PARAM; import static com.percussion.share.web.service.PSRestServicePathConstants.LOAD_PATH; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.pathmanagement.service.IPSPathService; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionService.java index 7e0ad382a7..a2b87e620b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteSectionService.java @@ -23,9 +23,9 @@ import static com.percussion.utils.service.impl.PSSiteConfigUtils.removeTouchedFile; import static com.percussion.webservices.PSWebserviceUtils.getItemSummary; import static com.percussion.webservices.PSWebserviceUtils.isItemCheckedOutToUser; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; @@ -100,7 +100,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteTemplateService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteTemplateService.java index 8a060e48a6..05ecbb5def 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteTemplateService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSSiteTemplateService.java @@ -21,9 +21,9 @@ import static com.percussion.sitemanage.service.IPSSiteSectionMetaDataService.SECTION_SYSTEM_FOLDER_NAME; import static com.percussion.sitemanage.service.IPSSiteSectionMetaDataService.TEMPLATES; import static java.text.MessageFormat.format; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.service.IPSAssetService; import com.percussion.assetmanagement.service.IPSWidgetAssetRelationshipService; @@ -90,7 +90,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSStagingItemFilterRule.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSStagingItemFilterRule.java index b07f35ed80..17d932f1f5 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSStagingItemFilterRule.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/service/impl/PSStagingItemFilterRule.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This is a staging filter rule that extends public asset item filter rule. This rule while getting diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/servlet/PSPreviewItemContent.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/servlet/PSPreviewItemContent.java index 41c7c756d4..75e1974e68 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/servlet/PSPreviewItemContent.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/servlet/PSPreviewItemContent.java @@ -49,7 +49,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntEditionTask.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntEditionTask.java index 6028752832..8d3b43535e 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntEditionTask.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntEditionTask.java @@ -18,8 +18,8 @@ import static com.percussion.share.spring.PSSpringWebApplicationContextUtils.getWebApplicationContext; import static com.percussion.utils.service.impl.PSSiteConfigUtils.*; -import static org.apache.commons.lang.StringUtils.*; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.Validate.*; import com.percussion.cms.IPSConstants; import com.percussion.error.PSExceptionUtils; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntService.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntService.java index 8a3f4f6ff3..3fb54aa664 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntService.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSAntService.java @@ -16,9 +16,9 @@ */ package com.percussion.sitemanage.task.impl; -import static org.apache.commons.lang.Validate.noNullElements; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.noNullElements; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.cms.IPSConstants; diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSUpdateTablesEditionTask.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSUpdateTablesEditionTask.java index 97c6a83bc7..cfaaa60a3c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSUpdateTablesEditionTask.java +++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/task/impl/PSUpdateTablesEditionTask.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.task.impl; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import com.percussion.cms.IPSConstants; import com.percussion.error.PSExceptionUtils; @@ -45,7 +45,7 @@ import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCSS.java b/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCSS.java index a4188df87e..7f582fb3e2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCSS.java +++ b/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCSS.java @@ -17,7 +17,7 @@ package com.percussion.theme.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.fasterxml.jackson.annotation.JsonRootName; import com.percussion.share.data.PSAbstractDataObject; diff --git a/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCssList.java b/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCssList.java index b16e33318d..5e2504e2f3 100644 --- a/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCssList.java +++ b/projects/sitemanage/src/main/java/com/percussion/theme/data/PSRegionCssList.java @@ -17,7 +17,7 @@ package com.percussion.theme.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.share.data.PSAbstractDataObject; import java.util.ArrayList; diff --git a/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSRegionCSSFileService.java b/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSRegionCSSFileService.java index 280b4bc908..fcce9a0b99 100644 --- a/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSRegionCSSFileService.java +++ b/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSRegionCSSFileService.java @@ -19,9 +19,9 @@ import static com.percussion.theme.data.PSRegionCSS.REGION_CLASS; import static com.percussion.utils.tools.IPSUtilsConstants.RX_STANDARD_ENC; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.PSRegion; import com.percussion.pagemanagement.data.PSRegionTree; @@ -49,7 +49,7 @@ import java.util.Collections; import java.util.List; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSRegionCSSFileService { /** diff --git a/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSThemeService.java b/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSThemeService.java index 085d4956ec..a5dee808ba 100644 --- a/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSThemeService.java +++ b/projects/sitemanage/src/main/java/com/percussion/theme/service/impl/PSThemeService.java @@ -18,8 +18,8 @@ package com.percussion.theme.service.impl; import static com.percussion.share.service.exception.PSParameterValidationUtils.rejectIfNull; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.pagemanagement.data.PSTemplate; diff --git a/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSBaseListViewHelper.java b/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSBaseListViewHelper.java index 2e4a978905..47987bd7bf 100644 --- a/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSBaseListViewHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSBaseListViewHelper.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSCm1ListViewHelper.java b/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSCm1ListViewHelper.java index 123c0ecb41..2d0658d794 100644 --- a/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSCm1ListViewHelper.java +++ b/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSCm1ListViewHelper.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSUiService.java b/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSUiService.java index 1e11a139e7..a2767531ee 100644 --- a/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSUiService.java +++ b/projects/sitemanage/src/main/java/com/percussion/ui/service/impl/PSUiService.java @@ -33,7 +33,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author erikserating */ @PSSiteManageBean("uiService") diff --git a/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBean.java b/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBean.java index 5a163bcaa3..71b54bc7ce 100644 --- a/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBean.java +++ b/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBean.java @@ -21,7 +21,7 @@ import com.percussion.security.PSPasswordHandler; import java.io.File; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSUserService.java b/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSUserService.java index edbc8e25a0..73ab97d1c1 100644 --- a/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSUserService.java +++ b/projects/sitemanage/src/main/java/com/percussion/user/service/impl/PSUserService.java @@ -26,10 +26,10 @@ import static com.percussion.webservices.PSWebserviceUtils.setUserName; import static java.util.Arrays.asList; import static org.apache.commons.collections.CollectionUtils.containsAny; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; @@ -139,7 +139,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/utils/PSJsoupPreserver.java b/projects/sitemanage/src/main/java/com/percussion/utils/PSJsoupPreserver.java index a32ad7f731..6adf6d26ab 100644 --- a/projects/sitemanage/src/main/java/com/percussion/utils/PSJsoupPreserver.java +++ b/projects/sitemanage/src/main/java/com/percussion/utils/PSJsoupPreserver.java @@ -16,7 +16,7 @@ */ package com.percussion.utils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; /** diff --git a/projects/sitemanage/src/main/java/com/percussion/utils/PSNamedLockManager.java b/projects/sitemanage/src/main/java/com/percussion/utils/PSNamedLockManager.java index 4485a7d3bc..3eebf7451c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/utils/PSNamedLockManager.java +++ b/projects/sitemanage/src/main/java/com/percussion/utils/PSNamedLockManager.java @@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Manages a map of named locks, so that locks can be acquired based on a name, also simplifies some diff --git a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSJsoupUtils.java b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSJsoupUtils.java index 24f790fc79..ae00c7616c 100644 --- a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSJsoupUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSJsoupUtils.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; diff --git a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSSiteConfigUtils.java b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSSiteConfigUtils.java index a664642974..3ee856775f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSSiteConfigUtils.java +++ b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSSiteConfigUtils.java @@ -19,9 +19,9 @@ import static com.percussion.pathmanagement.service.impl.PSSitePathItemService.SITE_ROOT; import static com.percussion.xml.PSXmlTreeWalker.GET_NEXT_ALLOW_CHILDREN; import static com.percussion.xml.PSXmlTreeWalker.GET_NEXT_ALLOW_SIBLINGS; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.splitByWholeSeparator; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.splitByWholeSeparator; import static org.springframework.util.CollectionUtils.isEmpty; import com.percussion.error.PSExceptionUtils; diff --git a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityRestService.java b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityRestService.java index 46f42b6c59..3b15dad13b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityRestService.java @@ -34,8 +34,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityService.java b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityService.java index db3c02f5e5..41273b0985 100644 --- a/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityService.java +++ b/projects/sitemanage/src/main/java/com/percussion/utils/service/impl/PSUtilityService.java @@ -25,7 +25,7 @@ import com.percussion.share.service.IPSSystemProperties; import com.percussion.utils.io.PathUtils; import com.percussion.utils.service.IPSUtilityService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderDefinitionData.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderDefinitionData.java index 25bc9732cb..404fb79bda 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderDefinitionData.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderDefinitionData.java @@ -20,8 +20,8 @@ import com.percussion.services.widgetbuilder.PSWidgetBuilderDefinition; import java.util.Objects; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; @XmlRootElement(name = "WidgetBuilderDefinitionData") public class PSWidgetBuilderDefinitionData extends PSWidgetBuilderSummaryData { diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderFieldsListData.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderFieldsListData.java index 3ef4b2e1da..78d6c73237 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderFieldsListData.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderFieldsListData.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Objects; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Container object for the list of fields diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderSummaryData.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderSummaryData.java index ce9e6dc2c6..b7494ac3fb 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderSummaryData.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderSummaryData.java @@ -20,7 +20,7 @@ import com.percussion.services.widgetbuilder.PSWidgetBuilderDefinition; import com.percussion.share.data.PSAbstractPersistantObject; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Lightweight version of {@link PSWidgetBuilderDefinitionData} for serialization of summary data diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderValidationResult.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderValidationResult.java index d94c4d141b..5c42d64797 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderValidationResult.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/data/PSWidgetBuilderValidationResult.java @@ -17,7 +17,7 @@ package com.percussion.widgetbuilder.data; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ @XmlRootElement(name = "WidgetBuilderValidationResult") diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/service/PSWidgetBuilderService.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/service/PSWidgetBuilderService.java index e3a855c84f..2bec6cd319 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/service/PSWidgetBuilderService.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/service/PSWidgetBuilderService.java @@ -52,7 +52,7 @@ import javax.ws.rs.core.MediaType; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.helper.Validate; diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSFileFieldValueGenerator.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSFileFieldValueGenerator.java index 7c72abe62c..0663f5c366 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSFileFieldValueGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSFileFieldValueGenerator.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.text.MessageFormat; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author Chris Burns */ public class PSFileFieldValueGenerator extends PSBasicFieldValueGenerator diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSImageFieldValueGenerator.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSImageFieldValueGenerator.java index 7ebbd96fd1..b8af78e3d6 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSImageFieldValueGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSImageFieldValueGenerator.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.text.MessageFormat; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ public class PSImageFieldValueGenerator extends PSBasicFieldValueGenerator diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSPageFieldValueGenerator.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSPageFieldValueGenerator.java index 4f2a1b3cfd..ab05352519 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSPageFieldValueGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSPageFieldValueGenerator.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.text.MessageFormat; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author Stephen Bolton */ public class PSPageFieldValueGenerator extends PSBasicFieldValueGenerator diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSRichTextFieldValueGenerator.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSRichTextFieldValueGenerator.java index 21c6b717b9..ae3bab48e9 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSRichTextFieldValueGenerator.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSRichTextFieldValueGenerator.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.text.MessageFormat; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ public class PSRichTextFieldValueGenerator extends PSBasicFieldValueGenerator diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageBuilder.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageBuilder.java index 855670b3af..6901b1276b 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageBuilder.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageBuilder.java @@ -34,8 +34,8 @@ import java.util.zip.ZipOutputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; /** * Build a widget package from a supplied specification diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageResolver.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageResolver.java index 7c9c350f2d..bae5a34d8f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageResolver.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageResolver.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; /** * Used to resolve tokens in widget package files diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageSpec.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageSpec.java index ad3308cfec..270a2d19f2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageSpec.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/PSWidgetPackageSpec.java @@ -21,9 +21,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.text.WordUtils; /** * Defines a widget package to create diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderFieldsValidator.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderFieldsValidator.java index 33d9724b94..227b0a8482 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderFieldsValidator.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderFieldsValidator.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author JaySeletz */ public class PSWidgetBuilderFieldsValidator { diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderGeneralValidator.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderGeneralValidator.java index 6889636000..0d1ec7c24f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderGeneralValidator.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/validate/PSWidgetBuilderGeneralValidator.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; /** @author JaySeletz */ public class PSWidgetBuilderGeneralValidator { diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSAclFileTransformer.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSAclFileTransformer.java index d8f2243119..b827e2b3e2 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSAclFileTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSAclFileTransformer.java @@ -30,7 +30,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.SAXException; /** diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSContentTypeFileTransformer.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSContentTypeFileTransformer.java index 9a1994d802..e166861eef 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSContentTypeFileTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSContentTypeFileTransformer.java @@ -44,7 +44,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.w3c.dom.Element; import org.xml.sax.SAXException; diff --git a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSResourceFileTransformer.java b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSResourceFileTransformer.java index 05c4d833f5..4434eb06e4 100644 --- a/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSResourceFileTransformer.java +++ b/projects/sitemanage/src/main/java/com/percussion/widgetbuilder/utils/xform/PSResourceFileTransformer.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Set; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Add resource entries for js and css files specified by the supplied package spec diff --git a/projects/sitemanage/src/main/java/com/percussion/workflow/data/PSUiWorkflow.java b/projects/sitemanage/src/main/java/com/percussion/workflow/data/PSUiWorkflow.java index 17a08387fa..046367cbdd 100644 --- a/projects/sitemanage/src/main/java/com/percussion/workflow/data/PSUiWorkflow.java +++ b/projects/sitemanage/src/main/java/com/percussion/workflow/data/PSUiWorkflow.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class contains the structure of the object returned by the Rest method located in sitemanage diff --git a/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowRestService.java b/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowRestService.java index 687cc6c4eb..d289572e95 100644 --- a/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowRestService.java +++ b/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowRestService.java @@ -41,7 +41,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowService.java b/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowService.java index a8682d3d8f..d75415f95f 100644 --- a/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowService.java +++ b/projects/sitemanage/src/main/java/com/percussion/workflow/service/impl/PSSteppedWorkflowService.java @@ -92,7 +92,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/projects/sitemanage/src/test/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoinerTest.java b/projects/sitemanage/src/test/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoinerTest.java index 432f361048..315c43b379 100644 --- a/projects/sitemanage/src/test/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoinerTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/assetmanagement/forms/service/impl/PSFormDataJoinerTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetRestServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetRestServiceTest.java index 832f1e5b35..959b0d12b7 100644 --- a/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetRestServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetRestServiceTest.java @@ -60,7 +60,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetServiceRestClient.java b/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetServiceRestClient.java index 2bef2a7373..b54da747a2 100644 --- a/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetServiceRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/assetmanagement/web/service/PSAssetServiceRestClient.java @@ -18,7 +18,7 @@ package com.percussion.assetmanagement.web.service; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.data.PSAssetDropCriteria; diff --git a/projects/sitemanage/src/test/java/com/percussion/category/web/service/PSJerseyRestClient.java b/projects/sitemanage/src/test/java/com/percussion/category/web/service/PSJerseyRestClient.java index 3478291fe9..61af79f4db 100644 --- a/projects/sitemanage/src/test/java/com/percussion/category/web/service/PSJerseyRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/category/web/service/PSJerseyRestClient.java @@ -17,11 +17,11 @@ package com.percussion.category.web.service; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.category.data.PSCategory; import com.percussion.share.test.PSRestTestCase; diff --git a/projects/sitemanage/src/test/java/com/percussion/content/PSGenericContentGenerator.java b/projects/sitemanage/src/test/java/com/percussion/content/PSGenericContentGenerator.java index 6ded11cec0..d5bb3a1b48 100644 --- a/projects/sitemanage/src/test/java/com/percussion/content/PSGenericContentGenerator.java +++ b/projects/sitemanage/src/test/java/com/percussion/content/PSGenericContentGenerator.java @@ -26,7 +26,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import javax.xml.bind.UnmarshalException; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/test/java/com/percussion/content/PSSiteGenerator.java b/projects/sitemanage/src/test/java/com/percussion/content/PSSiteGenerator.java index d2a7e87c68..906b61227d 100644 --- a/projects/sitemanage/src/test/java/com/percussion/content/PSSiteGenerator.java +++ b/projects/sitemanage/src/test/java/com/percussion/content/PSSiteGenerator.java @@ -28,7 +28,7 @@ import com.percussion.sitemanage.web.service.PSSiteRestClient; import com.percussion.sitemanage.web.service.PSSiteSectionRestClient; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSSiteGenerator extends PSGenerator { private PSSiteSectionRestClient sectionClient; diff --git a/projects/sitemanage/src/test/java/com/percussion/content/PSSiteTemplateRestClient.java b/projects/sitemanage/src/test/java/com/percussion/content/PSSiteTemplateRestClient.java index 93382f7963..32e035803d 100644 --- a/projects/sitemanage/src/test/java/com/percussion/content/PSSiteTemplateRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/content/PSSiteTemplateRestClient.java @@ -17,7 +17,7 @@ package com.percussion.content; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.pagemanagement.data.PSTemplateSummary; import com.percussion.share.test.PSObjectRestClient; diff --git a/projects/sitemanage/src/test/java/com/percussion/dashboardmanagement/PSDashboardGadgetGeneratorTest.java b/projects/sitemanage/src/test/java/com/percussion/dashboardmanagement/PSDashboardGadgetGeneratorTest.java index 96158f6183..a9735c2b96 100644 --- a/projects/sitemanage/src/test/java/com/percussion/dashboardmanagement/PSDashboardGadgetGeneratorTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/dashboardmanagement/PSDashboardGadgetGeneratorTest.java @@ -30,7 +30,7 @@ import java.io.InputStream; import java.net.URL; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGenerator.java b/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGenerator.java index b922218aa8..b635f34714 100644 --- a/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGenerator.java +++ b/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGenerator.java @@ -69,8 +69,8 @@ import net.sf.json.JSONObject; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.NameValuePair; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; /** * This class provide services to create content in a delivery server. You have to specify a server diff --git a/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGeneratorTest.java b/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGeneratorTest.java index f76a4b0fc2..eda50bee16 100644 --- a/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGeneratorTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/delivery/PSDeliveryContentGeneratorTest.java @@ -44,7 +44,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jmock.Mockery; import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; diff --git a/projects/sitemanage/src/test/java/com/percussion/delivery/client/PSDeliveryClientTests.java b/projects/sitemanage/src/test/java/com/percussion/delivery/client/PSDeliveryClientTests.java index ea64aa55b0..d6b3b1fbc2 100644 --- a/projects/sitemanage/src/test/java/com/percussion/delivery/client/PSDeliveryClientTests.java +++ b/projects/sitemanage/src/test/java/com/percussion/delivery/client/PSDeliveryClientTests.java @@ -27,7 +27,7 @@ import com.percussion.utils.testing.IntegrationTest; import java.util.ArrayList; import net.sf.json.JSONArray; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceRestClient.java b/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceRestClient.java index e3b8cc9913..193d4a5987 100644 --- a/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceRestClient.java @@ -22,7 +22,7 @@ import com.percussion.share.test.PSDataServiceRestClient; import java.util.List; import javax.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** @author miltonpividori */ public class PSFolderServiceRestClient extends PSDataServiceRestClient { diff --git a/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceTest.java index acfbcc7ebc..78b7493f30 100644 --- a/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/foldermanagement/service/PSFolderServiceTest.java @@ -43,7 +43,7 @@ import com.percussion.workflow.web.service.PSSteppedWorkflowRestServiceClient; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/service/PSSiteDataServletTestCaseFixture.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/service/PSSiteDataServletTestCaseFixture.java index 9335292ea5..4d101cb769 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/service/PSSiteDataServletTestCaseFixture.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/service/PSSiteDataServletTestCaseFixture.java @@ -17,11 +17,11 @@ package com.percussion.pagemanagement.service; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.service.IPSAssetService; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestClient.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestClient.java index 40ec0cff1d..6051038a86 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestClient.java @@ -18,8 +18,8 @@ package com.percussion.pagemanagement.web.service; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.pagemanagement.data.PSPage; import com.percussion.pagemanagement.data.PSRegion; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestServiceTest.java index 19035c98d6..90e0a70c40 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSPageRestServiceTest.java @@ -44,7 +44,7 @@ import com.percussion.share.test.PSTestDataCleaner; import com.percussion.utils.testing.IntegrationTest; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.After; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderLinkServiceClient.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderLinkServiceClient.java index f3b87e6ac6..3f9ea8517d 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderLinkServiceClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderLinkServiceClient.java @@ -16,7 +16,7 @@ */ package com.percussion.pagemanagement.web.service; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.pagemanagement.data.PSInlineLinkRequest; import com.percussion.pagemanagement.data.PSInlineRenderLink; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderServiceTest.java index f57f57693f..eb81ecefd2 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSRenderServiceTest.java @@ -19,8 +19,8 @@ import static com.percussion.pagemanagement.data.PSRegionTreeUtils.getChildRegions; import static com.percussion.pagemanagement.parser.PSTemplateRegionParser.parse; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.contains; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.contains; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceClient.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceClient.java index 366dceef72..dd9d4a0441 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceClient.java @@ -17,7 +17,7 @@ package com.percussion.pagemanagement.web.service; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; import com.percussion.pagemanagement.data.PSHtmlMetadata; import com.percussion.pagemanagement.data.PSTemplate; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceTest.java index d1bef9bbc1..27cfe3d484 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTemplateServiceTest.java @@ -29,7 +29,7 @@ import com.percussion.share.test.PSTestDataCleaner; import com.percussion.utils.testing.IntegrationTest; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTestSiteData.java b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTestSiteData.java index dabe3476e1..8a50206af2 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTestSiteData.java +++ b/projects/sitemanage/src/test/java/com/percussion/pagemanagement/web/service/PSTestSiteData.java @@ -20,7 +20,7 @@ import static com.percussion.share.test.PSRestTestCase.setupClient; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.web.service.PSAssetServiceRestClient; @@ -44,7 +44,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/projects/sitemanage/src/test/java/com/percussion/pathmanagement/web/service/PSPathServiceRestClient.java b/projects/sitemanage/src/test/java/com/percussion/pathmanagement/web/service/PSPathServiceRestClient.java index 09701e48c4..43023147eb 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pathmanagement/web/service/PSPathServiceRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/pathmanagement/web/service/PSPathServiceRestClient.java @@ -28,7 +28,7 @@ import com.percussion.share.data.PSPagedItemList; import com.percussion.share.test.PSDataServiceRestClient; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSPathServiceRestClient extends PSDataServiceRestClient { public PSPathServiceRestClient(String url) { diff --git a/projects/sitemanage/src/test/java/com/percussion/pubserver/PSDatabasePubServerFilesServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/pubserver/PSDatabasePubServerFilesServiceTest.java index 85b9ed9c72..8416d4d096 100644 --- a/projects/sitemanage/src/test/java/com/percussion/pubserver/PSDatabasePubServerFilesServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/pubserver/PSDatabasePubServerFilesServiceTest.java @@ -17,7 +17,7 @@ package com.percussion.pubserver; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/projects/sitemanage/src/test/java/com/percussion/recent/service/PSRecentServiceFixture.java b/projects/sitemanage/src/test/java/com/percussion/recent/service/PSRecentServiceFixture.java index 5a4e97adaf..7d0b7e7ce7 100644 --- a/projects/sitemanage/src/test/java/com/percussion/recent/service/PSRecentServiceFixture.java +++ b/projects/sitemanage/src/test/java/com/percussion/recent/service/PSRecentServiceFixture.java @@ -17,11 +17,11 @@ package com.percussion.recent.service; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.assetmanagement.data.PSAsset; import com.percussion.assetmanagement.service.IPSAssetService; diff --git a/projects/sitemanage/src/test/java/com/percussion/searchmanagement/PSSearchServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/searchmanagement/PSSearchServiceTest.java index c485832c5f..10ecadcb05 100644 --- a/projects/sitemanage/src/test/java/com/percussion/searchmanagement/PSSearchServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/searchmanagement/PSSearchServiceTest.java @@ -40,7 +40,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; diff --git a/projects/sitemanage/src/test/java/com/percussion/share/async/PSTestAsyncJob.java b/projects/sitemanage/src/test/java/com/percussion/share/async/PSTestAsyncJob.java index 15351cc022..c70787a4f4 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/async/PSTestAsyncJob.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/async/PSTestAsyncJob.java @@ -20,7 +20,7 @@ import com.percussion.utils.thread.PSThreadInterruptedException; import com.percussion.utils.thread.PSThreadUtils; import java.util.Date; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * A test job that takes in a number as it's config, and each time {@link #getStatus()} is called, diff --git a/projects/sitemanage/src/test/java/com/percussion/share/dao/PSJcrNodeMapTest.java b/projects/sitemanage/src/test/java/com/percussion/share/dao/PSJcrNodeMapTest.java index a358208e4a..49106f59f1 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/dao/PSJcrNodeMapTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/dao/PSJcrNodeMapTest.java @@ -17,7 +17,7 @@ package com.percussion.share.dao; import static com.percussion.share.test.PSMatchers.emptyString; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/projects/sitemanage/src/test/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformerTest.java b/projects/sitemanage/src/test/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformerTest.java index 74b9bf54b0..ccd14a04c6 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformerTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/extension/PSCleanReservedHtmlClassesInputTransformerTest.java @@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.junit.Test; diff --git a/projects/sitemanage/src/test/java/com/percussion/share/test/PSDataServiceRestClient.java b/projects/sitemanage/src/test/java/com/percussion/share/test/PSDataServiceRestClient.java index 5b2eda6c98..c85a25964c 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/test/PSDataServiceRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/test/PSDataServiceRestClient.java @@ -17,7 +17,7 @@ /** */ package com.percussion.share.test; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; import java.util.List; diff --git a/projects/sitemanage/src/test/java/com/percussion/share/test/PSMatchers.java b/projects/sitemanage/src/test/java/com/percussion/share/test/PSMatchers.java index 962fac2491..92a8b828d2 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/test/PSMatchers.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/test/PSMatchers.java @@ -16,8 +16,8 @@ */ package com.percussion.share.test; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isEmpty; import com.percussion.share.test.xml.PSXhtmlValidator; import java.io.InputStream; diff --git a/projects/sitemanage/src/test/java/com/percussion/share/test/PSRestClient.java b/projects/sitemanage/src/test/java/com/percussion/share/test/PSRestClient.java index a60b70fe7b..2d2d8d4b3b 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/test/PSRestClient.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/test/PSRestClient.java @@ -18,18 +18,19 @@ import static java.text.MessageFormat.format; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.delivery.client.EasySSLProtocolSocketFactory; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -49,8 +50,7 @@ import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.httpclient.protocol.Protocol; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; -import org.apache.commons.lang.CharEncoding; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -273,7 +273,7 @@ public String concatPath(String start, String... end) { public String escapePath(String path) { try { - return URLEncoder.encode(path, CharEncoding.UTF_8); + return URLEncoder.encode(path, StandardCharsets.UTF_8.name()); } catch (UnsupportedEncodingException e) { throw new RuntimeException("Should never happen", e); } diff --git a/projects/sitemanage/src/test/java/com/percussion/share/test/PSTestDataCleaner.java b/projects/sitemanage/src/test/java/com/percussion/share/test/PSTestDataCleaner.java index 0464f1e270..99f4edf702 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/test/PSTestDataCleaner.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/test/PSTestDataCleaner.java @@ -18,7 +18,7 @@ import static java.util.Arrays.asList; import static junit.framework.Assert.fail; -import static org.apache.commons.lang.Validate.noNullElements; +import static org.apache.commons.lang3.Validate.noNullElements; import java.util.ArrayList; import java.util.Collection; diff --git a/projects/sitemanage/src/test/java/com/percussion/share/test/xml/PSXhtmlValidator.java b/projects/sitemanage/src/test/java/com/percussion/share/test/xml/PSXhtmlValidator.java index bcddb596ca..22ee04538b 100644 --- a/projects/sitemanage/src/test/java/com/percussion/share/test/xml/PSXhtmlValidator.java +++ b/projects/sitemanage/src/test/java/com/percussion/share/test/xml/PSXhtmlValidator.java @@ -17,7 +17,7 @@ package com.percussion.share.test.xml; import static java.util.Collections.unmodifiableCollection; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.error.PSExceptionUtils; import com.percussion.security.xml.PSSecureXMLUtils; diff --git a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImportLoggerTest.java b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImportLoggerTest.java index aeb8f7a767..ea40a6b307 100644 --- a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImportLoggerTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImportLoggerTest.java @@ -23,7 +23,7 @@ import com.percussion.sitemanage.importer.data.PSImportLogEntry; import com.percussion.utils.testing.IntegrationTest; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImporterTest.java b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImporterTest.java index dde4380e87..deb7a398da 100644 --- a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImporterTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/PSSiteImporterTest.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.importer; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; diff --git a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSCSSParserTest.java b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSCSSParserTest.java index f5c7337878..c5fd8c92cf 100644 --- a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSCSSParserTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSCSSParserTest.java @@ -16,7 +16,7 @@ */ package com.percussion.sitemanage.importer.theme; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporterTest.java b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporterTest.java index 4dd87b1ee2..75d09cbac4 100644 --- a/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporterTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/sitemanage/importer/theme/PSHTMLHeaderImporterTest.java @@ -28,7 +28,7 @@ import java.io.File; import java.io.IOException; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteDataServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteDataServiceTest.java index 9667bc1ac1..6460b04fef 100644 --- a/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteDataServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteDataServiceTest.java @@ -17,8 +17,8 @@ package com.percussion.sitemanage.web.service; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteTemplateServiceTest.java b/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteTemplateServiceTest.java index 64720a14f0..e4e30263e1 100644 --- a/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteTemplateServiceTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/sitemanage/web/service/PSSiteTemplateServiceTest.java @@ -48,8 +48,8 @@ import com.percussion.utils.testing.IntegrationTest; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.StopWatch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; diff --git a/projects/sitemanage/src/test/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBeanTest.java b/projects/sitemanage/src/test/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBeanTest.java index f4321fc779..0b73794e1f 100644 --- a/projects/sitemanage/src/test/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBeanTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/user/service/impl/PSDefaultPasswordEncryptionBeanTest.java @@ -21,7 +21,7 @@ import com.github.javafaker.Faker; import com.percussion.security.PSEncryptionException; import com.percussion.security.PSPasswordHandler; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Test; diff --git a/projects/sitemanage/src/test/java/com/percussion/utils/PSTokenReplacingReaderTest.java b/projects/sitemanage/src/test/java/com/percussion/utils/PSTokenReplacingReaderTest.java index e66f47edc0..75225a26b1 100644 --- a/projects/sitemanage/src/test/java/com/percussion/utils/PSTokenReplacingReaderTest.java +++ b/projects/sitemanage/src/test/java/com/percussion/utils/PSTokenReplacingReaderTest.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Set; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; /** @author JaySeletz */ diff --git a/rest/pom.xml b/rest/pom.xml index ff9116bd51..69131a8c40 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -122,10 +122,6 @@ org.apache.tika tika-core - - commons-lang - commons-lang - com.percussion rxutils diff --git a/rest/src/main/java/com/percussion/rest/actions/ActionMenuResource.java b/rest/src/main/java/com/percussion/rest/actions/ActionMenuResource.java index 40a35d5003..6fab589dbd 100644 --- a/rest/src/main/java/com/percussion/rest/actions/ActionMenuResource.java +++ b/rest/src/main/java/com/percussion/rest/actions/ActionMenuResource.java @@ -38,7 +38,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/rest/src/main/java/com/percussion/rest/assets/AssetsResource.java b/rest/src/main/java/com/percussion/rest/assets/AssetsResource.java index 581d9ca58a..d3b255f0f8 100644 --- a/rest/src/main/java/com/percussion/rest/assets/AssetsResource.java +++ b/rest/src/main/java/com/percussion/rest/assets/AssetsResource.java @@ -66,7 +66,7 @@ import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.UriInfo; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.EmailException; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.logging.log4j.LogManager; diff --git a/rest/src/main/java/com/percussion/rest/folders/FoldersResource.java b/rest/src/main/java/com/percussion/rest/folders/FoldersResource.java index 89d8bdf06a..5596b94ac2 100644 --- a/rest/src/main/java/com/percussion/rest/folders/FoldersResource.java +++ b/rest/src/main/java/com/percussion/rest/folders/FoldersResource.java @@ -49,7 +49,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/rest/src/main/java/com/percussion/rest/pages/PagesResource.java b/rest/src/main/java/com/percussion/rest/pages/PagesResource.java index cbb69ad8f1..dc32e0f4ae 100644 --- a/rest/src/main/java/com/percussion/rest/pages/PagesResource.java +++ b/rest/src/main/java/com/percussion/rest/pages/PagesResource.java @@ -50,7 +50,7 @@ import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.UriInfo; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/rest/src/main/java/com/percussion/rest/preferences/PreferenceResource.java b/rest/src/main/java/com/percussion/rest/preferences/PreferenceResource.java index 902b6ccdb1..52212d52f7 100644 --- a/rest/src/main/java/com/percussion/rest/preferences/PreferenceResource.java +++ b/rest/src/main/java/com/percussion/rest/preferences/PreferenceResource.java @@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/Testing/src/com/percussion/cms/objectstore/server/util/PSFieldFinderUtilTest.java b/system/Testing/src/com/percussion/cms/objectstore/server/util/PSFieldFinderUtilTest.java index 68fb15dd3e..1a8c9fa2a9 100644 --- a/system/Testing/src/com/percussion/cms/objectstore/server/util/PSFieldFinderUtilTest.java +++ b/system/Testing/src/com/percussion/cms/objectstore/server/util/PSFieldFinderUtilTest.java @@ -26,7 +26,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; import org.w3c.dom.Document; diff --git a/system/Testing/src/com/percussion/data/PSResultSetTest.java b/system/Testing/src/com/percussion/data/PSResultSetTest.java index 473053a032..c074698fe0 100644 --- a/system/Testing/src/com/percussion/data/PSResultSetTest.java +++ b/system/Testing/src/com/percussion/data/PSResultSetTest.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; /** * Unit tests for the PSResultSet class diff --git a/system/Testing/src/com/percussion/design/catalog/data/PSDatasourceCatalogHandlerTest.java b/system/Testing/src/com/percussion/design/catalog/data/PSDatasourceCatalogHandlerTest.java index e347cb8a40..914d0febda 100644 --- a/system/Testing/src/com/percussion/design/catalog/data/PSDatasourceCatalogHandlerTest.java +++ b/system/Testing/src/com/percussion/design/catalog/data/PSDatasourceCatalogHandlerTest.java @@ -26,7 +26,7 @@ import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; import org.w3c.dom.Document; diff --git a/system/Testing/src/com/percussion/design/objectstore/PSApplicationTest.java b/system/Testing/src/com/percussion/design/objectstore/PSApplicationTest.java index 3edcdaae07..ae520b429f 100644 --- a/system/Testing/src/com/percussion/design/objectstore/PSApplicationTest.java +++ b/system/Testing/src/com/percussion/design/objectstore/PSApplicationTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/Testing/src/com/percussion/design/objectstore/PSJdbcDriverConfigTest.java b/system/Testing/src/com/percussion/design/objectstore/PSJdbcDriverConfigTest.java index 4e594223cc..b03eb9edea 100644 --- a/system/Testing/src/com/percussion/design/objectstore/PSJdbcDriverConfigTest.java +++ b/system/Testing/src/com/percussion/design/objectstore/PSJdbcDriverConfigTest.java @@ -19,7 +19,7 @@ import com.percussion.utils.tools.PSTestUtils; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.w3c.dom.Document; import junit.framework.TestCase; diff --git a/system/Testing/src/com/percussion/design/objectstore/PSObjectStoreTest.java b/system/Testing/src/com/percussion/design/objectstore/PSObjectStoreTest.java index 6ef9ca60a4..5178c95222 100644 --- a/system/Testing/src/com/percussion/design/objectstore/PSObjectStoreTest.java +++ b/system/Testing/src/com/percussion/design/objectstore/PSObjectStoreTest.java @@ -45,7 +45,7 @@ import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.BasicConfigurator; import org.junit.BeforeClass; import org.junit.Test; diff --git a/system/Testing/src/com/percussion/design/objectstore/PSRevisionHistoryTest.java b/system/Testing/src/com/percussion/design/objectstore/PSRevisionHistoryTest.java index 4e158a60e0..4f45c86219 100644 --- a/system/Testing/src/com/percussion/design/objectstore/PSRevisionHistoryTest.java +++ b/system/Testing/src/com/percussion/design/objectstore/PSRevisionHistoryTest.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/Testing/src/com/percussion/install/PSUpgradePluginUpdateCategoryTreeTest.java b/system/Testing/src/com/percussion/install/PSUpgradePluginUpdateCategoryTreeTest.java index 37a1e051d1..f3deb41eab 100644 --- a/system/Testing/src/com/percussion/install/PSUpgradePluginUpdateCategoryTreeTest.java +++ b/system/Testing/src/com/percussion/install/PSUpgradePluginUpdateCategoryTreeTest.java @@ -23,7 +23,7 @@ import java.io.File; import java.io.FileInputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterHtmlTest.java b/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterHtmlTest.java index 2c6283999c..fbf4defb20 100644 --- a/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterHtmlTest.java +++ b/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterHtmlTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.percussion.utils.tools.IPSUtilsConstants; diff --git a/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterTest.java b/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterTest.java index 2a3a06b199..5fa22ffdbd 100644 --- a/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterTest.java +++ b/system/Testing/src/com/percussion/search/lucene/textconverter/PSTextConverterTest.java @@ -18,7 +18,7 @@ import com.percussion.search.lucene.IPSLuceneConstants; import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Ignore; import java.io.File; diff --git a/system/Testing/src/com/percussion/server/PSPageCacheTest.java b/system/Testing/src/com/percussion/server/PSPageCacheTest.java index e281aec6cd..99f3ef919a 100644 --- a/system/Testing/src/com/percussion/server/PSPageCacheTest.java +++ b/system/Testing/src/com/percussion/server/PSPageCacheTest.java @@ -25,7 +25,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import static org.apache.commons.lang.exception.ExceptionUtils.getFullStackTrace; +import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace; public class PSPageCacheTest extends TestCase { @@ -77,7 +77,7 @@ public void testPSPageCache() } catch (Exception e) { - assertEquals("Exception caught" + getFullStackTrace(e), 0, 1); + assertEquals("Exception caught" + getStackTrace(e), 0, 1); } } diff --git a/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlDbExtensionsTest.java b/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlDbExtensionsTest.java index 0cf6a7a40d..3484c6a504 100644 --- a/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlDbExtensionsTest.java +++ b/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlDbExtensionsTest.java @@ -19,7 +19,7 @@ import com.percussion.error.PSExceptionUtils; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.velocity.VelocityContext; diff --git a/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlExtensionsTest.java b/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlExtensionsTest.java index 7d6a7f05cf..c96681bcd1 100644 --- a/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlExtensionsTest.java +++ b/system/Testing/src/com/percussion/services/assembly/jexl/PSJexlExtensionsTest.java @@ -21,7 +21,7 @@ import com.percussion.services.contentmgr.data.PSContentNode; import com.percussion.utils.jsr170.PSProperty; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.velocity.VelocityContext; diff --git a/system/Testing/src/com/percussion/services/content/PSContentServiceTest.java b/system/Testing/src/com/percussion/services/content/PSContentServiceTest.java index 72b8830b5b..758b1aa68c 100644 --- a/system/Testing/src/com/percussion/services/content/PSContentServiceTest.java +++ b/system/Testing/src/com/percussion/services/content/PSContentServiceTest.java @@ -21,7 +21,7 @@ import com.percussion.services.content.data.PSKeyword; import com.percussion.services.content.data.PSKeywordChoice; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Test; diff --git a/system/Testing/src/com/percussion/services/memory/PSCacheAccessTest.java b/system/Testing/src/com/percussion/services/memory/PSCacheAccessTest.java index 79061b1d89..dec9bf9c53 100644 --- a/system/Testing/src/com/percussion/services/memory/PSCacheAccessTest.java +++ b/system/Testing/src/com/percussion/services/memory/PSCacheAccessTest.java @@ -20,7 +20,7 @@ import com.percussion.utils.timing.PSStopwatch; import junit.framework.TestCase; import net.sf.ehcache.CacheManager; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/system/Testing/src/com/percussion/services/schedule/PSSchedulingServiceTest.java b/system/Testing/src/com/percussion/services/schedule/PSSchedulingServiceTest.java index a8df9efe0d..46a493a508 100644 --- a/system/Testing/src/com/percussion/services/schedule/PSSchedulingServiceTest.java +++ b/system/Testing/src/com/percussion/services/schedule/PSSchedulingServiceTest.java @@ -31,7 +31,7 @@ import java.util.Set; import com.percussion.utils.testing.IntegrationTest; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/system/Testing/src/com/percussion/services/schedule/data/PSJobTest.java b/system/Testing/src/com/percussion/services/schedule/data/PSJobTest.java index f2e97d1e7e..c99214c4f9 100644 --- a/system/Testing/src/com/percussion/services/schedule/data/PSJobTest.java +++ b/system/Testing/src/com/percussion/services/schedule/data/PSJobTest.java @@ -18,7 +18,7 @@ import com.percussion.services.catalog.PSTypeEnum; import com.percussion.services.guidmgr.data.PSGuid; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; /** * @author Andriy Palamarchuk diff --git a/system/Testing/src/com/percussion/services/schedule/data/PSScheduleTest.java b/system/Testing/src/com/percussion/services/schedule/data/PSScheduleTest.java index f9cb2651f3..4e69ab31d0 100644 --- a/system/Testing/src/com/percussion/services/schedule/data/PSScheduleTest.java +++ b/system/Testing/src/com/percussion/services/schedule/data/PSScheduleTest.java @@ -20,8 +20,8 @@ import com.percussion.services.guidmgr.data.PSGuid; import com.percussion.services.schedule.data.PSScheduledTask.ByLabelComparator; -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; /** * @author Andriy Palamarchuk diff --git a/system/Testing/src/com/percussion/services/sitemgr/PSSiteManagerTest.java b/system/Testing/src/com/percussion/services/sitemgr/PSSiteManagerTest.java index 71707c5d4c..3576585d32 100644 --- a/system/Testing/src/com/percussion/services/sitemgr/PSSiteManagerTest.java +++ b/system/Testing/src/com/percussion/services/sitemgr/PSSiteManagerTest.java @@ -37,7 +37,7 @@ import com.percussion.utils.types.PSPair; import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Test; diff --git a/system/Testing/src/com/percussion/services/system/data/PSSharedPropertyTest.java b/system/Testing/src/com/percussion/services/system/data/PSSharedPropertyTest.java index 7ad928e6e2..90a490d6e7 100644 --- a/system/Testing/src/com/percussion/services/system/data/PSSharedPropertyTest.java +++ b/system/Testing/src/com/percussion/services/system/data/PSSharedPropertyTest.java @@ -28,7 +28,7 @@ import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/system/Testing/src/com/percussion/test/ant/PSMakeFilterFileTask.java b/system/Testing/src/com/percussion/test/ant/PSMakeFilterFileTask.java index a7c7cf9b49..b144153ced 100644 --- a/system/Testing/src/com/percussion/test/ant/PSMakeFilterFileTask.java +++ b/system/Testing/src/com/percussion/test/ant/PSMakeFilterFileTask.java @@ -18,7 +18,7 @@ import com.percussion.security.xml.PSSecureXMLUtils; import com.percussion.security.xml.PSXmlSecurityOptions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.w3c.dom.Document; diff --git a/system/Testing/src/com/percussion/test/data/CreateWorkflows.java b/system/Testing/src/com/percussion/test/data/CreateWorkflows.java index dead8b6505..d8d92cfc13 100644 --- a/system/Testing/src/com/percussion/test/data/CreateWorkflows.java +++ b/system/Testing/src/com/percussion/test/data/CreateWorkflows.java @@ -18,7 +18,7 @@ import com.percussion.util.PSRemoteRequester; import com.percussion.utils.xml.PSXmlUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/Testing/src/com/percussion/test/ldap/PSLdapGroupUserGenerator.java b/system/Testing/src/com/percussion/test/ldap/PSLdapGroupUserGenerator.java index 118eb22881..519f341bc1 100644 --- a/system/Testing/src/com/percussion/test/ldap/PSLdapGroupUserGenerator.java +++ b/system/Testing/src/com/percussion/test/ldap/PSLdapGroupUserGenerator.java @@ -26,7 +26,7 @@ import java.util.Random; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class was created to generate an LDIF file containing a set of groups diff --git a/system/Testing/src/com/percussion/testing/PSFolderTreeCreator.java b/system/Testing/src/com/percussion/testing/PSFolderTreeCreator.java index a795c5f178..911947b7e3 100644 --- a/system/Testing/src/com/percussion/testing/PSFolderTreeCreator.java +++ b/system/Testing/src/com/percussion/testing/PSFolderTreeCreator.java @@ -32,7 +32,7 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Create a folder tree for test purposes. Inspired by diff --git a/system/Testing/src/com/percussion/testing/PSTestSetupBean.java b/system/Testing/src/com/percussion/testing/PSTestSetupBean.java index 0cd852d1fa..10226b3930 100644 --- a/system/Testing/src/com/percussion/testing/PSTestSetupBean.java +++ b/system/Testing/src/com/percussion/testing/PSTestSetupBean.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/Testing/src/com/percussion/util/PSBaseHttpUtilsTest.java b/system/Testing/src/com/percussion/util/PSBaseHttpUtilsTest.java index 05a1e5e338..8b3487679f 100644 --- a/system/Testing/src/com/percussion/util/PSBaseHttpUtilsTest.java +++ b/system/Testing/src/com/percussion/util/PSBaseHttpUtilsTest.java @@ -19,7 +19,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.ByteArrayInputStream; import java.net.URLEncoder; diff --git a/system/Tools/Converters/src/com/percussion/converters/variantconverter/PSVariantConverter.java b/system/Tools/Converters/src/com/percussion/converters/variantconverter/PSVariantConverter.java index 7a887799a1..afc58fae56 100644 --- a/system/Tools/Converters/src/com/percussion/converters/variantconverter/PSVariantConverter.java +++ b/system/Tools/Converters/src/com/percussion/converters/variantconverter/PSVariantConverter.java @@ -27,8 +27,8 @@ import com.percussion.util.PSSqlHelper; import com.percussion.util.PSStringOperation; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/data/ImageMetaData.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/data/ImageMetaData.java index 39f9562e4f..f41aa37760 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/data/ImageMetaData.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/data/ImageMetaData.java @@ -17,7 +17,7 @@ package com.percussion.widgets.image.data; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetInputTranslation.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetInputTranslation.java index 6b2ed30c73..c7f4c2019b 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetInputTranslation.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetInputTranslation.java @@ -39,7 +39,7 @@ import com.percussion.widgets.image.web.impl.ImageReader; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetOutputTranslation.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetOutputTranslation.java index 789b32d109..9a9d4eabb7 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetOutputTranslation.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/ImageAssetOutputTranslation.java @@ -36,7 +36,7 @@ import com.percussion.widgets.image.data.ImageData; import com.percussion.widgets.image.services.ImageCacheManager; import com.percussion.widgets.image.services.ImageCacheManagerLocator; - import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/PSItemXMLSupport.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/PSItemXMLSupport.java index 6799ddb95e..fe8f99b344 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/PSItemXMLSupport.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/extensions/PSItemXMLSupport.java @@ -20,8 +20,8 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.ArrayList; import java.util.List; - import org.apache.commons.lang.StringUtils; - import org.apache.commons.lang.Validate; + import org.apache.commons.lang3.StringUtils; + import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageCacheManagerImpl.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageCacheManagerImpl.java index 319022abde..959a39a762 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageCacheManagerImpl.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageCacheManagerImpl.java @@ -23,7 +23,7 @@ import com.percussion.widgets.image.services.ImageCacheManager; import net.sf.ehcache.Cache; import net.sf.ehcache.Element; - import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageResizeManagerImpl.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageResizeManagerImpl.java index 0066bb0913..ea0cbd9183 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageResizeManagerImpl.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/services/impl/ImageResizeManagerImpl.java @@ -20,7 +20,7 @@ import com.percussion.error.PSExceptionUtils; import com.percussion.widgets.image.data.ImageData; import com.percussion.widgets.image.services.ImageResizeManager; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryImageController.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryImageController.java index f0311ba600..250d6377e3 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryImageController.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryImageController.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.springframework.web.servlet.ModelAndView; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryUploadController.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryUploadController.java index 335605bb70..98fa49d73d 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryUploadController.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/BinaryUploadController.java @@ -26,7 +26,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JSONSerializer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageRequestController.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageRequestController.java index 06c7aec86f..57f8035b88 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageRequestController.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageRequestController.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import net.sf.json.JSON; import net.sf.json.JSONSerializer; - import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.springframework.web.servlet.ModelAndView; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageResizeController.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageResizeController.java index 9725ce76a2..80f2d19cea 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageResizeController.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/web/impl/ImageResizeController.java @@ -26,7 +26,7 @@ import net.sf.json.JSON; import net.sf.json.JSONObject; import net.sf.json.JSONSerializer; - import org.apache.commons.lang.Validate; + import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/webservice/ImageService.java b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/webservice/ImageService.java index 87835f5626..09da2d5ef8 100644 --- a/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/webservice/ImageService.java +++ b/system/Tools/ImageWidgetService/src/com/percussion/widgets/image/webservice/ImageService.java @@ -25,7 +25,7 @@ import java.awt.Rectangle; import java.io.ByteArrayInputStream; import java.io.InputStream; - import org.apache.commons.lang.Validate; + import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/system/Tools/InstallerBot/src/com/percussion/installerbot/PSExpectJConsoleAppDriver.java b/system/Tools/InstallerBot/src/com/percussion/installerbot/PSExpectJConsoleAppDriver.java index e055eb9e6d..8e83d0b1bb 100644 --- a/system/Tools/InstallerBot/src/com/percussion/installerbot/PSExpectJConsoleAppDriver.java +++ b/system/Tools/InstallerBot/src/com/percussion/installerbot/PSExpectJConsoleAppDriver.java @@ -18,7 +18,7 @@ package com.percussion.installerbot; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import expectj.ExpectJ; import expectj.ExpectJException; diff --git a/system/Tools/InstallerBot/src/com/percussion/installerbot/PSRxInstallerBot.java b/system/Tools/InstallerBot/src/com/percussion/installerbot/PSRxInstallerBot.java index 755822739d..6ea46f2c0b 100644 --- a/system/Tools/InstallerBot/src/com/percussion/installerbot/PSRxInstallerBot.java +++ b/system/Tools/InstallerBot/src/com/percussion/installerbot/PSRxInstallerBot.java @@ -16,7 +16,7 @@ package com.percussion.installerbot; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import java.io.BufferedReader; diff --git a/system/Tools/InstallerBot/test/com/percussion/installerbot/PSConsoleAppDriverExceptionTest.java b/system/Tools/InstallerBot/test/com/percussion/installerbot/PSConsoleAppDriverExceptionTest.java index acfba8950e..19c79b366f 100644 --- a/system/Tools/InstallerBot/test/com/percussion/installerbot/PSConsoleAppDriverExceptionTest.java +++ b/system/Tools/InstallerBot/test/com/percussion/installerbot/PSConsoleAppDriverExceptionTest.java @@ -11,7 +11,7 @@ package com.percussion.installerbot; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.percussion.installerbot.PSConsoleAppDriverException; diff --git a/system/Tools/InstallerBot/test/com/percussion/installerbot/PSRxInstallerBotTest.java b/system/Tools/InstallerBot/test/com/percussion/installerbot/PSRxInstallerBotTest.java index 3756a6f861..43c73ffe01 100644 --- a/system/Tools/InstallerBot/test/com/percussion/installerbot/PSRxInstallerBotTest.java +++ b/system/Tools/InstallerBot/test/com/percussion/installerbot/PSRxInstallerBotTest.java @@ -51,7 +51,7 @@ import java.util.Date; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jmock.cglib.Mock; import org.jmock.cglib.MockObjectTestCase; diff --git a/system/Tools/RxFix/src/com/percussion/rxfix/PSFixResult.java b/system/Tools/RxFix/src/com/percussion/rxfix/PSFixResult.java index 6bab43c670..01935e6a51 100644 --- a/system/Tools/RxFix/src/com/percussion/rxfix/PSFixResult.java +++ b/system/Tools/RxFix/src/com/percussion/rxfix/PSFixResult.java @@ -16,7 +16,7 @@ */ package com.percussion.rxfix; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Each fix (or preview) results in a result. The result has a status and a diff --git a/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixAllowedSitePropertiesWithBadSites.java b/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixAllowedSitePropertiesWithBadSites.java index 873017e9bb..a12e66302d 100644 --- a/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixAllowedSitePropertiesWithBadSites.java +++ b/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixAllowedSitePropertiesWithBadSites.java @@ -26,7 +26,7 @@ import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixInvalidSysTitle.java b/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixInvalidSysTitle.java index 105d323cd1..1c19de0b71 100644 --- a/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixInvalidSysTitle.java +++ b/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixInvalidSysTitle.java @@ -37,7 +37,7 @@ import com.percussion.util.PSStringTemplate; import com.percussion.util.PSStringTemplate.PSStringTemplateException; import com.percussion.utils.jdbc.PSConnectionHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixPageCatalog.java b/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixPageCatalog.java index 91c70d26a4..fded3b1f43 100644 --- a/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixPageCatalog.java +++ b/system/Tools/RxFix/src/com/percussion/rxfix/dbfixes/PSFixPageCatalog.java @@ -26,7 +26,7 @@ import com.percussion.services.catalog.PSTypeEnum; import com.percussion.services.guidmgr.PSGuidUtils; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/delivery/client/PSDeliveryClient.java b/system/business/src/com/percussion/delivery/client/PSDeliveryClient.java index 61b40e253b..466e21c75e 100644 --- a/system/business/src/com/percussion/delivery/client/PSDeliveryClient.java +++ b/system/business/src/com/percussion/delivery/client/PSDeliveryClient.java @@ -56,7 +56,7 @@ import org.apache.commons.httpclient.protocol.Protocol; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -72,8 +72,8 @@ import java.util.Collection; import java.util.List; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * @author wesleyhirsch diff --git a/system/business/src/com/percussion/delivery/client/PSDeliveryHttpErrorSupport.java b/system/business/src/com/percussion/delivery/client/PSDeliveryHttpErrorSupport.java index 04e67e8247..0c287f8461 100644 --- a/system/business/src/com/percussion/delivery/client/PSDeliveryHttpErrorSupport.java +++ b/system/business/src/com/percussion/delivery/client/PSDeliveryHttpErrorSupport.java @@ -17,7 +17,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Helpers for operator-friendly delivery-client failure messages: full action URL + HTTP method + diff --git a/system/business/src/com/percussion/delivery/client/TLSV12ProtocolSocketFactory.java b/system/business/src/com/percussion/delivery/client/TLSV12ProtocolSocketFactory.java index 2f913fbf28..2ae0a33e86 100644 --- a/system/business/src/com/percussion/delivery/client/TLSV12ProtocolSocketFactory.java +++ b/system/business/src/com/percussion/delivery/client/TLSV12ProtocolSocketFactory.java @@ -21,7 +21,7 @@ import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/delivery/metadata/PSMetadataExtractorService.java b/system/business/src/com/percussion/delivery/metadata/PSMetadataExtractorService.java index 0fceafa45f..9f8cd32d15 100644 --- a/system/business/src/com/percussion/delivery/metadata/PSMetadataExtractorService.java +++ b/system/business/src/com/percussion/delivery/metadata/PSMetadataExtractorService.java @@ -23,8 +23,8 @@ import com.percussion.delivery.metadata.extractor.data.PSMetadataEntry; import com.percussion.delivery.metadata.extractor.data.PSMetadataProperty; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.rdf4j.rio.RDFFormat; @@ -52,14 +52,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.apache.commons.lang.StringUtils.contains; -import static org.apache.commons.lang.StringUtils.endsWith; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.StringUtils.substringAfter; -import static org.apache.commons.lang.StringUtils.substringBefore; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.contains; +import static org.apache.commons.lang3.StringUtils.endsWith; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.StringUtils.substringAfter; +import static org.apache.commons.lang3.StringUtils.substringBefore; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; /** * Responsible for extracting the metadata from a given page and returning a @@ -486,7 +486,11 @@ private static String rewriteNonXmlNamedEntities(String html) { StringBuffer sb = new StringBuffer(); while (matcher.find()) { String entityName = matcher.group(1); - String resolved = org.apache.commons.lang.StringEscapeUtils.unescapeHtml("&" + entityName + ";"); + // commons-text 1.15.0 removed the legacy `StringEscapeUtils.unescapeHtml(...)` + // shortcut in favor of the static CharSequenceTranslator constants. + // UNESCAPE_HTML4 handles the same set of named HTML entities. + String resolved = + org.apache.commons.text.StringEscapeUtils.UNESCAPE_HTML4.translate("&" + entityName + ";"); if (resolved.length() == 1) { matcher.appendReplacement(sb, "&#" + (int) resolved.charAt(0) + ";"); } else { diff --git a/system/business/src/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java b/system/business/src/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java index e0bc99c0e3..393cffc233 100644 --- a/system/business/src/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java +++ b/system/business/src/com/percussion/delivery/metadata/extractor/data/PSMetadataProperty.java @@ -18,8 +18,8 @@ package com.percussion.delivery.metadata.extractor.data; import com.percussion.delivery.metadata.IPSMetadataProperty; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/system/business/src/com/percussion/delivery/metadata/rdfa/PSTripleHandler.java b/system/business/src/com/percussion/delivery/metadata/rdfa/PSTripleHandler.java index eb01eb5a65..bb5b5f3251 100644 --- a/system/business/src/com/percussion/delivery/metadata/rdfa/PSTripleHandler.java +++ b/system/business/src/com/percussion/delivery/metadata/rdfa/PSTripleHandler.java @@ -20,7 +20,7 @@ import com.percussion.delivery.metadata.PSMetadataExtractorService; import com.percussion.delivery.metadata.extractor.data.PSMetadataProperty; import com.percussion.error.PSExceptionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.rdf4j.model.IRI; diff --git a/system/business/src/com/percussion/delivery/metadata/solr/impl/SolrConfigLoader.java b/system/business/src/com/percussion/delivery/metadata/solr/impl/SolrConfigLoader.java index cde8b793c2..b9dc15f4a6 100644 --- a/system/business/src/com/percussion/delivery/metadata/solr/impl/SolrConfigLoader.java +++ b/system/business/src/com/percussion/delivery/metadata/solr/impl/SolrConfigLoader.java @@ -27,7 +27,7 @@ import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoLoader.java b/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoLoader.java index 2636c23391..601f1d257c 100644 --- a/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoLoader.java +++ b/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoLoader.java @@ -17,7 +17,7 @@ package com.percussion.delivery.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.delivery.data.PSDeliveryInfo; import com.percussion.delivery.service.impl.DeliveryServer.Password; @@ -39,7 +39,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoService.java b/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoService.java index c43e477368..8411a673f2 100644 --- a/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoService.java +++ b/system/business/src/com/percussion/delivery/service/impl/PSDeliveryInfoService.java @@ -35,7 +35,7 @@ import com.percussion.services.pubserver.data.PSPubServer; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.io.PathUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigLoader.java b/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigLoader.java index 29d78c8314..469fe89b57 100644 --- a/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigLoader.java +++ b/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigLoader.java @@ -16,10 +16,10 @@ */ package com.percussion.proxyconfig.service.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import static com.percussion.share.dao.PSSerializerUtils.unmarshalWithValidation; import static com.percussion.share.dao.PSSerializerUtils.marshal; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.error.PSExceptionUtils; import com.percussion.proxyconfig.data.PSProxyConfig; diff --git a/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigService.java b/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigService.java index 9c8cc1fe05..99d93d9a24 100644 --- a/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigService.java +++ b/system/business/src/com/percussion/proxyconfig/service/impl/PSProxyConfigService.java @@ -16,8 +16,8 @@ */ package com.percussion.proxyconfig.service.impl; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.proxyconfig.data.PSProxyConfig; import com.percussion.proxyconfig.service.IPSProxyConfigService; diff --git a/system/business/src/com/percussion/rx/admin/jsf/beans/PSAdminConsoleBean.java b/system/business/src/com/percussion/rx/admin/jsf/beans/PSAdminConsoleBean.java index 1a2ee41d81..9aaeea7362 100644 --- a/system/business/src/com/percussion/rx/admin/jsf/beans/PSAdminConsoleBean.java +++ b/system/business/src/com/percussion/rx/admin/jsf/beans/PSAdminConsoleBean.java @@ -24,7 +24,7 @@ import com.percussion.server.command.PSConsoleCommandParser; import com.percussion.utils.request.PSRequestInfo; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import java.io.IOException; diff --git a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskContainerNode.java b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskContainerNode.java index 7b9256f53a..70954fea3b 100644 --- a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskContainerNode.java +++ b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskContainerNode.java @@ -16,7 +16,7 @@ */ package com.percussion.rx.admin.jsf.nodes; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.rx.jsf.PSEditableNodeContainer; import com.percussion.rx.jsf.PSNodeBase; @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskLogNode.java b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskLogNode.java index fa5acb9855..6ce9b44ee8 100644 --- a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskLogNode.java +++ b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskLogNode.java @@ -25,7 +25,7 @@ import com.percussion.services.schedule.PSSchedulingServiceLocator; import com.percussion.services.schedule.data.PSScheduledTaskLog; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNode.java b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNode.java index a4caef13c0..9bd39939d3 100644 --- a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNode.java +++ b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNode.java @@ -17,7 +17,7 @@ package com.percussion.rx.admin.jsf.nodes; import static com.percussion.utils.string.PSStringUtils.notBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.i18n.PSI18nUtils; import com.percussion.rx.jsf.PSEditableNode; @@ -47,7 +47,7 @@ import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNotificationNode.java b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNotificationNode.java index 107c06e9f9..3d02a66e8e 100644 --- a/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNotificationNode.java +++ b/system/business/src/com/percussion/rx/admin/jsf/nodes/PSTaskNotificationNode.java @@ -17,7 +17,7 @@ package com.percussion.rx.admin.jsf.nodes; import static com.percussion.utils.string.PSStringUtils.notBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.rx.jsf.PSEditableNode; import com.percussion.services.schedule.IPSSchedulingService; diff --git a/system/business/src/com/percussion/rx/audit/PSDesignObjectAuditor.java b/system/business/src/com/percussion/rx/audit/PSDesignObjectAuditor.java index 7ec35a8f79..6b2390c2d8 100644 --- a/system/business/src/com/percussion/rx/audit/PSDesignObjectAuditor.java +++ b/system/business/src/com/percussion/rx/audit/PSDesignObjectAuditor.java @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; /** diff --git a/system/business/src/com/percussion/rx/delivery/data/PSDeliveryResult.java b/system/business/src/com/percussion/rx/delivery/data/PSDeliveryResult.java index 1fae88e099..9ca2b0b088 100644 --- a/system/business/src/com/percussion/rx/delivery/data/PSDeliveryResult.java +++ b/system/business/src/com/percussion/rx/delivery/data/PSDeliveryResult.java @@ -16,7 +16,7 @@ */ package com.percussion.rx.delivery.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.rx.delivery.IPSDeliveryHandler; import com.percussion.rx.delivery.IPSDeliveryResult; diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSAmazonS3DeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSAmazonS3DeliveryHandler.java index 15b3da795e..b27e7c41fd 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSAmazonS3DeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSAmazonS3DeliveryHandler.java @@ -52,7 +52,7 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSBaseDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSBaseDeliveryHandler.java index 73190c7b7d..d4ab57e599 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSBaseDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSBaseDeliveryHandler.java @@ -45,7 +45,7 @@ import com.percussion.util.PSPurgableTempFile; import com.percussion.util.PSStopwatch; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -65,8 +65,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * Base delivery handler. This defines a basic mechanism that enables the diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSBaseFtpDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSBaseFtpDeliveryHandler.java index a1343d9141..465d7e664d 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSBaseFtpDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSBaseFtpDeliveryHandler.java @@ -25,7 +25,7 @@ import com.percussion.services.pubserver.IPSPubServerDao; import com.percussion.services.sitemgr.IPSSite; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,7 +35,7 @@ import java.util.Collection; import java.util.Iterator; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; /** * Base ftp delivery handler. This adds retry logic to the login diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSDatabaseDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSDatabaseDeliveryHandler.java index 0ebb267ca9..dcf9b2a207 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSDatabaseDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSDatabaseDeliveryHandler.java @@ -34,9 +34,9 @@ import com.percussion.utils.jdbc.PSJdbcUtils; import com.percussion.utils.xml.PSSaxCopier; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; @@ -64,8 +64,8 @@ import java.util.Objects; import java.util.Set; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; /** * The database delivery handler delivers content to a database. The database diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSDeliveryHandlerRunner.java b/system/business/src/com/percussion/rx/delivery/impl/PSDeliveryHandlerRunner.java index c56194535c..b384b90022 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSDeliveryHandlerRunner.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSDeliveryHandlerRunner.java @@ -16,7 +16,7 @@ */ package com.percussion.rx.delivery.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.rx.delivery.IPSDeliveryResult; import com.percussion.rx.delivery.PSDeliveryException; diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSEc2InstanceMetadataClient.java b/system/business/src/com/percussion/rx/delivery/impl/PSEc2InstanceMetadataClient.java index 53e555fc2e..53b7e386e1 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSEc2InstanceMetadataClient.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSEc2InstanceMetadataClient.java @@ -25,7 +25,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSFileDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSFileDeliveryHandler.java index 65b2465d16..8ac48e938f 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSFileDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSFileDeliveryHandler.java @@ -28,7 +28,7 @@ import com.percussion.services.pubserver.IPSPubServer; import com.percussion.services.sitemgr.IPSSite; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSFtpDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSFtpDeliveryHandler.java index 75a7490123..91f8e312af 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSFtpDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSFtpDeliveryHandler.java @@ -37,7 +37,7 @@ import java.nio.charset.StandardCharsets; import java.util.Collection; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * A subclass of the file delivery handler that does the delivery to a remote diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSFtpsDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSFtpsDeliveryHandler.java index a29b60dc32..d57594cda9 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSFtpsDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSFtpsDeliveryHandler.java @@ -25,7 +25,7 @@ import com.percussion.rx.delivery.data.PSDeliveryResult; import com.percussion.services.pubserver.IPSPubServer; import com.percussion.services.sitemgr.IPSSite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPReply; @@ -41,7 +41,7 @@ import java.security.NoSuchAlgorithmException; import java.util.Collection; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; public class PSFtpsDeliveryHandler extends PSBaseFtpDeliveryHandler{ diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSLocalDeliveryManager.java b/system/business/src/com/percussion/rx/delivery/impl/PSLocalDeliveryManager.java index 731e191f33..de4d414156 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSLocalDeliveryManager.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSLocalDeliveryManager.java @@ -44,7 +44,7 @@ import com.percussion.util.PSStopwatch; import com.percussion.utils.types.PSPair; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSMetadataDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSMetadataDeliveryHandler.java index e183de35a8..c94d9057ac 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSMetadataDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSMetadataDeliveryHandler.java @@ -50,7 +50,7 @@ import com.percussion.utils.types.PSPair; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONException; @@ -63,7 +63,7 @@ import static java.text.MessageFormat.format; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; /** * The meta-data delivery handler, which publishes and un-publishes pages to the indexer diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSSFtpClientJSch.java b/system/business/src/com/percussion/rx/delivery/impl/PSSFtpClientJSch.java index d23c5ab0eb..77a210273e 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSSFtpClientJSch.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSSFtpClientJSch.java @@ -25,7 +25,7 @@ import com.jcraft.jsch.SftpATTRS; import com.jcraft.jsch.SftpException; import com.percussion.server.PSServer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ import java.util.List; import java.util.Vector; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; /** * A wrapper for the {@link ChannelSftp} class. This code was integrated from diff --git a/system/business/src/com/percussion/rx/delivery/impl/PSSFtpDeliveryHandler.java b/system/business/src/com/percussion/rx/delivery/impl/PSSFtpDeliveryHandler.java index 1d3ded20b5..3e24c5261d 100644 --- a/system/business/src/com/percussion/rx/delivery/impl/PSSFtpDeliveryHandler.java +++ b/system/business/src/com/percussion/rx/delivery/impl/PSSFtpDeliveryHandler.java @@ -28,7 +28,7 @@ import com.percussion.server.PSServer; import com.percussion.services.pubserver.IPSPubServer; import com.percussion.services.sitemgr.IPSSite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/design/PSDesignModelUtils.java b/system/business/src/com/percussion/rx/design/PSDesignModelUtils.java index f3a34f3507..06f9345c7d 100644 --- a/system/business/src/com/percussion/rx/design/PSDesignModelUtils.java +++ b/system/business/src/com/percussion/rx/design/PSDesignModelUtils.java @@ -38,7 +38,7 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.request.PSRequestInfo; import com.percussion.utils.types.PSPair; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/design/impl/PSActionModel.java b/system/business/src/com/percussion/rx/design/impl/PSActionModel.java index 385b0117e1..4f843b8127 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSActionModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSActionModel.java @@ -28,7 +28,7 @@ import java.text.MessageFormat; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; public class PSActionModel extends PSDesignModel diff --git a/system/business/src/com/percussion/rx/design/impl/PSApplicationModel.java b/system/business/src/com/percussion/rx/design/impl/PSApplicationModel.java index 106e82e0db..60c74cb81f 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSApplicationModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSApplicationModel.java @@ -29,7 +29,7 @@ import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSApplicationModel extends PSLimitedDesignModel { diff --git a/system/business/src/com/percussion/rx/design/impl/PSCommunityModel.java b/system/business/src/com/percussion/rx/design/impl/PSCommunityModel.java index 3afb896ed1..5ea7c51e4c 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSCommunityModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSCommunityModel.java @@ -24,7 +24,7 @@ import java.text.MessageFormat; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSCommunityModel extends PSLimitedDesignModel { diff --git a/system/business/src/com/percussion/rx/design/impl/PSContentTypeModel.java b/system/business/src/com/percussion/rx/design/impl/PSContentTypeModel.java index d0da1b9151..1319db91df 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSContentTypeModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSContentTypeModel.java @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/design/impl/PSControlModel.java b/system/business/src/com/percussion/rx/design/impl/PSControlModel.java index 4217f37848..6ad4f7e831 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSControlModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSControlModel.java @@ -38,7 +38,7 @@ import java.io.IOException; import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/business/src/com/percussion/rx/design/impl/PSDesignModel.java b/system/business/src/com/percussion/rx/design/impl/PSDesignModel.java index 37d6d2d371..944dc8df02 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSDesignModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSDesignModel.java @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/design/impl/PSDisplayFormatModel.java b/system/business/src/com/percussion/rx/design/impl/PSDisplayFormatModel.java index fdc53317e1..bb692cd0a0 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSDisplayFormatModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSDisplayFormatModel.java @@ -25,7 +25,7 @@ import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; public class PSDisplayFormatModel extends PSDesignModel diff --git a/system/business/src/com/percussion/rx/design/impl/PSExtensionModel.java b/system/business/src/com/percussion/rx/design/impl/PSExtensionModel.java index dc8ef65445..40f12c7075 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSExtensionModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSExtensionModel.java @@ -22,7 +22,7 @@ import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSExtensionModel extends PSLimitedDesignModel { diff --git a/system/business/src/com/percussion/rx/design/impl/PSKeywordModel.java b/system/business/src/com/percussion/rx/design/impl/PSKeywordModel.java index 752073114a..3243cb1b5c 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSKeywordModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSKeywordModel.java @@ -25,7 +25,7 @@ import java.text.MessageFormat; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class PSKeywordModel extends PSDesignModel { diff --git a/system/business/src/com/percussion/rx/design/impl/PSRelationshipConfigModel.java b/system/business/src/com/percussion/rx/design/impl/PSRelationshipConfigModel.java index 88c927dcae..3ce384bda4 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSRelationshipConfigModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSRelationshipConfigModel.java @@ -35,7 +35,7 @@ import java.text.MessageFormat; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/business/src/com/percussion/rx/design/impl/PSSearchModel.java b/system/business/src/com/percussion/rx/design/impl/PSSearchModel.java index cf9855391e..e08517751e 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSSearchModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSSearchModel.java @@ -28,7 +28,7 @@ import java.text.MessageFormat; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; public class PSSearchModel extends PSDesignModel diff --git a/system/business/src/com/percussion/rx/design/impl/PSSharedGroupModel.java b/system/business/src/com/percussion/rx/design/impl/PSSharedGroupModel.java index 9f2bfc4871..294b4e80c7 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSSharedGroupModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSSharedGroupModel.java @@ -26,7 +26,7 @@ import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; public class PSSharedGroupModel extends PSLimitedDesignModel diff --git a/system/business/src/com/percussion/rx/design/impl/PSWorkflowModel.java b/system/business/src/com/percussion/rx/design/impl/PSWorkflowModel.java index ee6cfb8cc2..f23f5579b9 100644 --- a/system/business/src/com/percussion/rx/design/impl/PSWorkflowModel.java +++ b/system/business/src/com/percussion/rx/design/impl/PSWorkflowModel.java @@ -22,7 +22,7 @@ import com.percussion.services.workflow.IPSWorkflowService; import com.percussion.services.workflow.data.PSWorkflow; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/jsf/PSCategoryNodeBase.java b/system/business/src/com/percussion/rx/jsf/PSCategoryNodeBase.java index cf5e2c088b..3250f453fb 100644 --- a/system/business/src/com/percussion/rx/jsf/PSCategoryNodeBase.java +++ b/system/business/src/com/percussion/rx/jsf/PSCategoryNodeBase.java @@ -16,7 +16,7 @@ */ package com.percussion.rx.jsf; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import java.util.ArrayList; import java.util.Collections; @@ -25,7 +25,7 @@ import java.util.regex.Pattern; import com.percussion.services.error.PSNotFoundException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.myfaces.trinidad.model.RowKeyIndex; /** diff --git a/system/business/src/com/percussion/rx/jsf/PSCategoryNodesNameProvider.java b/system/business/src/com/percussion/rx/jsf/PSCategoryNodesNameProvider.java index ba92cda834..9f2c09a9a5 100644 --- a/system/business/src/com/percussion/rx/jsf/PSCategoryNodesNameProvider.java +++ b/system/business/src/com/percussion/rx/jsf/PSCategoryNodesNameProvider.java @@ -16,7 +16,7 @@ */ package com.percussion.rx.jsf; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.utils.jsf.validators.IPSUniqueValidatorValueProvider; import java.util.Collection; diff --git a/system/business/src/com/percussion/rx/jsf/PSNavigation.java b/system/business/src/com/percussion/rx/jsf/PSNavigation.java index 2f9c09856e..98cbf2b397 100644 --- a/system/business/src/com/percussion/rx/jsf/PSNavigation.java +++ b/system/business/src/com/percussion/rx/jsf/PSNavigation.java @@ -16,13 +16,13 @@ */ package com.percussion.rx.jsf; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.rx.publisher.jsf.nodes.PSSiteContainerNode; import com.percussion.services.error.PSNotFoundException; import com.percussion.utils.guid.IPSGuid; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.myfaces.trinidad.model.RowKeySet; import org.apache.myfaces.trinidad.model.RowKeySetImpl; diff --git a/system/business/src/com/percussion/rx/jsf/PSNodeBase.java b/system/business/src/com/percussion/rx/jsf/PSNodeBase.java index e9473150c6..7510a0ddd8 100644 --- a/system/business/src/com/percussion/rx/jsf/PSNodeBase.java +++ b/system/business/src/com/percussion/rx/jsf/PSNodeBase.java @@ -18,7 +18,7 @@ import com.percussion.rx.ui.jsf.beans.PSHelpTopicMapping; import com.percussion.services.error.PSNotFoundException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.myfaces.trinidad.model.RowKeyIndex; import java.util.Collections; diff --git a/system/business/src/com/percussion/rx/jsf/PSTreeModel.java b/system/business/src/com/percussion/rx/jsf/PSTreeModel.java index 96e213bce8..665b2477b5 100644 --- a/system/business/src/com/percussion/rx/jsf/PSTreeModel.java +++ b/system/business/src/com/percussion/rx/jsf/PSTreeModel.java @@ -18,7 +18,7 @@ import com.percussion.error.PSExceptionUtils; import com.percussion.services.error.PSNotFoundException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.myfaces.trinidad.model.MenuModel; diff --git a/system/business/src/com/percussion/rx/publisher/IPSPublisherJobStatus.java b/system/business/src/com/percussion/rx/publisher/IPSPublisherJobStatus.java index 10aa8d1eb6..8d8305f403 100644 --- a/system/business/src/com/percussion/rx/publisher/IPSPublisherJobStatus.java +++ b/system/business/src/com/percussion/rx/publisher/IPSPublisherJobStatus.java @@ -20,7 +20,7 @@ import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The public (read-only) interface to the job status. A job can be in a number diff --git a/system/business/src/com/percussion/rx/publisher/PSPublisherUtils.java b/system/business/src/com/percussion/rx/publisher/PSPublisherUtils.java index fb91e7971b..25034c72c1 100644 --- a/system/business/src/com/percussion/rx/publisher/PSPublisherUtils.java +++ b/system/business/src/com/percussion/rx/publisher/PSPublisherUtils.java @@ -16,8 +16,8 @@ */ package com.percussion.rx.publisher; -import static org.apache.commons.lang.Validate.notNull; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.services.catalog.PSTypeEnum; import com.percussion.services.error.PSNotFoundException; @@ -43,7 +43,7 @@ import java.util.Map; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/data/PSDemandWork.java b/system/business/src/com/percussion/rx/publisher/data/PSDemandWork.java index 4348955fb1..c3a1a29f37 100644 --- a/system/business/src/com/percussion/rx/publisher/data/PSDemandWork.java +++ b/system/business/src/com/percussion/rx/publisher/data/PSDemandWork.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; /** * Represents a single unit of work. diff --git a/system/business/src/com/percussion/rx/publisher/data/PSPubItemStatus.java b/system/business/src/com/percussion/rx/publisher/data/PSPubItemStatus.java index df6028cf72..9356fda6a2 100644 --- a/system/business/src/com/percussion/rx/publisher/data/PSPubItemStatus.java +++ b/system/business/src/com/percussion/rx/publisher/data/PSPubItemStatus.java @@ -30,10 +30,10 @@ import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * Report the status for a single item being published. Sent by the delivery diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSEditionCommandTask.java b/system/business/src/com/percussion/rx/publisher/impl/PSEditionCommandTask.java index 1257c81fb5..df5d5f8060 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSEditionCommandTask.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSEditionCommandTask.java @@ -27,7 +27,7 @@ import com.percussion.services.sitemgr.IPSSite; import com.percussion.util.PSDateFormatISO8601; import com.percussion.util.PSStringTemplate; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSEditionRunner.java b/system/business/src/com/percussion/rx/publisher/impl/PSEditionRunner.java index 9e734f049f..932ad2f862 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSEditionRunner.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSEditionRunner.java @@ -31,8 +31,8 @@ import java.util.Date; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; /** * Edition task to asynchronously invoke another edition. It is typically used diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSFlushPublicationCacheTask.java b/system/business/src/com/percussion/rx/publisher/impl/PSFlushPublicationCacheTask.java index 2a44704cd9..125cc8f014 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSFlushPublicationCacheTask.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSFlushPublicationCacheTask.java @@ -27,8 +27,8 @@ import java.util.Date; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; /** diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSLocationChangeHandler.java b/system/business/src/com/percussion/rx/publisher/impl/PSLocationChangeHandler.java index 36eb05f3d8..e8c4f565e4 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSLocationChangeHandler.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSLocationChangeHandler.java @@ -21,8 +21,8 @@ import static com.percussion.design.objectstore.PSRelationshipConfig.TYPE_FOLDER_CONTENT; import static com.percussion.util.IPSHtmlParameters.SYS_UNPUBLISH_CHANGED_LOCATION; import static com.percussion.webservices.PSWebserviceUtils.getRelationshipProcessor; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.PSKey; @@ -58,7 +58,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSPublishHandler.java b/system/business/src/com/percussion/rx/publisher/impl/PSPublishHandler.java index 70308c936a..74f6509cde 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSPublishHandler.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSPublishHandler.java @@ -62,7 +62,7 @@ import com.percussion.utils.request.PSRequestInfoBase; import com.percussion.utils.timing.PSStopwatch; import com.percussion.webservices.PSWebserviceUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -87,8 +87,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import static com.percussion.util.IPSHtmlParameters.SYS_UNPUBLISH_CHANGED_LOCATION; -import static org.apache.commons.lang.Validate.noNullElements; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.noNullElements; +import static org.apache.commons.lang3.Validate.notNull; /** * Handler that processes assembly items waiting in the assembly queue for diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSPublishingJob.java b/system/business/src/com/percussion/rx/publisher/impl/PSPublishingJob.java index 386c8da39c..288e6bea49 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSPublishingJob.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSPublishingJob.java @@ -85,8 +85,8 @@ import com.percussion.utils.timing.PSTimer; import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; - import org.apache.commons.lang.StringUtils; - import org.apache.commons.lang.exception.ExceptionUtils; + import org.apache.commons.lang3.StringUtils; + import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; @@ -117,7 +117,7 @@ import static com.percussion.rx.publisher.PSPublisherUtils.getContentList; import static com.percussion.rx.publisher.PSPublisherUtils.getEditionContentList; import static com.percussion.util.IPSHtmlParameters.SYS_UNPUBLISH_CHANGED_LOCATION; - import static org.apache.commons.lang.Validate.notNull; + import static org.apache.commons.lang3.Validate.notNull; /** * Implement the actual job for publishing. Jobs run for the length of time that diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSRxPublisherService.java b/system/business/src/com/percussion/rx/publisher/impl/PSRxPublisherService.java index 97fac26a92..4fd8283112 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSRxPublisherService.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSRxPublisherService.java @@ -45,7 +45,7 @@ import com.percussion.util.PSDateFormatISO8601; import com.percussion.utils.guid.IPSGuid; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.ObjectFactory; diff --git a/system/business/src/com/percussion/rx/publisher/impl/PSSiteItemKey.java b/system/business/src/com/percussion/rx/publisher/impl/PSSiteItemKey.java index 3a96e78a4e..8103f7d4c3 100644 --- a/system/business/src/com/percussion/rx/publisher/impl/PSSiteItemKey.java +++ b/system/business/src/com/percussion/rx/publisher/impl/PSSiteItemKey.java @@ -16,8 +16,8 @@ */ package com.percussion.rx.publisher.impl; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.assembly.IPSAssemblyItem; import com.percussion.services.assembly.jexl.PSStringUtils; @@ -26,7 +26,7 @@ import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/beans/PSRuntimeNavigation.java b/system/business/src/com/percussion/rx/publisher/jsf/beans/PSRuntimeNavigation.java index 52a1cc5044..a68bb70424 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/beans/PSRuntimeNavigation.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/beans/PSRuntimeNavigation.java @@ -40,7 +40,7 @@ import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.request.PSRequestInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.myfaces.trinidad.event.RangeChangeEvent; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/data/PSEditionContentListWrapper.java b/system/business/src/com/percussion/rx/publisher/jsf/data/PSEditionContentListWrapper.java index d3824d5769..3d90eb794e 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/data/PSEditionContentListWrapper.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/data/PSEditionContentListWrapper.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/data/PSParameter.java b/system/business/src/com/percussion/rx/publisher/jsf/data/PSParameter.java index b83a0424cb..c20ae08e0a 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/data/PSParameter.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/data/PSParameter.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Describe one attribute for the parameters. Used for the expander and diff --git a/system/business/src/com/percussion/rx/publisher/jsf/data/PSPubItemEntry.java b/system/business/src/com/percussion/rx/publisher/jsf/data/PSPubItemEntry.java index 37c8bbd9f3..0ea7937dfa 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/data/PSPubItemEntry.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/data/PSPubItemEntry.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A simple bean that will set the right detail item in the runtime navigation. diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentBrowser.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentBrowser.java index 6d39e7be06..df423ecf09 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentBrowser.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentBrowser.java @@ -26,7 +26,7 @@ import com.percussion.services.guidmgr.data.PSLegacyGuid; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.request.PSRequestInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListNode.java index 2bd2f4c5ea..17d65b27d1 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListNode.java @@ -33,7 +33,7 @@ import com.percussion.util.PSCharSets; import com.percussion.util.PSUrlUtils; import com.percussion.utils.types.PSPair; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListViewNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListViewNode.java index 12a692e687..ea03027f2e 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListViewNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContentListViewNode.java @@ -41,7 +41,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContextNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContextNode.java index 1c53f11018..0c4981d1c5 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContextNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSContextNode.java @@ -37,7 +37,7 @@ import com.percussion.services.sitemgr.data.PSLocationScheme; import com.percussion.services.sitemgr.data.PSPublishingContext; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSDesignNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSDesignNode.java index 91161d5ea3..64279015d4 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSDesignNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSDesignNode.java @@ -28,7 +28,7 @@ import javax.faces.model.SelectItem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSEditionNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSEditionNode.java index 9b33885ea1..23d21838bf 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSEditionNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSEditionNode.java @@ -46,7 +46,7 @@ import com.percussion.services.sitemgr.IPSSiteManager; import com.percussion.services.sitemgr.PSSiteManagerLocator; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.myfaces.trinidad.component.UIXEditableValue; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSLogNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSLogNode.java index 4efba1a9d7..a759f7ec4e 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSLogNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSLogNode.java @@ -36,7 +36,7 @@ import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.myfaces.trinidad.model.RowKeySet; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSPublishingStatusHelper.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSPublishingStatusHelper.java index 092d50e9bd..9be71b79f3 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSPublishingStatusHelper.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSPublishingStatusHelper.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Takes status from the publishing service and produces useful output for diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSchemeJexlTestPanel.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSchemeJexlTestPanel.java index 237eca6d7a..b8cabba919 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSchemeJexlTestPanel.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSchemeJexlTestPanel.java @@ -47,7 +47,7 @@ import javax.faces.model.SelectItem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSiteNode.java b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSiteNode.java index 459953f15a..958f8971d6 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSiteNode.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/nodes/PSSiteNode.java @@ -50,7 +50,7 @@ import com.percussion.services.sitemgr.data.PSSiteProperty; import com.percussion.services.utils.jsf.validators.PSPathExists; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -71,7 +71,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; /** * Implements the needed facade for editing a site design element. Note that diff --git a/system/business/src/com/percussion/rx/publisher/jsf/utils/PSExtensionHelper.java b/system/business/src/com/percussion/rx/publisher/jsf/utils/PSExtensionHelper.java index b870b80745..eda594dc86 100644 --- a/system/business/src/com/percussion/rx/publisher/jsf/utils/PSExtensionHelper.java +++ b/system/business/src/com/percussion/rx/publisher/jsf/utils/PSExtensionHelper.java @@ -32,7 +32,7 @@ import javax.faces.model.SelectItem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Helper static methods for use with extensions. diff --git a/system/business/src/com/percussion/rx/publisher/servlet/PSDemandPublishServlet.java b/system/business/src/com/percussion/rx/publisher/servlet/PSDemandPublishServlet.java index eee56133a3..cd42fdab3f 100644 --- a/system/business/src/com/percussion/rx/publisher/servlet/PSDemandPublishServlet.java +++ b/system/business/src/com/percussion/rx/publisher/servlet/PSDemandPublishServlet.java @@ -28,7 +28,7 @@ import com.percussion.services.publisher.PSPublisherServiceLocator; import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/publisher/servlet/PSJobStatusServlet.java b/system/business/src/com/percussion/rx/publisher/servlet/PSJobStatusServlet.java index d2d336368f..873b8ad1ca 100644 --- a/system/business/src/com/percussion/rx/publisher/servlet/PSJobStatusServlet.java +++ b/system/business/src/com/percussion/rx/publisher/servlet/PSJobStatusServlet.java @@ -44,7 +44,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; /** diff --git a/system/business/src/com/percussion/rx/ui/jsf/beans/PSHelpTopicMapping.java b/system/business/src/com/percussion/rx/ui/jsf/beans/PSHelpTopicMapping.java index 8fa834e337..ebbab9beaf 100644 --- a/system/business/src/com/percussion/rx/ui/jsf/beans/PSHelpTopicMapping.java +++ b/system/business/src/com/percussion/rx/ui/jsf/beans/PSHelpTopicMapping.java @@ -19,7 +19,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/rx/ui/jsf/beans/PSTopNavigation.java b/system/business/src/com/percussion/rx/ui/jsf/beans/PSTopNavigation.java index 1141d754bb..9daeeefbe4 100644 --- a/system/business/src/com/percussion/rx/ui/jsf/beans/PSTopNavigation.java +++ b/system/business/src/com/percussion/rx/ui/jsf/beans/PSTopNavigation.java @@ -18,7 +18,7 @@ import com.percussion.server.PSRequest; import com.percussion.services.utils.jspel.PSRoleUtilities; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.faces.model.DataModel; import javax.servlet.http.HttpServletRequest; diff --git a/system/business/src/com/percussion/rx/ui/jsf/beans/PSUserStatus.java b/system/business/src/com/percussion/rx/ui/jsf/beans/PSUserStatus.java index a92772649a..0b7e51c5d1 100644 --- a/system/business/src/com/percussion/rx/ui/jsf/beans/PSUserStatus.java +++ b/system/business/src/com/percussion/rx/ui/jsf/beans/PSUserStatus.java @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The user status, used only for the status tag. diff --git a/system/business/src/com/percussion/rx/utils/PSContentTypeUtils.java b/system/business/src/com/percussion/rx/utils/PSContentTypeUtils.java index 279b454c1c..0d4ce2bba9 100644 --- a/system/business/src/com/percussion/rx/utils/PSContentTypeUtils.java +++ b/system/business/src/com/percussion/rx/utils/PSContentTypeUtils.java @@ -36,7 +36,7 @@ import java.util.List; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/business/src/com/percussion/share/dao/PSFolderPathUtils.java b/system/business/src/com/percussion/share/dao/PSFolderPathUtils.java index 1c8bc177b9..e59866cc61 100644 --- a/system/business/src/com/percussion/share/dao/PSFolderPathUtils.java +++ b/system/business/src/com/percussion/share/dao/PSFolderPathUtils.java @@ -19,23 +19,23 @@ import com.percussion.security.SecureStringUtils; import com.percussion.share.data.IPSFolderPath; import com.percussion.share.data.IPSItemSummary; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.StringUtils.replaceChars; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.StringUtils.substringAfterLast; -import static org.apache.commons.lang.StringUtils.substringBeforeLast; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.StringUtils.replaceChars; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.StringUtils.substringAfterLast; +import static org.apache.commons.lang3.StringUtils.substringBeforeLast; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * diff --git a/system/business/src/com/percussion/share/dao/PSSerializerUtils.java b/system/business/src/com/percussion/share/dao/PSSerializerUtils.java index b825a1f76f..2611b7fa14 100644 --- a/system/business/src/com/percussion/share/dao/PSSerializerUtils.java +++ b/system/business/src/com/percussion/share/dao/PSSerializerUtils.java @@ -49,9 +49,9 @@ import java.util.List; import java.util.Objects; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.removeStart; +import static org.apache.commons.lang3.Validate.notNull; /** * Various serializing/marshalling static methods. diff --git a/system/business/src/com/percussion/share/data/PSAbstractDataObject.java b/system/business/src/com/percussion/share/data/PSAbstractDataObject.java index d42a3a4577..849423d775 100644 --- a/system/business/src/com/percussion/share/data/PSAbstractDataObject.java +++ b/system/business/src/com/percussion/share/data/PSAbstractDataObject.java @@ -19,10 +19,10 @@ import java.io.Serializable; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * The base class for all data objects. diff --git a/system/business/src/com/percussion/sitemanage/impl/PSSitePublishDaoHelper.java b/system/business/src/com/percussion/sitemanage/impl/PSSitePublishDaoHelper.java index e34d2b9ec1..07ea11d43f 100644 --- a/system/business/src/com/percussion/sitemanage/impl/PSSitePublishDaoHelper.java +++ b/system/business/src/com/percussion/sitemanage/impl/PSSitePublishDaoHelper.java @@ -40,17 +40,17 @@ import com.percussion.webservices.PSErrorException; import com.percussion.webservices.publishing.IPSPublishingWs; import com.percussion.webservices.publishing.PSPublishingWsLocator; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.startsWith; -import static org.apache.commons.lang.Validate.isTrue; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.removeEnd; +import static org.apache.commons.lang3.StringUtils.startsWith; +import static org.apache.commons.lang3.Validate.isTrue; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * Helper methods used to create Editions and content lists for CM1 publishing servers. So far only diff --git a/system/business/src/com/percussion/utils/security/PSBasicPermission.java b/system/business/src/com/percussion/utils/security/PSBasicPermission.java index 5b9f68da24..f3fe29e2d9 100644 --- a/system/business/src/com/percussion/utils/security/PSBasicPermission.java +++ b/system/business/src/com/percussion/utils/security/PSBasicPermission.java @@ -18,8 +18,8 @@ import java.security.acl.Permission; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * A simple basic permission object that can be used with integers or enum diff --git a/system/pom.xml b/system/pom.xml index d9a71d4442..d0e308dec3 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -208,10 +208,6 @@ - - commons-lang - commons-lang - commons-logging diff --git a/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierSaveProperties.java b/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierSaveProperties.java index 14a4a7afb8..5cb3cb1a00 100644 --- a/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierSaveProperties.java +++ b/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierSaveProperties.java @@ -38,7 +38,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierUpgradeFlag.java b/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierUpgradeFlag.java index ad970ca4cd..1bd1d428c4 100644 --- a/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierUpgradeFlag.java +++ b/system/release/Install/src/com/percussion/installer/action/PSDeliveryTierUpgradeFlag.java @@ -15,7 +15,7 @@ import com.percussion.installanywhere.RxIAAction; import com.percussion.installer.RxVariables; import com.percussion.util.PSOsTool; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.*; diff --git a/system/release/Install/src/com/percussion/installer/action/RxInstall.java b/system/release/Install/src/com/percussion/installer/action/RxInstall.java index 7ca174ca97..3b1e115f92 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxInstall.java +++ b/system/release/Install/src/com/percussion/installer/action/RxInstall.java @@ -23,7 +23,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; diff --git a/system/release/Install/src/com/percussion/installer/action/RxInstallServiceAction.java b/system/release/Install/src/com/percussion/installer/action/RxInstallServiceAction.java index 71faed13fb..8025b6ef71 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxInstallServiceAction.java +++ b/system/release/Install/src/com/percussion/installer/action/RxInstallServiceAction.java @@ -24,8 +24,8 @@ import java.util.ListIterator; import java.util.Set; -import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/action/RxResolveTempDir.java b/system/release/Install/src/com/percussion/installer/action/RxResolveTempDir.java index 68aa9357ce..0eea96b373 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxResolveTempDir.java +++ b/system/release/Install/src/com/percussion/installer/action/RxResolveTempDir.java @@ -15,7 +15,7 @@ import com.percussion.installanywhere.RxIAAction; import com.installshield.wizard.service.system.SystemUtilService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/action/RxSaveProperties.java b/system/release/Install/src/com/percussion/installer/action/RxSaveProperties.java index 6d257d6266..21579afad3 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxSaveProperties.java +++ b/system/release/Install/src/com/percussion/installer/action/RxSaveProperties.java @@ -38,7 +38,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/action/RxSuiteInstall.java b/system/release/Install/src/com/percussion/installer/action/RxSuiteInstall.java index 06112e76f6..de3aa74cde 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxSuiteInstall.java +++ b/system/release/Install/src/com/percussion/installer/action/RxSuiteInstall.java @@ -21,7 +21,7 @@ import com.percussion.util.PSOsTool; import com.percussion.utils.container.IPSConnector; import com.percussion.utils.tomcat.PSTomcatUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.util.List; diff --git a/system/release/Install/src/com/percussion/installer/action/RxUpdateLaxFiles.java b/system/release/Install/src/com/percussion/installer/action/RxUpdateLaxFiles.java index 320f88cc26..3bd32422b3 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxUpdateLaxFiles.java +++ b/system/release/Install/src/com/percussion/installer/action/RxUpdateLaxFiles.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStreamReader; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/action/RxUpdateUpgradeFlag.java b/system/release/Install/src/com/percussion/installer/action/RxUpdateUpgradeFlag.java index c6ea014412..c803aa5916 100644 --- a/system/release/Install/src/com/percussion/installer/action/RxUpdateUpgradeFlag.java +++ b/system/release/Install/src/com/percussion/installer/action/RxUpdateUpgradeFlag.java @@ -24,7 +24,7 @@ import java.util.StringTokenizer; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/model/PSDeliveryTierDatabaseModel.java b/system/release/Install/src/com/percussion/installer/model/PSDeliveryTierDatabaseModel.java index 380c1c80f5..f6baa296d9 100644 --- a/system/release/Install/src/com/percussion/installer/model/PSDeliveryTierDatabaseModel.java +++ b/system/release/Install/src/com/percussion/installer/model/PSDeliveryTierDatabaseModel.java @@ -28,7 +28,7 @@ import java.sql.Statement; import java.util.Vector; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/model/RxComponent.java b/system/release/Install/src/com/percussion/installer/model/RxComponent.java index 52b3af6ea6..18f9b7e0cb 100644 --- a/system/release/Install/src/com/percussion/installer/model/RxComponent.java +++ b/system/release/Install/src/com/percussion/installer/model/RxComponent.java @@ -13,7 +13,7 @@ import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/model/RxDatabaseModel.java b/system/release/Install/src/com/percussion/installer/model/RxDatabaseModel.java index f613ff9011..ed0b9611ca 100644 --- a/system/release/Install/src/com/percussion/installer/model/RxDatabaseModel.java +++ b/system/release/Install/src/com/percussion/installer/model/RxDatabaseModel.java @@ -28,7 +28,7 @@ import java.sql.Statement; import java.util.Vector; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/model/RxServerAdminUserModel.java b/system/release/Install/src/com/percussion/installer/model/RxServerAdminUserModel.java index aca57160a1..001c6b12c8 100644 --- a/system/release/Install/src/com/percussion/installer/model/RxServerAdminUserModel.java +++ b/system/release/Install/src/com/percussion/installer/model/RxServerAdminUserModel.java @@ -30,7 +30,7 @@ import java.util.Properties; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/rule/RxEmbeddedDBRule.java b/system/release/Install/src/com/percussion/installer/rule/RxEmbeddedDBRule.java index 9c524d40c9..3952dd74d3 100644 --- a/system/release/Install/src/com/percussion/installer/rule/RxEmbeddedDBRule.java +++ b/system/release/Install/src/com/percussion/installer/rule/RxEmbeddedDBRule.java @@ -23,7 +23,7 @@ import java.io.InputStream; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/system/release/Install/src/com/percussion/installer/rule/RxRhythmyxServiceInstallRule.java b/system/release/Install/src/com/percussion/installer/rule/RxRhythmyxServiceInstallRule.java index e5b179cdf0..46acd4dd55 100644 --- a/system/release/Install/src/com/percussion/installer/rule/RxRhythmyxServiceInstallRule.java +++ b/system/release/Install/src/com/percussion/installer/rule/RxRhythmyxServiceInstallRule.java @@ -14,7 +14,7 @@ import com.percussion.installanywhere.RxIARule; import com.percussion.installer.RxVariables; import com.percussion.installer.action.RxLogger;; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.io.File; import java.io.FileInputStream; diff --git a/system/services/src/com/percussion/services/PSBaseServiceLocator.java b/system/services/src/com/percussion/services/PSBaseServiceLocator.java index 89e41acb2a..366a199d64 100644 --- a/system/services/src/com/percussion/services/PSBaseServiceLocator.java +++ b/system/services/src/com/percussion/services/PSBaseServiceLocator.java @@ -23,7 +23,7 @@ import com.percussion.utils.container.PSContainerUtilsFactory; import com.percussion.utils.servlet.PSServletUtils; import com.percussion.utils.spring.PSFileSystemXmlApplicationContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.BeansException; diff --git a/system/services/src/com/percussion/services/aaclient/PSAaClientServlet.java b/system/services/src/com/percussion/services/aaclient/PSAaClientServlet.java index 2c466c1555..19044c8668 100644 --- a/system/services/src/com/percussion/services/aaclient/PSAaClientServlet.java +++ b/system/services/src/com/percussion/services/aaclient/PSAaClientServlet.java @@ -16,7 +16,7 @@ */ package com.percussion.services.aaclient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/system/services/src/com/percussion/services/aaclient/PSActionBar.java b/system/services/src/com/percussion/services/aaclient/PSActionBar.java index 38ca6153ee..b64d0e96e0 100644 --- a/system/services/src/com/percussion/services/aaclient/PSActionBar.java +++ b/system/services/src/com/percussion/services/aaclient/PSActionBar.java @@ -31,7 +31,7 @@ import com.percussion.workflow.PSWorkFlowUtils; import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.w3c.dom.Document; diff --git a/system/services/src/com/percussion/services/aaclient/PSActionExecutor.java b/system/services/src/com/percussion/services/aaclient/PSActionExecutor.java index 4362fa6dd1..e671733a36 100644 --- a/system/services/src/com/percussion/services/aaclient/PSActionExecutor.java +++ b/system/services/src/com/percussion/services/aaclient/PSActionExecutor.java @@ -53,7 +53,7 @@ import com.percussion.webservices.PSErrorsException; import com.percussion.webservices.content.IPSContentWs; import com.percussion.webservices.content.PSContentWsLocator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; import org.json.simple.JSONValue; diff --git a/system/services/src/com/percussion/services/aaclient/PSHashedFileWidgetHandler.java b/system/services/src/com/percussion/services/aaclient/PSHashedFileWidgetHandler.java index 93bb50b848..a7d6de5c96 100644 --- a/system/services/src/com/percussion/services/aaclient/PSHashedFileWidgetHandler.java +++ b/system/services/src/com/percussion/services/aaclient/PSHashedFileWidgetHandler.java @@ -27,9 +27,9 @@ import java.io.InputStream; import java.io.OutputStream; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * diff --git a/system/services/src/com/percussion/services/aaclient/PSPageTree.java b/system/services/src/com/percussion/services/aaclient/PSPageTree.java index 241fe1d06e..4792250426 100644 --- a/system/services/src/com/percussion/services/aaclient/PSPageTree.java +++ b/system/services/src/com/percussion/services/aaclient/PSPageTree.java @@ -37,7 +37,7 @@ import com.percussion.util.PSStringTemplate.PSStringTemplateException; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.request.PSRequestInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; diff --git a/system/services/src/com/percussion/services/aaclient/PSWidgetUtils.java b/system/services/src/com/percussion/services/aaclient/PSWidgetUtils.java index a154764b21..d7319a7603 100644 --- a/system/services/src/com/percussion/services/aaclient/PSWidgetUtils.java +++ b/system/services/src/com/percussion/services/aaclient/PSWidgetUtils.java @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; /** diff --git a/system/services/src/com/percussion/services/assembly/data/PSAssemblyTemplate.java b/system/services/src/com/percussion/services/assembly/data/PSAssemblyTemplate.java index 3bf7dd328f..130428763e 100644 --- a/system/services/src/com/percussion/services/assembly/data/PSAssemblyTemplate.java +++ b/system/services/src/com/percussion/services/assembly/data/PSAssemblyTemplate.java @@ -33,7 +33,7 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.IPSXmlSerialization; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Hibernate; diff --git a/system/services/src/com/percussion/services/assembly/data/PSAssemblyWorkItem.java b/system/services/src/com/percussion/services/assembly/data/PSAssemblyWorkItem.java index 3577dfbb59..c5ca71fa91 100644 --- a/system/services/src/com/percussion/services/assembly/data/PSAssemblyWorkItem.java +++ b/system/services/src/com/percussion/services/assembly/data/PSAssemblyWorkItem.java @@ -57,10 +57,10 @@ import com.percussion.utils.string.PSStringUtils; import com.percussion.utils.timing.PSStopwatchStack; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/data/PSSlotContentFinderParam.java b/system/services/src/com/percussion/services/assembly/data/PSSlotContentFinderParam.java index 1bdd2ae006..48aeb847d9 100644 --- a/system/services/src/com/percussion/services/assembly/data/PSSlotContentFinderParam.java +++ b/system/services/src/com/percussion/services/assembly/data/PSSlotContentFinderParam.java @@ -17,8 +17,8 @@ package com.percussion.services.assembly.data; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.GenericGenerator; diff --git a/system/services/src/com/percussion/services/assembly/data/PSTemplateSlot.java b/system/services/src/com/percussion/services/assembly/data/PSTemplateSlot.java index 21003d90aa..b0a7e6caa1 100644 --- a/system/services/src/com/percussion/services/assembly/data/PSTemplateSlot.java +++ b/system/services/src/com/percussion/services/assembly/data/PSTemplateSlot.java @@ -27,9 +27,9 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.types.PSPair; import com.percussion.utils.xml.IPSXmlSerialization; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSAAObjectId.java b/system/services/src/com/percussion/services/assembly/impl/PSAAObjectId.java index d96d6fec19..ee687c05c8 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSAAObjectId.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSAAObjectId.java @@ -35,7 +35,7 @@ import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.request.PSRequestInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONArray; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSAAUtils.java b/system/services/src/com/percussion/services/assembly/impl/PSAAUtils.java index 8cca81a75d..37886ed2e9 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSAAUtils.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSAAUtils.java @@ -26,7 +26,7 @@ import com.percussion.services.relationship.IPSRelationshipService; import com.percussion.services.relationship.PSRelationshipServiceLocator; import com.percussion.util.IPSHtmlParameters; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONException; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSAssemblyService.java b/system/services/src/com/percussion/services/assembly/impl/PSAssemblyService.java index 65d88881e5..db0bba1c44 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSAssemblyService.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSAssemblyService.java @@ -94,7 +94,7 @@ import com.percussion.utils.timing.PSStopwatchStack; import com.percussion.utils.xml.PSInvalidXmlException; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSAssemblyServlet.java b/system/services/src/com/percussion/services/assembly/impl/PSAssemblyServlet.java index 6ea38a7a61..050dd66d91 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSAssemblyServlet.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSAssemblyServlet.java @@ -42,7 +42,7 @@ import com.percussion.utils.string.PSStringUtils; import com.percussion.utils.timing.PSStopwatch; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONException; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSDivTagCleanup.java b/system/services/src/com/percussion/services/assembly/impl/PSDivTagCleanup.java index 78e61dfddc..39247a2055 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSDivTagCleanup.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSDivTagCleanup.java @@ -20,7 +20,7 @@ import com.percussion.utils.jsr170.IPSPropertyInterceptor; import com.percussion.utils.xml.PSSaxCopier; import com.percussion.utils.xml.PSSaxHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkContentHandler.java b/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkContentHandler.java index 78a7f30594..e685f41c7a 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkContentHandler.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkContentHandler.java @@ -49,8 +49,8 @@ import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.exceptions.PSORMException; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jdom2.JDOMException; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkProcessor.java b/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkProcessor.java index 2270b195bc..86b382157e 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkProcessor.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSInlineLinkProcessor.java @@ -25,7 +25,7 @@ import com.percussion.services.assembly.IPSAssemblyItem; import com.percussion.services.filter.IPSItemFilter; import com.percussion.utils.jsr170.IPSPropertyInterceptor; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.nodes.Document; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSNamespaceCleanup.java b/system/services/src/com/percussion/services/assembly/impl/PSNamespaceCleanup.java index 1dbc23683f..2a5d9a2b71 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSNamespaceCleanup.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSNamespaceCleanup.java @@ -29,7 +29,7 @@ import com.percussion.utils.jsr170.IPSPropertyInterceptor; import com.percussion.utils.xml.PSSaxCopier; import com.percussion.utils.xml.PSSaxHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/assembly/impl/PSTrackAssemblyError.java b/system/services/src/com/percussion/services/assembly/impl/PSTrackAssemblyError.java index dab4640865..f3a58711a1 100644 --- a/system/services/src/com/percussion/services/assembly/impl/PSTrackAssemblyError.java +++ b/system/services/src/com/percussion/services/assembly/impl/PSTrackAssemblyError.java @@ -21,7 +21,7 @@ import com.percussion.services.assembly.IPSAssemblyItem; import com.percussion.services.assembly.IPSAssemblyResult.Status; import com.percussion.utils.codec.PSXmlEncoder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoFinderUtils.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoFinderUtils.java index 2ea85e1cf0..e34a8e0018 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoFinderUtils.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoFinderUtils.java @@ -32,7 +32,7 @@ import com.percussion.util.PSBaseBean; import com.percussion.utils.collections.PSFacadeMap; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.exception.DataException; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoSlotContentFinder.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoSlotContentFinder.java index 9f3dc74b23..fad9632ee1 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoSlotContentFinder.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSAutoSlotContentFinder.java @@ -23,7 +23,7 @@ import com.percussion.services.assembly.IPSTemplateSlot; import com.percussion.services.error.PSNotFoundException; import com.percussion.services.sitemgr.PSSiteManagerException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSBaseSlotContentFinder.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSBaseSlotContentFinder.java index ea445d085a..b06b740869 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSBaseSlotContentFinder.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSBaseSlotContentFinder.java @@ -32,7 +32,7 @@ import com.percussion.services.sitemgr.PSSiteManagerLocator; import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderBase.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderBase.java index c5ea255dbe..a43d9c984e 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderBase.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderBase.java @@ -40,7 +40,7 @@ import com.percussion.util.IPSHtmlParameters; import com.percussion.util.PSStopwatch; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Session; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderUtils.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderUtils.java index d881dc7c91..aaf472ad31 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderUtils.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSContentFinderUtils.java @@ -40,7 +40,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSLegacyAutoSlotContentFinder.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSLegacyAutoSlotContentFinder.java index 667c2af666..e95c93765f 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSLegacyAutoSlotContentFinder.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSLegacyAutoSlotContentFinder.java @@ -40,7 +40,7 @@ import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSNavFinderUtils.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSNavFinderUtils.java index 05a5a7822f..58670940ff 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSNavFinderUtils.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSNavFinderUtils.java @@ -34,7 +34,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSRelationshipFinderUtils.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSRelationshipFinderUtils.java index e42f6bcda9..1049bd6bec 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSRelationshipFinderUtils.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSRelationshipFinderUtils.java @@ -39,7 +39,7 @@ import com.percussion.services.notification.PSNotificationEvent.EventType; import com.percussion.services.notification.PSNotificationServiceLocator; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -49,7 +49,7 @@ import static com.percussion.services.assembly.impl.finder.PSContentFinderBase.ORDER_BY; import static com.percussion.services.memory.IPSCacheAccess.CONTENT_FINDER_RELS; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; /** * This class provides various helper methods for relationship content finders. diff --git a/system/services/src/com/percussion/services/assembly/impl/finder/PSTranslationSlotFinder.java b/system/services/src/com/percussion/services/assembly/impl/finder/PSTranslationSlotFinder.java index 9e99a567fa..29c6cc012e 100644 --- a/system/services/src/com/percussion/services/assembly/impl/finder/PSTranslationSlotFinder.java +++ b/system/services/src/com/percussion/services/assembly/impl/finder/PSTranslationSlotFinder.java @@ -34,7 +34,7 @@ import com.percussion.services.guidmgr.data.PSLegacyGuid; import com.percussion.services.sitemgr.PSSiteManagerException; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/nav/PSNavConfig.java b/system/services/src/com/percussion/services/assembly/impl/nav/PSNavConfig.java index a37e46394a..2241cc49db 100644 --- a/system/services/src/com/percussion/services/assembly/impl/nav/PSNavConfig.java +++ b/system/services/src/com/percussion/services/assembly/impl/nav/PSNavConfig.java @@ -48,7 +48,7 @@ import com.percussion.util.PSStopwatch; import com.percussion.utils.guid.IPSGuid; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/services/src/com/percussion/services/assembly/impl/nav/PSNavHelper.java b/system/services/src/com/percussion/services/assembly/impl/nav/PSNavHelper.java index 31354d841f..514aea8ab9 100644 --- a/system/services/src/com/percussion/services/assembly/impl/nav/PSNavHelper.java +++ b/system/services/src/com/percussion/services/assembly/impl/nav/PSNavHelper.java @@ -61,8 +61,8 @@ import com.percussion.utils.timing.PSStopwatchStack; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.net.nntp.NNTPConnectionClosedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -87,7 +87,7 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; diff --git a/system/services/src/com/percussion/services/assembly/impl/plugin/PSAssemblerBase.java b/system/services/src/com/percussion/services/assembly/impl/plugin/PSAssemblerBase.java index 25ccd4c49b..dfd0086fbb 100644 --- a/system/services/src/com/percussion/services/assembly/impl/plugin/PSAssemblerBase.java +++ b/system/services/src/com/percussion/services/assembly/impl/plugin/PSAssemblerBase.java @@ -46,7 +46,7 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.jexl.IPSScript; import com.percussion.utils.jexl.PSJexlEvaluator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/plugin/PSDatabaseAssembler.java b/system/services/src/com/percussion/services/assembly/impl/plugin/PSDatabaseAssembler.java index 90df196f18..29a910f6f6 100644 --- a/system/services/src/com/percussion/services/assembly/impl/plugin/PSDatabaseAssembler.java +++ b/system/services/src/com/percussion/services/assembly/impl/plugin/PSDatabaseAssembler.java @@ -31,7 +31,7 @@ import com.percussion.utils.xml.PSSaxCopier; import com.percussion.utils.xml.PSSaxHelper; import com.percussion.xml.PSStylesheetCacheManager; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/plugin/PSDebugAssembler.java b/system/services/src/com/percussion/services/assembly/impl/plugin/PSDebugAssembler.java index a4c3cdfb6b..c5a7d7c777 100644 --- a/system/services/src/com/percussion/services/assembly/impl/plugin/PSDebugAssembler.java +++ b/system/services/src/com/percussion/services/assembly/impl/plugin/PSDebugAssembler.java @@ -64,7 +64,7 @@ import javax.jcr.ValueFormatException; import javax.jcr.nodetype.PropertyDefinition; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/impl/plugin/PSLegacyAssembler.java b/system/services/src/com/percussion/services/assembly/impl/plugin/PSLegacyAssembler.java index 15b7adc65e..9c63f7c426 100644 --- a/system/services/src/com/percussion/services/assembly/impl/plugin/PSLegacyAssembler.java +++ b/system/services/src/com/percussion/services/assembly/impl/plugin/PSLegacyAssembler.java @@ -38,7 +38,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/system/services/src/com/percussion/services/assembly/impl/plugin/PSVelocityAssembler.java b/system/services/src/com/percussion/services/assembly/impl/plugin/PSVelocityAssembler.java index 5800afa056..897bcb0b16 100644 --- a/system/services/src/com/percussion/services/assembly/impl/plugin/PSVelocityAssembler.java +++ b/system/services/src/com/percussion/services/assembly/impl/plugin/PSVelocityAssembler.java @@ -42,7 +42,7 @@ import com.percussion.utils.jexl.PSJexlEvaluator; import com.percussion.utils.string.PSStringUtils; import com.percussion.utils.timing.PSStopwatchStack; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.velocity.Template; @@ -80,7 +80,7 @@ import static com.percussion.cms.IPSConstants.SYS_PARAM_MIMETYPE; import static com.percussion.cms.IPSConstants.SYS_PARAM_NO_CACHE_TEMPLATE; import static com.percussion.cms.IPSConstants.SYS_PARAM_TEMPLATE; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; /** * This assembler uses a Velocity template to create HTML output text. This uses diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSAssemblerUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSAssemblerUtils.java index 4d8ace1ac8..5029b72429 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSAssemblerUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSAssemblerUtils.java @@ -55,7 +55,7 @@ import com.percussion.xmldom.PSXmlDomContext; import com.percussion.xmldom.PSXmlDomUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSDbUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSDbUtils.java index 356c3ec43e..6a0820d04d 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSDbUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSDbUtils.java @@ -42,7 +42,7 @@ import javax.jcr.ValueFormatException; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSExtensionWrapper.java b/system/services/src/com/percussion/services/assembly/jexl/PSExtensionWrapper.java index cacf83ae3b..a0c5f167a3 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSExtensionWrapper.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSExtensionWrapper.java @@ -26,7 +26,7 @@ import com.percussion.server.PSRequestContext; import com.percussion.server.PSServer; import com.percussion.utils.request.PSRequestInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Iterator; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSKeywordUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSKeywordUtils.java index 6c90cdcfc9..439f61e764 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSKeywordUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSKeywordUtils.java @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSLinkUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSLinkUtils.java index bcf38ed5a0..c27c0cff82 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSLinkUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSLinkUtils.java @@ -26,7 +26,7 @@ import java.net.MalformedURLException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Link manipulation utilities diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSLocationUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSLocationUtils.java index 481c4969c6..8505c3c57c 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSLocationUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSLocationUtils.java @@ -54,7 +54,7 @@ import com.percussion.utils.timing.PSStopwatchStack; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSManagedNavUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSManagedNavUtils.java index 17de9941c4..11bbf36966 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSManagedNavUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSManagedNavUtils.java @@ -19,7 +19,7 @@ import com.percussion.extension.IPSJexlMethod; import com.percussion.extension.IPSJexlParam; import com.percussion.extension.PSJexlUtilBase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.jcr.AccessDeniedException; import javax.jcr.ItemNotFoundException; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSPaginateUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSPaginateUtils.java index 92ba70e9aa..2ef28d1594 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSPaginateUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSPaginateUtils.java @@ -30,7 +30,7 @@ import com.percussion.services.error.PSNotFoundException; import com.percussion.services.filter.PSFilterException; import com.percussion.util.IPSHtmlParameters; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xml.sax.Attributes; diff --git a/system/services/src/com/percussion/services/assembly/jexl/PSStringUtils.java b/system/services/src/com/percussion/services/assembly/jexl/PSStringUtils.java index 1ac4f94484..d32b44844d 100644 --- a/system/services/src/com/percussion/services/assembly/jexl/PSStringUtils.java +++ b/system/services/src/com/percussion/services/assembly/jexl/PSStringUtils.java @@ -19,7 +19,7 @@ import com.percussion.extension.IPSJexlMethod; import com.percussion.extension.IPSJexlParam; import com.percussion.extension.PSJexlUtilBase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONArray; diff --git a/system/services/src/com/percussion/services/assembly/ui/PSVariantMigrationBean.java b/system/services/src/com/percussion/services/assembly/ui/PSVariantMigrationBean.java index 1aec914fc8..01578030db 100644 --- a/system/services/src/com/percussion/services/assembly/ui/PSVariantMigrationBean.java +++ b/system/services/src/com/percussion/services/assembly/ui/PSVariantMigrationBean.java @@ -67,7 +67,7 @@ import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/audit/data/PSAuditLogEntry.java b/system/services/src/com/percussion/services/audit/data/PSAuditLogEntry.java index 0cb8c13be5..f93bf47526 100644 --- a/system/services/src/com/percussion/services/audit/data/PSAuditLogEntry.java +++ b/system/services/src/com/percussion/services/audit/data/PSAuditLogEntry.java @@ -30,8 +30,8 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; /** * Class representing an audit entry, used to save information regarding the diff --git a/system/services/src/com/percussion/services/catalog/data/PSObjectSummary.java b/system/services/src/com/percussion/services/catalog/data/PSObjectSummary.java index 99008c9878..a91ca8b4f6 100644 --- a/system/services/src/com/percussion/services/catalog/data/PSObjectSummary.java +++ b/system/services/src/com/percussion/services/catalog/data/PSObjectSummary.java @@ -27,8 +27,8 @@ import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.IPSXmlSerialization; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.ArrayList; import java.util.List; diff --git a/system/services/src/com/percussion/services/content/data/PSAutoTranslation.java b/system/services/src/com/percussion/services/content/data/PSAutoTranslation.java index f6db14c3d0..80da26c39f 100644 --- a/system/services/src/com/percussion/services/content/data/PSAutoTranslation.java +++ b/system/services/src/com/percussion/services/content/data/PSAutoTranslation.java @@ -37,10 +37,10 @@ import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/content/data/PSAutoTranslationPK.java b/system/services/src/com/percussion/services/content/data/PSAutoTranslationPK.java index 6ac73422e1..a48331c745 100644 --- a/system/services/src/com/percussion/services/content/data/PSAutoTranslationPK.java +++ b/system/services/src/com/percussion/services/content/data/PSAutoTranslationPK.java @@ -22,10 +22,10 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Primary key for the {@link PSAutoTranslation}. diff --git a/system/services/src/com/percussion/services/content/data/PSContentTypeSummary.java b/system/services/src/com/percussion/services/content/data/PSContentTypeSummary.java index e4f3ad5b94..4f57a920d4 100644 --- a/system/services/src/com/percussion/services/content/data/PSContentTypeSummary.java +++ b/system/services/src/com/percussion/services/content/data/PSContentTypeSummary.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/content/data/PSContentTypeSummaryChild.java b/system/services/src/com/percussion/services/content/data/PSContentTypeSummaryChild.java index 372496f9de..ab08909ff4 100644 --- a/system/services/src/com/percussion/services/content/data/PSContentTypeSummaryChild.java +++ b/system/services/src/com/percussion/services/content/data/PSContentTypeSummaryChild.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/content/data/PSFieldDescription.java b/system/services/src/com/percussion/services/content/data/PSFieldDescription.java index 21d59ed054..ff48fbcdc6 100644 --- a/system/services/src/com/percussion/services/content/data/PSFieldDescription.java +++ b/system/services/src/com/percussion/services/content/data/PSFieldDescription.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/content/data/PSFolderProperty.java b/system/services/src/com/percussion/services/content/data/PSFolderProperty.java index f6e963b1aa..c66c902dac 100644 --- a/system/services/src/com/percussion/services/content/data/PSFolderProperty.java +++ b/system/services/src/com/percussion/services/content/data/PSFolderProperty.java @@ -39,10 +39,10 @@ import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/content/data/PSItemStatus.java b/system/services/src/com/percussion/services/content/data/PSItemStatus.java index f8a0434387..f1965cd395 100644 --- a/system/services/src/com/percussion/services/content/data/PSItemStatus.java +++ b/system/services/src/com/percussion/services/content/data/PSItemStatus.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/content/data/PSItemSummary.java b/system/services/src/com/percussion/services/content/data/PSItemSummary.java index 731901d9ff..df912597ce 100644 --- a/system/services/src/com/percussion/services/content/data/PSItemSummary.java +++ b/system/services/src/com/percussion/services/content/data/PSItemSummary.java @@ -24,10 +24,10 @@ import java.util.Collection; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Represents a content object which is currently an item or folder. diff --git a/system/services/src/com/percussion/services/content/data/PSKeyword.java b/system/services/src/com/percussion/services/content/data/PSKeyword.java index 021ee54c05..37cccf0b21 100644 --- a/system/services/src/com/percussion/services/content/data/PSKeyword.java +++ b/system/services/src/com/percussion/services/content/data/PSKeyword.java @@ -39,10 +39,10 @@ import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/content/data/PSKeywordChoice.java b/system/services/src/com/percussion/services/content/data/PSKeywordChoice.java index d695d4a5f9..a406298ad6 100644 --- a/system/services/src/com/percussion/services/content/data/PSKeywordChoice.java +++ b/system/services/src/com/percussion/services/content/data/PSKeywordChoice.java @@ -22,10 +22,10 @@ import java.io.Serializable; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/content/data/PSSearchSummary.java b/system/services/src/com/percussion/services/content/data/PSSearchSummary.java index da905f5a98..5b93faafab 100644 --- a/system/services/src/com/percussion/services/content/data/PSSearchSummary.java +++ b/system/services/src/com/percussion/services/content/data/PSSearchSummary.java @@ -24,9 +24,9 @@ import java.util.Map; import java.util.Objects; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Extends the PSItemSummary with additional search result fields. diff --git a/system/services/src/com/percussion/services/content/impl/PSContentService.java b/system/services/src/com/percussion/services/content/impl/PSContentService.java index 54b6aa5fed..ab625ffcd6 100644 --- a/system/services/src/com/percussion/services/content/impl/PSContentService.java +++ b/system/services/src/com/percussion/services/content/impl/PSContentService.java @@ -33,7 +33,7 @@ import com.percussion.services.guidmgr.data.PSGuid; import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/contentchange/impl/PSContentChangeService.java b/system/services/src/com/percussion/services/contentchange/impl/PSContentChangeService.java index 9028962add..92325ae004 100644 --- a/system/services/src/com/percussion/services/contentchange/impl/PSContentChangeService.java +++ b/system/services/src/com/percussion/services/contentchange/impl/PSContentChangeService.java @@ -38,8 +38,8 @@ import com.percussion.services.notification.PSNotificationEvent.EventType; import com.percussion.share.dao.IPSGenericDao; import com.percussion.share.service.exception.PSDataServiceException; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/system/services/src/com/percussion/services/contentmgr/PSContentMgrConfig.java b/system/services/src/com/percussion/services/contentmgr/PSContentMgrConfig.java index 5617a06245..6b6b9154eb 100644 --- a/system/services/src/com/percussion/services/contentmgr/PSContentMgrConfig.java +++ b/system/services/src/com/percussion/services/contentmgr/PSContentMgrConfig.java @@ -22,8 +22,8 @@ import java.util.Objects; import java.util.Set; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * This configuration object controls the content manager's behavior. It is diff --git a/system/services/src/com/percussion/services/contentmgr/data/PSContentNode.java b/system/services/src/com/percussion/services/contentmgr/data/PSContentNode.java index b79e0634a4..f4596472a2 100644 --- a/system/services/src/com/percussion/services/contentmgr/data/PSContentNode.java +++ b/system/services/src/com/percussion/services/contentmgr/data/PSContentNode.java @@ -27,10 +27,10 @@ import com.percussion.utils.jsr170.*; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; import org.apache.commons.collections4.MultiValuedMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.jcr.*; import javax.jcr.lock.Lock; diff --git a/system/services/src/com/percussion/services/contentmgr/data/PSContentTemplateDesc.java b/system/services/src/com/percussion/services/contentmgr/data/PSContentTemplateDesc.java index c5164eb0c8..b0e6acefd9 100644 --- a/system/services/src/com/percussion/services/contentmgr/data/PSContentTemplateDesc.java +++ b/system/services/src/com/percussion/services/contentmgr/data/PSContentTemplateDesc.java @@ -29,9 +29,9 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/contentmgr/data/PSContentTypeWorkflow.java b/system/services/src/com/percussion/services/contentmgr/data/PSContentTypeWorkflow.java index 7e408dd6c5..338783d5aa 100644 --- a/system/services/src/com/percussion/services/contentmgr/data/PSContentTypeWorkflow.java +++ b/system/services/src/com/percussion/services/contentmgr/data/PSContentTypeWorkflow.java @@ -27,9 +27,9 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/contentmgr/data/PSNodeDefinition.java b/system/services/src/com/percussion/services/contentmgr/data/PSNodeDefinition.java index f3bf05ef5a..7826b274b6 100644 --- a/system/services/src/com/percussion/services/contentmgr/data/PSNodeDefinition.java +++ b/system/services/src/com/percussion/services/contentmgr/data/PSNodeDefinition.java @@ -30,9 +30,9 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.IPSXmlSerialization; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; diff --git a/system/services/src/com/percussion/services/contentmgr/data/PSQuery.java b/system/services/src/com/percussion/services/contentmgr/data/PSQuery.java index f127c289d9..47fbe84bd6 100644 --- a/system/services/src/com/percussion/services/contentmgr/data/PSQuery.java +++ b/system/services/src/com/percussion/services/contentmgr/data/PSQuery.java @@ -25,7 +25,7 @@ import com.percussion.services.contentmgr.impl.query.nodes.PSQueryNodeIdentifier; import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.types.PSPair; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.jcr.ItemExistsException; import javax.jcr.ItemNotFoundException; diff --git a/system/services/src/com/percussion/services/contentmgr/data/PSRowComparator.java b/system/services/src/com/percussion/services/contentmgr/data/PSRowComparator.java index 569a496f6a..3187a3fe4a 100644 --- a/system/services/src/com/percussion/services/contentmgr/data/PSRowComparator.java +++ b/system/services/src/com/percussion/services/contentmgr/data/PSRowComparator.java @@ -27,7 +27,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Compares two rows according to a list of property names with directions. This diff --git a/system/services/src/com/percussion/services/contentmgr/impl/PSContentMgr.java b/system/services/src/com/percussion/services/contentmgr/impl/PSContentMgr.java index fd99b5fc4a..4cf7fa1b5f 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/PSContentMgr.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/PSContentMgr.java @@ -43,7 +43,7 @@ import com.percussion.services.guidmgr.data.PSLegacyGuid; import com.percussion.util.PSSqlHelper; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/contentmgr/impl/PSContentUtils.java b/system/services/src/com/percussion/services/contentmgr/impl/PSContentUtils.java index b54677604e..1a5341756d 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/PSContentUtils.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/PSContentUtils.java @@ -22,7 +22,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Handy utilities for the content manager diff --git a/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentChildTypeKey.java b/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentChildTypeKey.java index e2f1e2ee2b..e6c7dd5549 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentChildTypeKey.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentChildTypeKey.java @@ -18,8 +18,8 @@ import com.percussion.services.contentmgr.impl.IPSTypeKey; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Represents a child content type for lookup in the configuration diff --git a/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentRepository.java b/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentRepository.java index 5f4d18993c..fd17780291 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentRepository.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSContentRepository.java @@ -95,7 +95,7 @@ import com.percussion.utils.types.PSPair; import org.apache.commons.collections.MultiHashMap; import org.apache.commons.collections.MultiMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Session; diff --git a/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSTypeConfiguration.java b/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSTypeConfiguration.java index e813900e46..f67c781614 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSTypeConfiguration.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/legacy/PSTypeConfiguration.java @@ -58,9 +58,9 @@ import net.sf.cglib.core.NamingPolicy; import net.sf.cglib.core.Predicate; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/IPSQueryNode.java b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/IPSQueryNode.java index 8976d79125..d9116a5942 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/IPSQueryNode.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/IPSQueryNode.java @@ -20,7 +20,7 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a query for the JSR-170 query module. Each implementation of this diff --git a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeFunction.java b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeFunction.java index 1a91afd3c8..a1aadece77 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeFunction.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeFunction.java @@ -23,7 +23,7 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Query function. This is a placeholder for now, which allows a query to have diff --git a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeIdentifier.java b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeIdentifier.java index 76d353180c..32d3752a35 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeIdentifier.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeIdentifier.java @@ -21,7 +21,7 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a single query identifier diff --git a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeLiteral.java b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeLiteral.java index 19a3214d7a..4d1069c957 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeLiteral.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeLiteral.java @@ -20,7 +20,7 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a literal chunk of HQL to be spliced into the final query. diff --git a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeValue.java b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeValue.java index 9822aa9906..e8ae0605d1 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeValue.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeValue.java @@ -21,8 +21,8 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Represents a single value in the query tree diff --git a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeVariable.java b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeVariable.java index 49e6f708a2..6a6fcf3c4f 100644 --- a/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeVariable.java +++ b/system/services/src/com/percussion/services/contentmgr/impl/query/nodes/PSQueryNodeVariable.java @@ -16,7 +16,7 @@ */ package com.percussion.services.contentmgr.impl.query.nodes; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a variable substitution in the query. A variable is a subclass diff --git a/system/services/src/com/percussion/services/contentmgr/ui/PSConsistencyBase.java b/system/services/src/com/percussion/services/contentmgr/ui/PSConsistencyBase.java index 83ca5c4e94..a8c226dfa2 100644 --- a/system/services/src/com/percussion/services/contentmgr/ui/PSConsistencyBase.java +++ b/system/services/src/com/percussion/services/contentmgr/ui/PSConsistencyBase.java @@ -28,7 +28,7 @@ import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Base class for consistency checker classes diff --git a/system/services/src/com/percussion/services/datasource/PSHibernateDialectConfig.java b/system/services/src/com/percussion/services/datasource/PSHibernateDialectConfig.java index 7823cd4e0e..c3ef3607da 100644 --- a/system/services/src/com/percussion/services/datasource/PSHibernateDialectConfig.java +++ b/system/services/src/com/percussion/services/datasource/PSHibernateDialectConfig.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/services/src/com/percussion/services/datasource/PSSessionFactoryBean.java b/system/services/src/com/percussion/services/datasource/PSSessionFactoryBean.java index 9d8fb1bb16..ad2fca0f5b 100644 --- a/system/services/src/com/percussion/services/datasource/PSSessionFactoryBean.java +++ b/system/services/src/com/percussion/services/datasource/PSSessionFactoryBean.java @@ -23,7 +23,7 @@ import com.percussion.utils.jdbc.PSConnectionDetail; import com.percussion.utils.jdbc.PSJdbcUtils; import com.percussion.utils.jndi.PSJndiObjectLocator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.HibernateException; import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl; import org.springframework.context.annotation.Configuration; diff --git a/system/services/src/com/percussion/services/datasource/impl/PSDatasourceManager.java b/system/services/src/com/percussion/services/datasource/impl/PSDatasourceManager.java index aad40be080..99c160f1be 100644 --- a/system/services/src/com/percussion/services/datasource/impl/PSDatasourceManager.java +++ b/system/services/src/com/percussion/services/datasource/impl/PSDatasourceManager.java @@ -28,7 +28,7 @@ import com.percussion.utils.jdbc.PSJdbcUtils; import com.percussion.utils.jdbc.PSMissingDatasourceConfigException; import com.percussion.utils.jndi.PSJndiObjectLocator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/system/services/src/com/percussion/services/error/PSDuplicateNameException.java b/system/services/src/com/percussion/services/error/PSDuplicateNameException.java index 587b7a1331..4ce2c07917 100644 --- a/system/services/src/com/percussion/services/error/PSDuplicateNameException.java +++ b/system/services/src/com/percussion/services/error/PSDuplicateNameException.java @@ -19,7 +19,7 @@ import com.percussion.services.catalog.PSTypeEnum; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * PSDuplicateNameException is thrown when the name of an object is not unique. diff --git a/system/services/src/com/percussion/services/error/PSRuntimeException.java b/system/services/src/com/percussion/services/error/PSRuntimeException.java index 78b1f5fa6b..46169b48d1 100644 --- a/system/services/src/com/percussion/services/error/PSRuntimeException.java +++ b/system/services/src/com/percussion/services/error/PSRuntimeException.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The base class for unchecked runtime exception in services package. diff --git a/system/services/src/com/percussion/services/filestorage/PSFileStorageMigrator.java b/system/services/src/com/percussion/services/filestorage/PSFileStorageMigrator.java index b058340a6c..553ce3b3f5 100644 --- a/system/services/src/com/percussion/services/filestorage/PSFileStorageMigrator.java +++ b/system/services/src/com/percussion/services/filestorage/PSFileStorageMigrator.java @@ -41,7 +41,7 @@ import javax.naming.NamingException; import org.apache.axis.utils.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/filestorage/data/PSBinary.java b/system/services/src/com/percussion/services/filestorage/data/PSBinary.java index 304bff2ffd..56bf204f06 100644 --- a/system/services/src/com/percussion/services/filestorage/data/PSBinary.java +++ b/system/services/src/com/percussion/services/filestorage/data/PSBinary.java @@ -16,9 +16,9 @@ */ package com.percussion.services.filestorage.data; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tika.metadata.Metadata; diff --git a/system/services/src/com/percussion/services/filestorage/data/PSMeta.java b/system/services/src/com/percussion/services/filestorage/data/PSMeta.java index 3201ca521a..3c17deb67a 100644 --- a/system/services/src/com/percussion/services/filestorage/data/PSMeta.java +++ b/system/services/src/com/percussion/services/filestorage/data/PSMeta.java @@ -26,8 +26,8 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tika.metadata.ClimateForcast; diff --git a/system/services/src/com/percussion/services/filestorage/extensions/PSChecksumFileInfo.java b/system/services/src/com/percussion/services/filestorage/extensions/PSChecksumFileInfo.java index 362ab6110c..b850576420 100644 --- a/system/services/src/com/percussion/services/filestorage/extensions/PSChecksumFileInfo.java +++ b/system/services/src/com/percussion/services/filestorage/extensions/PSChecksumFileInfo.java @@ -44,8 +44,8 @@ import java.util.Set; import java.util.StringTokenizer; -import static org.apache.commons.lang.StringUtils.*; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.Validate.isTrue; /** * Similar to PSFleInfo but a single copy of the diff --git a/system/services/src/com/percussion/services/filestorage/extensions/PSFileStorageTools.java b/system/services/src/com/percussion/services/filestorage/extensions/PSFileStorageTools.java index 1f89b20db4..a9a353b115 100644 --- a/system/services/src/com/percussion/services/filestorage/extensions/PSFileStorageTools.java +++ b/system/services/src/com/percussion/services/filestorage/extensions/PSFileStorageTools.java @@ -16,9 +16,9 @@ */ package com.percussion.services.filestorage.extensions; -import static org.apache.commons.lang.StringUtils.endsWith; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.endsWith; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSInvalidContentTypeException; import com.percussion.cms.objectstore.PSItemDefinition; @@ -48,7 +48,7 @@ import javax.jcr.ValueFormatException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/filestorage/impl/PSDbStorageService.java b/system/services/src/com/percussion/services/filestorage/impl/PSDbStorageService.java index 0ab41c0e65..3f45c11568 100644 --- a/system/services/src/com/percussion/services/filestorage/impl/PSDbStorageService.java +++ b/system/services/src/com/percussion/services/filestorage/impl/PSDbStorageService.java @@ -31,8 +31,8 @@ import com.percussion.util.PSPurgableTempFile; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tika.Tika; @@ -68,8 +68,8 @@ import java.util.Map.Entry; import java.util.Set; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * @author stephenbolton diff --git a/system/services/src/com/percussion/services/filestorage/impl/PSFileDigestService.java b/system/services/src/com/percussion/services/filestorage/impl/PSFileDigestService.java index 338d04fa82..2106ff9d5c 100644 --- a/system/services/src/com/percussion/services/filestorage/impl/PSFileDigestService.java +++ b/system/services/src/com/percussion/services/filestorage/impl/PSFileDigestService.java @@ -23,7 +23,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; public class PSFileDigestService implements IPSFileDigestService { diff --git a/system/services/src/com/percussion/services/filestorage/impl/PSHashedFileDAO.java b/system/services/src/com/percussion/services/filestorage/impl/PSHashedFileDAO.java index e46a903b48..51fb645479 100644 --- a/system/services/src/com/percussion/services/filestorage/impl/PSHashedFileDAO.java +++ b/system/services/src/com/percussion/services/filestorage/impl/PSHashedFileDAO.java @@ -23,8 +23,8 @@ import com.percussion.services.filestorage.data.PSBinaryMetaKey; import com.percussion.services.filestorage.data.PSHashedColumn; import com.percussion.utils.jdbc.PSConnectionHelper; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/filter/data/PSFilterItem.java b/system/services/src/com/percussion/services/filter/data/PSFilterItem.java index 0a08c39f5a..980edd1a86 100644 --- a/system/services/src/com/percussion/services/filter/data/PSFilterItem.java +++ b/system/services/src/com/percussion/services/filter/data/PSFilterItem.java @@ -22,9 +22,9 @@ import com.percussion.services.guidmgr.PSGuidManagerLocator; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/filter/data/PSItemFilter.java b/system/services/src/com/percussion/services/filter/data/PSItemFilter.java index 37edc8f6a3..cb2fa6046f 100644 --- a/system/services/src/com/percussion/services/filter/data/PSItemFilter.java +++ b/system/services/src/com/percussion/services/filter/data/PSItemFilter.java @@ -32,8 +32,8 @@ import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.IPSXmlSerialization; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.annotations.Cache; diff --git a/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleDef.java b/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleDef.java index 353c060309..df0c64b46e 100644 --- a/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleDef.java +++ b/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleDef.java @@ -31,7 +31,7 @@ import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.IPSXmlSerialization; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; diff --git a/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleParam.java b/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleParam.java index e95a0a5a99..2bc78aea45 100644 --- a/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleParam.java +++ b/system/services/src/com/percussion/services/filter/data/PSItemFilterRuleParam.java @@ -18,7 +18,7 @@ import com.percussion.services.catalog.PSTypeEnum; import com.percussion.services.guidmgr.PSGuidHelper; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/filter/impl/PSBaseFilter.java b/system/services/src/com/percussion/services/filter/impl/PSBaseFilter.java index 23e8ab22bc..7991efebab 100644 --- a/system/services/src/com/percussion/services/filter/impl/PSBaseFilter.java +++ b/system/services/src/com/percussion/services/filter/impl/PSBaseFilter.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/filter/impl/PSFilterManager.java b/system/services/src/com/percussion/services/filter/impl/PSFilterManager.java index df95585dbc..03506de46a 100644 --- a/system/services/src/com/percussion/services/filter/impl/PSFilterManager.java +++ b/system/services/src/com/percussion/services/filter/impl/PSFilterManager.java @@ -34,7 +34,7 @@ import com.percussion.util.PSBaseBean; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.PSInvalidXmlException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/filter/impl/PSFolderPathFilter.java b/system/services/src/com/percussion/services/filter/impl/PSFolderPathFilter.java index dddf9d9395..8559ca2a08 100644 --- a/system/services/src/com/percussion/services/filter/impl/PSFolderPathFilter.java +++ b/system/services/src/com/percussion/services/filter/impl/PSFolderPathFilter.java @@ -26,7 +26,7 @@ import com.percussion.services.filter.PSFilterException; import com.percussion.services.guidmgr.data.PSLegacyGuid; import com.percussion.utils.string.PSFolderStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/filter/impl/PSPreviewFilter.java b/system/services/src/com/percussion/services/filter/impl/PSPreviewFilter.java index 87c50806fa..6222339b7d 100644 --- a/system/services/src/com/percussion/services/filter/impl/PSPreviewFilter.java +++ b/system/services/src/com/percussion/services/filter/impl/PSPreviewFilter.java @@ -16,8 +16,8 @@ */ package com.percussion.services.filter.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.noNullElements; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.noNullElements; import java.util.ArrayList; import java.util.List; diff --git a/system/services/src/com/percussion/services/filter/impl/PSPublishableStateFilter.java b/system/services/src/com/percussion/services/filter/impl/PSPublishableStateFilter.java index 6eeb4191df..cedd8c9ed2 100644 --- a/system/services/src/com/percussion/services/filter/impl/PSPublishableStateFilter.java +++ b/system/services/src/com/percussion/services/filter/impl/PSPublishableStateFilter.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Filter content by the publishable state of the workflow state diff --git a/system/services/src/com/percussion/services/filter/impl/PSSiteFolderFilter.java b/system/services/src/com/percussion/services/filter/impl/PSSiteFolderFilter.java index 741e6311d2..088fed7dc2 100644 --- a/system/services/src/com/percussion/services/filter/impl/PSSiteFolderFilter.java +++ b/system/services/src/com/percussion/services/filter/impl/PSSiteFolderFilter.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/guidmgr/data/PSGuidGeneratorData.java b/system/services/src/com/percussion/services/guidmgr/data/PSGuidGeneratorData.java index 6873e7b700..b79513bd59 100644 --- a/system/services/src/com/percussion/services/guidmgr/data/PSGuidGeneratorData.java +++ b/system/services/src/com/percussion/services/guidmgr/data/PSGuidGeneratorData.java @@ -23,8 +23,8 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/guidmgr/data/PSNextNumber.java b/system/services/src/com/percussion/services/guidmgr/data/PSNextNumber.java index 21425aeea5..57532d1855 100644 --- a/system/services/src/com/percussion/services/guidmgr/data/PSNextNumber.java +++ b/system/services/src/com/percussion/services/guidmgr/data/PSNextNumber.java @@ -24,8 +24,8 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/guidmgr/impl/PSGuidManager.java b/system/services/src/com/percussion/services/guidmgr/impl/PSGuidManager.java index 5457d739f9..84b0c0b2e1 100644 --- a/system/services/src/com/percussion/services/guidmgr/impl/PSGuidManager.java +++ b/system/services/src/com/percussion/services/guidmgr/impl/PSGuidManager.java @@ -27,7 +27,7 @@ import com.percussion.util.PSBaseBean; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.types.PSConversions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.HibernateException; import org.hibernate.Session; import org.springframework.transaction.annotation.Propagation; diff --git a/system/services/src/com/percussion/services/integrations/siteimprove/PSSiteImproveProviderService.java b/system/services/src/com/percussion/services/integrations/siteimprove/PSSiteImproveProviderService.java index 886a686e99..0a9a605825 100644 --- a/system/services/src/com/percussion/services/integrations/siteimprove/PSSiteImproveProviderService.java +++ b/system/services/src/com/percussion/services/integrations/siteimprove/PSSiteImproveProviderService.java @@ -30,8 +30,8 @@ import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.httpclient.protocol.Protocol; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; -import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONException; diff --git a/system/services/src/com/percussion/services/legacy/data/PSItemEntry.java b/system/services/src/com/percussion/services/legacy/data/PSItemEntry.java index ccc6ee657e..f75416e8d5 100644 --- a/system/services/src/com/percussion/services/legacy/data/PSItemEntry.java +++ b/system/services/src/com/percussion/services/legacy/data/PSItemEntry.java @@ -27,9 +27,9 @@ import java.util.Date; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * This class contains the skeleton information of an item, which is cached diff --git a/system/services/src/com/percussion/services/legacy/impl/PSCmsObjectMgr.java b/system/services/src/com/percussion/services/legacy/impl/PSCmsObjectMgr.java index 9acd8f05e3..1f763cfc6d 100644 --- a/system/services/src/com/percussion/services/legacy/impl/PSCmsObjectMgr.java +++ b/system/services/src/com/percussion/services/legacy/impl/PSCmsObjectMgr.java @@ -86,8 +86,8 @@ import com.percussion.workflow.PSWorkflowAppsContext; import com.percussion.xml.PSXmlDocumentBuilder; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Cache; @@ -133,7 +133,7 @@ import static com.percussion.services.utils.orm.PSDataCollectionHelper.clearIdSet; import static com.percussion.services.utils.orm.PSDataCollectionHelper.createIdSet; import static com.percussion.services.utils.orm.PSDataCollectionHelper.executeQuery; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; /** * Implementation class for legacy object accessing diff --git a/system/services/src/com/percussion/services/linkmanagement/impl/PSManagedLinkDao.java b/system/services/src/com/percussion/services/linkmanagement/impl/PSManagedLinkDao.java index 1cb76ec595..6f55800f64 100644 --- a/system/services/src/com/percussion/services/linkmanagement/impl/PSManagedLinkDao.java +++ b/system/services/src/com/percussion/services/linkmanagement/impl/PSManagedLinkDao.java @@ -22,7 +22,7 @@ import com.percussion.services.linkmanagement.data.PSManagedLink; import com.percussion.share.dao.IPSGenericDao; import com.percussion.util.PSSiteManageBean; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; @@ -39,7 +39,7 @@ import java.util.List; import static com.percussion.services.utils.orm.PSDataCollectionHelper.MAX_IDS; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.springframework.util.CollectionUtils.isEmpty; /** diff --git a/system/services/src/com/percussion/services/locking/PSLockException.java b/system/services/src/com/percussion/services/locking/PSLockException.java index 25f7a57caf..af221abc32 100644 --- a/system/services/src/com/percussion/services/locking/PSLockException.java +++ b/system/services/src/com/percussion/services/locking/PSLockException.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Generic problem in locking, the message will indicate what issue occurred. diff --git a/system/services/src/com/percussion/services/locking/data/PSObjectLock.java b/system/services/src/com/percussion/services/locking/data/PSObjectLock.java index dc466dd6c3..47e58523c0 100644 --- a/system/services/src/com/percussion/services/locking/data/PSObjectLock.java +++ b/system/services/src/com/percussion/services/locking/data/PSObjectLock.java @@ -31,10 +31,10 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/locking/data/PSObjectLockSummary.java b/system/services/src/com/percussion/services/locking/data/PSObjectLockSummary.java index 7c95927bf8..3c92fbf9a4 100644 --- a/system/services/src/com/percussion/services/locking/data/PSObjectLockSummary.java +++ b/system/services/src/com/percussion/services/locking/data/PSObjectLockSummary.java @@ -16,8 +16,8 @@ */ package com.percussion.services.locking.data; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/locking/impl/PSObjectLockService.java b/system/services/src/com/percussion/services/locking/impl/PSObjectLockService.java index a8d2ebbaf9..9ed4abcd86 100644 --- a/system/services/src/com/percussion/services/locking/impl/PSObjectLockService.java +++ b/system/services/src/com/percussion/services/locking/impl/PSObjectLockService.java @@ -32,8 +32,8 @@ import com.percussion.webservices.PSErrorResultsException; import com.percussion.webservices.PSLockErrorException; import com.percussion.webservices.PSWebserviceErrors; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; @@ -224,7 +224,7 @@ public void createLocks(PSErrorResultsException results, String session, PSWebserviceErrors.createErrorMessage(code, value.getClass().getName(), new PSDesignGuid(id).getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e), e.getLocker(), + ExceptionUtils.getStackTrace(e), e.getLocker(), e.getRemainigTime()); results.addError(id, error); } diff --git a/system/services/src/com/percussion/services/memory/impl/PSEhCacheAccessor.java b/system/services/src/com/percussion/services/memory/impl/PSEhCacheAccessor.java index 6250c47be0..b814a5bb15 100644 --- a/system/services/src/com/percussion/services/memory/impl/PSEhCacheAccessor.java +++ b/system/services/src/com/percussion/services/memory/impl/PSEhCacheAccessor.java @@ -27,7 +27,7 @@ import com.percussion.util.PSBaseBean; import com.percussion.utils.guid.IPSGuid; import net.sf.ehcache.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/services/src/com/percussion/services/notification/filemonitor/impl/PSConfigFileListener.java b/system/services/src/com/percussion/services/notification/filemonitor/impl/PSConfigFileListener.java index a852386214..41ff01bf2c 100644 --- a/system/services/src/com/percussion/services/notification/filemonitor/impl/PSConfigFileListener.java +++ b/system/services/src/com/percussion/services/notification/filemonitor/impl/PSConfigFileListener.java @@ -18,7 +18,7 @@ import com.percussion.cms.IPSConstants; import com.percussion.services.notification.PSNotificationHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/notification/impl/PSMessageQueueService.java b/system/services/src/com/percussion/services/notification/impl/PSMessageQueueService.java index a572c91d1f..9575a3edd7 100644 --- a/system/services/src/com/percussion/services/notification/impl/PSMessageQueueService.java +++ b/system/services/src/com/percussion/services/notification/impl/PSMessageQueueService.java @@ -16,7 +16,7 @@ */ package com.percussion.services.notification.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.server.PSRequest; import com.percussion.services.jms.IPSQueueSender; diff --git a/system/services/src/com/percussion/services/publisher/data/PSContentList.java b/system/services/src/com/percussion/services/publisher/data/PSContentList.java index deb4be9426..0baf1221fb 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSContentList.java +++ b/system/services/src/com/percussion/services/publisher/data/PSContentList.java @@ -29,9 +29,9 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.xml.IPSXmlSerialization; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.*; import org.hibernate.annotations.Cache; diff --git a/system/services/src/com/percussion/services/publisher/data/PSContentListGeneratorParam.java b/system/services/src/com/percussion/services/publisher/data/PSContentListGeneratorParam.java index a57fc05d11..ccaf6a9e6d 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSContentListGeneratorParam.java +++ b/system/services/src/com/percussion/services/publisher/data/PSContentListGeneratorParam.java @@ -27,8 +27,8 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/publisher/data/PSContentListItem.java b/system/services/src/com/percussion/services/publisher/data/PSContentListItem.java index 4caa0397df..521430dc41 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSContentListItem.java +++ b/system/services/src/com/percussion/services/publisher/data/PSContentListItem.java @@ -20,10 +20,10 @@ import com.percussion.services.filter.data.PSFilterItem; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/publisher/data/PSContentListResults.java b/system/services/src/com/percussion/services/publisher/data/PSContentListResults.java index f8eafc26ec..3bffea5f0d 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSContentListResults.java +++ b/system/services/src/com/percussion/services/publisher/data/PSContentListResults.java @@ -18,7 +18,7 @@ package com.percussion.services.publisher.data; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.Validate.isTrue; import java.util.Iterator; diff --git a/system/services/src/com/percussion/services/publisher/data/PSDeliveryType.java b/system/services/src/com/percussion/services/publisher/data/PSDeliveryType.java index 9db6ed1c6c..b292f71ef3 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSDeliveryType.java +++ b/system/services/src/com/percussion/services/publisher/data/PSDeliveryType.java @@ -31,7 +31,7 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/publisher/data/PSEdition.java b/system/services/src/com/percussion/services/publisher/data/PSEdition.java index 8ba3c48dbe..80ce4c2706 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSEdition.java +++ b/system/services/src/com/percussion/services/publisher/data/PSEdition.java @@ -37,8 +37,8 @@ import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/publisher/data/PSEditionContentList.java b/system/services/src/com/percussion/services/publisher/data/PSEditionContentList.java index 2f3114d401..f98ea4c5da 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSEditionContentList.java +++ b/system/services/src/com/percussion/services/publisher/data/PSEditionContentList.java @@ -39,9 +39,9 @@ import javax.persistence.Entity; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.w3c.dom.Document; diff --git a/system/services/src/com/percussion/services/publisher/data/PSEditionContentListPK.java b/system/services/src/com/percussion/services/publisher/data/PSEditionContentListPK.java index 803d7cd855..170d9cd819 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSEditionContentListPK.java +++ b/system/services/src/com/percussion/services/publisher/data/PSEditionContentListPK.java @@ -21,9 +21,9 @@ import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Embedded primary key class for the edition content list. diff --git a/system/services/src/com/percussion/services/publisher/data/PSEditionTaskDef.java b/system/services/src/com/percussion/services/publisher/data/PSEditionTaskDef.java index af4977abd4..23e579ef27 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSEditionTaskDef.java +++ b/system/services/src/com/percussion/services/publisher/data/PSEditionTaskDef.java @@ -27,9 +27,9 @@ import com.percussion.utils.xml.PSInvalidXmlException; import com.percussion.utils.xml.PSXmlUtils; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; diff --git a/system/services/src/com/percussion/services/publisher/data/PSEditionTaskParam.java b/system/services/src/com/percussion/services/publisher/data/PSEditionTaskParam.java index 438e23f369..86d9564fd0 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSEditionTaskParam.java +++ b/system/services/src/com/percussion/services/publisher/data/PSEditionTaskParam.java @@ -23,9 +23,9 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * PsxEditionTaskParam generated by MyEclipse Persistence Tools diff --git a/system/services/src/com/percussion/services/publisher/data/PSEditionType.java b/system/services/src/com/percussion/services/publisher/data/PSEditionType.java index 00139e911b..a5f1dd9fb5 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSEditionType.java +++ b/system/services/src/com/percussion/services/publisher/data/PSEditionType.java @@ -16,7 +16,7 @@ */ package com.percussion.services.publisher.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents the type of an edition. diff --git a/system/services/src/com/percussion/services/publisher/data/PSItemPublishingHistory.java b/system/services/src/com/percussion/services/publisher/data/PSItemPublishingHistory.java index 6f1e6aec3f..48017b2bcf 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSItemPublishingHistory.java +++ b/system/services/src/com/percussion/services/publisher/data/PSItemPublishingHistory.java @@ -17,7 +17,7 @@ package com.percussion.services.publisher.data; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.share.data.PSAbstractDataObject; diff --git a/system/services/src/com/percussion/services/publisher/data/PSSortCriterion.java b/system/services/src/com/percussion/services/publisher/data/PSSortCriterion.java index 463df9ddc2..fdedddaf49 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSSortCriterion.java +++ b/system/services/src/com/percussion/services/publisher/data/PSSortCriterion.java @@ -16,9 +16,9 @@ */ package com.percussion.services.publisher.data; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/publisher/data/PSTemplateExpanderParam.java b/system/services/src/com/percussion/services/publisher/data/PSTemplateExpanderParam.java index cdb576ccca..bf5e6cec09 100644 --- a/system/services/src/com/percussion/services/publisher/data/PSTemplateExpanderParam.java +++ b/system/services/src/com/percussion/services/publisher/data/PSTemplateExpanderParam.java @@ -27,8 +27,8 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSBaseTemplateExpander.java b/system/services/src/com/percussion/services/publisher/impl/PSBaseTemplateExpander.java index 957cbaf147..6475afe9c6 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSBaseTemplateExpander.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSBaseTemplateExpander.java @@ -45,7 +45,7 @@ import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The base template expander services as a base class for writing template diff --git a/system/services/src/com/percussion/services/publisher/impl/PSChangedContentListGenerator.java b/system/services/src/com/percussion/services/publisher/impl/PSChangedContentListGenerator.java index 7eb69231bd..79a551ed7e 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSChangedContentListGenerator.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSChangedContentListGenerator.java @@ -32,8 +32,8 @@ import javax.jcr.query.QueryResult; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSContentListServlet.java b/system/services/src/com/percussion/services/publisher/impl/PSContentListServlet.java index b00a43fd81..7e0f65f1fe 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSContentListServlet.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSContentListServlet.java @@ -42,7 +42,7 @@ import com.percussion.util.PSUrlUtils; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.timing.PSStopwatch; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSIncrementalPublishingFilter.java b/system/services/src/com/percussion/services/publisher/impl/PSIncrementalPublishingFilter.java index c77ae20e4f..bd77c123bc 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSIncrementalPublishingFilter.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSIncrementalPublishingFilter.java @@ -16,7 +16,7 @@ */ package com.percussion.services.publisher.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.assembly.IPSAssemblyService; import com.percussion.services.assembly.IPSAssemblyTemplate; @@ -55,8 +55,8 @@ import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSJexlLocationGenerator.java b/system/services/src/com/percussion/services/publisher/impl/PSJexlLocationGenerator.java index 553336ecd1..b159e7a797 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSJexlLocationGenerator.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSJexlLocationGenerator.java @@ -45,7 +45,7 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.jexl.IPSScript; import com.percussion.utils.jexl.PSJexlEvaluator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSListTemplateExpander.java b/system/services/src/com/percussion/services/publisher/impl/PSListTemplateExpander.java index f21914d982..95f5586624 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSListTemplateExpander.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSListTemplateExpander.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The list template expander takes a list of templates as a parameter and diff --git a/system/services/src/com/percussion/services/publisher/impl/PSPublisherService.java b/system/services/src/com/percussion/services/publisher/impl/PSPublisherService.java index a461787c35..5c6990ab36 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSPublisherService.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSPublisherService.java @@ -105,9 +105,9 @@ import com.percussion.utils.jdbc.PSConnectionDetail; import com.percussion.utils.timing.PSTimer; import com.percussion.utils.xml.PSInvalidXmlException; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; @@ -156,9 +156,9 @@ import static com.percussion.services.utils.orm.PSDataCollectionHelper.clearIdSet; import static com.percussion.services.utils.orm.PSDataCollectionHelper.createIdSet; import static com.percussion.services.utils.orm.PSDataCollectionHelper.executeQuery; -import static org.apache.commons.lang.StringUtils.join; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.join; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /**` * Implementation of content list service, see interface for contracts. diff --git a/system/services/src/com/percussion/services/publisher/impl/PSQueryContentListGenerator.java b/system/services/src/com/percussion/services/publisher/impl/PSQueryContentListGenerator.java index f63fb1482b..de0ab07f52 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSQueryContentListGenerator.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSQueryContentListGenerator.java @@ -32,7 +32,7 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Content list generator based on JSR-170 queries diff --git a/system/services/src/com/percussion/services/publisher/impl/PSSelectedItemsGenerator.java b/system/services/src/com/percussion/services/publisher/impl/PSSelectedItemsGenerator.java index 24687de3a9..855b33b07c 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSSelectedItemsGenerator.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSSelectedItemsGenerator.java @@ -41,7 +41,7 @@ import javax.jcr.Value; import javax.jcr.query.QueryResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A generator that returns the items selected by the user for demand diff --git a/system/services/src/com/percussion/services/publisher/impl/PSSiteItemsGenerator.java b/system/services/src/com/percussion/services/publisher/impl/PSSiteItemsGenerator.java index 898a5e87b2..1ee518a2f0 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSSiteItemsGenerator.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSSiteItemsGenerator.java @@ -39,7 +39,7 @@ import javax.jcr.query.QueryResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSSiteTemplateExpander.java b/system/services/src/com/percussion/services/publisher/impl/PSSiteTemplateExpander.java index 98804dfd24..3da0214782 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSSiteTemplateExpander.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSSiteTemplateExpander.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/publisher/impl/PSTouchParentItemsHandler.java b/system/services/src/com/percussion/services/publisher/impl/PSTouchParentItemsHandler.java index 791e374ba0..c8b4a9588c 100644 --- a/system/services/src/com/percussion/services/publisher/impl/PSTouchParentItemsHandler.java +++ b/system/services/src/com/percussion/services/publisher/impl/PSTouchParentItemsHandler.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/publisher/ui/PSContentListSelect.java b/system/services/src/com/percussion/services/publisher/ui/PSContentListSelect.java index d23651fa4e..3b4c008426 100644 --- a/system/services/src/com/percussion/services/publisher/ui/PSContentListSelect.java +++ b/system/services/src/com/percussion/services/publisher/ui/PSContentListSelect.java @@ -52,10 +52,10 @@ import javax.faces.model.SelectItem; import javax.faces.validator.ValidatorException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * JSF managed bean to handle the content list views. This model holds state diff --git a/system/services/src/com/percussion/services/publisher/ui/PSPublisherUI.java b/system/services/src/com/percussion/services/publisher/ui/PSPublisherUI.java index fad11a8d61..ce9e042b79 100644 --- a/system/services/src/com/percussion/services/publisher/ui/PSPublisherUI.java +++ b/system/services/src/com/percussion/services/publisher/ui/PSPublisherUI.java @@ -37,7 +37,7 @@ import javax.faces.model.SelectItem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Provides a set of getters to populate browser UIs. Each method is named for diff --git a/system/services/src/com/percussion/services/publisher/ui/PSSiteListSelect.java b/system/services/src/com/percussion/services/publisher/ui/PSSiteListSelect.java index 78aadc6da0..527656e535 100644 --- a/system/services/src/com/percussion/services/publisher/ui/PSSiteListSelect.java +++ b/system/services/src/com/percussion/services/publisher/ui/PSSiteListSelect.java @@ -29,10 +29,10 @@ import com.percussion.services.sitemgr.data.PSSite; import com.percussion.services.sitemgr.data.PSSiteProperty; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/services/src/com/percussion/services/pubserver/data/PSPubServer.java b/system/services/src/com/percussion/services/pubserver/data/PSPubServer.java index 6a442a65d1..b1420e8dd0 100644 --- a/system/services/src/com/percussion/services/pubserver/data/PSPubServer.java +++ b/system/services/src/com/percussion/services/pubserver/data/PSPubServer.java @@ -26,8 +26,8 @@ import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.share.data.PSAbstractDataObject; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.annotations.Cache; @@ -51,9 +51,9 @@ import java.util.List; import java.util.Set; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.Validate.notEmpty; /** * Represents a publishing server related to a given site. diff --git a/system/services/src/com/percussion/services/pubserver/data/PSPubServerProperty.java b/system/services/src/com/percussion/services/pubserver/data/PSPubServerProperty.java index 95cd9bb22c..041392fcf0 100644 --- a/system/services/src/com/percussion/services/pubserver/data/PSPubServerProperty.java +++ b/system/services/src/com/percussion/services/pubserver/data/PSPubServerProperty.java @@ -22,9 +22,9 @@ import com.percussion.server.PSServer; import com.percussion.share.data.PSAbstractDataObject; import com.percussion.utils.io.PathUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.annotations.Cache; diff --git a/system/services/src/com/percussion/services/pubserver/impl/PSDatabasePubServerFilesService.java b/system/services/src/com/percussion/services/pubserver/impl/PSDatabasePubServerFilesService.java index f93b760c70..19c692e812 100644 --- a/system/services/src/com/percussion/services/pubserver/impl/PSDatabasePubServerFilesService.java +++ b/system/services/src/com/percussion/services/pubserver/impl/PSDatabasePubServerFilesService.java @@ -28,7 +28,7 @@ import com.percussion.utils.jdbc.IPSDatasourceResolver; import com.percussion.utils.jdbc.PSDatasourceConfig; import com.percussion.utils.servlet.PSServletUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -42,9 +42,9 @@ import java.util.Map; import java.util.Set; -import static org.apache.commons.lang.StringUtils.isNotEmpty; -import static org.apache.commons.lang.StringUtils.isNumeric; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; +import static org.apache.commons.lang3.StringUtils.isNumeric; +import static org.apache.commons.lang3.Validate.notNull; public class PSDatabasePubServerFilesService implements IPSDatabasePubServerFilesService { diff --git a/system/services/src/com/percussion/services/pubserver/impl/PSPubServerDao.java b/system/services/src/com/percussion/services/pubserver/impl/PSPubServerDao.java index 947cc159e1..b2802d431f 100644 --- a/system/services/src/com/percussion/services/pubserver/impl/PSPubServerDao.java +++ b/system/services/src/com/percussion/services/pubserver/impl/PSPubServerDao.java @@ -39,7 +39,7 @@ import javax.persistence.PersistenceContext; import java.util.List; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; @Transactional @PSBaseBean("sys_pubserverdao") diff --git a/system/services/src/com/percussion/services/relationship/data/PSRelationshipConfigName.java b/system/services/src/com/percussion/services/relationship/data/PSRelationshipConfigName.java index 62c561697f..ea8d7565b2 100644 --- a/system/services/src/com/percussion/services/relationship/data/PSRelationshipConfigName.java +++ b/system/services/src/com/percussion/services/relationship/data/PSRelationshipConfigName.java @@ -28,8 +28,8 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/schedule/data/PSJob.java b/system/services/src/com/percussion/services/schedule/data/PSJob.java index 78c0bfdd1c..82e28fcc2f 100644 --- a/system/services/src/com/percussion/services/schedule/data/PSJob.java +++ b/system/services/src/com/percussion/services/schedule/data/PSJob.java @@ -16,7 +16,7 @@ */ package com.percussion.services.schedule.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.PSTypeEnum; import com.percussion.utils.guid.IPSGuid; @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * It contains information for executing and notification of a job. diff --git a/system/services/src/com/percussion/services/schedule/data/PSNotificationTemplate.java b/system/services/src/com/percussion/services/schedule/data/PSNotificationTemplate.java index 7bbe26c66a..246074cbdd 100644 --- a/system/services/src/com/percussion/services/schedule/data/PSNotificationTemplate.java +++ b/system/services/src/com/percussion/services/schedule/data/PSNotificationTemplate.java @@ -31,9 +31,9 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/schedule/data/PSScheduledTask.java b/system/services/src/com/percussion/services/schedule/data/PSScheduledTask.java index 93115edcb5..dead784b1c 100644 --- a/system/services/src/com/percussion/services/schedule/data/PSScheduledTask.java +++ b/system/services/src/com/percussion/services/schedule/data/PSScheduledTask.java @@ -18,7 +18,7 @@ import java.util.Comparator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.quartz.CronTrigger; /** diff --git a/system/services/src/com/percussion/services/schedule/data/PSScheduledTaskLog.java b/system/services/src/com/percussion/services/schedule/data/PSScheduledTaskLog.java index 3b240cd21c..6f35ccfb46 100644 --- a/system/services/src/com/percussion/services/schedule/data/PSScheduledTaskLog.java +++ b/system/services/src/com/percussion/services/schedule/data/PSScheduledTaskLog.java @@ -30,8 +30,8 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/schedule/data/PSTaskResult.java b/system/services/src/com/percussion/services/schedule/data/PSTaskResult.java index 2d77d26154..d8c321be56 100644 --- a/system/services/src/com/percussion/services/schedule/data/PSTaskResult.java +++ b/system/services/src/com/percussion/services/schedule/data/PSTaskResult.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * It contains the result of an executed task diff --git a/system/services/src/com/percussion/services/schedule/impl/PSRunCommand.java b/system/services/src/com/percussion/services/schedule/impl/PSRunCommand.java index e25639c054..44c5756c4e 100644 --- a/system/services/src/com/percussion/services/schedule/impl/PSRunCommand.java +++ b/system/services/src/com/percussion/services/schedule/impl/PSRunCommand.java @@ -16,8 +16,8 @@ */ package com.percussion.services.schedule.impl; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.extension.IPSExtensionDef; import com.percussion.extension.PSExtensionException; @@ -31,7 +31,7 @@ import java.io.File; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/schedule/impl/PSRunEdition.java b/system/services/src/com/percussion/services/schedule/impl/PSRunEdition.java index 2907905158..980478b3b4 100644 --- a/system/services/src/com/percussion/services/schedule/impl/PSRunEdition.java +++ b/system/services/src/com/percussion/services/schedule/impl/PSRunEdition.java @@ -38,7 +38,7 @@ import com.percussion.services.sitemgr.PSSiteManagerLocator; import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/schedule/impl/PSSchedulerBean.java b/system/services/src/com/percussion/services/schedule/impl/PSSchedulerBean.java index 7052def8a8..f01026579c 100644 --- a/system/services/src/com/percussion/services/schedule/impl/PSSchedulerBean.java +++ b/system/services/src/com/percussion/services/schedule/impl/PSSchedulerBean.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Properties; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.quartz.Scheduler; diff --git a/system/services/src/com/percussion/services/schedule/impl/PSTaskAdapter.java b/system/services/src/com/percussion/services/schedule/impl/PSTaskAdapter.java index 6c48c23423..17313666f4 100644 --- a/system/services/src/com/percussion/services/schedule/impl/PSTaskAdapter.java +++ b/system/services/src/com/percussion/services/schedule/impl/PSTaskAdapter.java @@ -46,7 +46,7 @@ import com.percussion.utils.jexl.PSJexlEvaluator; import com.percussion.workflow.PSWorkFlowUtils; import com.percussion.workflow.mail.PSMailMessageContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.velocity.Template; diff --git a/system/services/src/com/percussion/services/security/PSJaasUtils.java b/system/services/src/com/percussion/services/security/PSJaasUtils.java index fbbf733b4b..64e521d1d5 100644 --- a/system/services/src/com/percussion/services/security/PSJaasUtils.java +++ b/system/services/src/com/percussion/services/security/PSJaasUtils.java @@ -50,7 +50,7 @@ import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.FilterIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Handy utility functions for use with the Java Authorization and diff --git a/system/services/src/com/percussion/services/security/PSPrincipalAttribute.java b/system/services/src/com/percussion/services/security/PSPrincipalAttribute.java index c39b936ed4..3b018e49e1 100644 --- a/system/services/src/com/percussion/services/security/PSPrincipalAttribute.java +++ b/system/services/src/com/percussion/services/security/PSPrincipalAttribute.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Simple implementation of the {@link IPSPrincipalAttribute} interface. diff --git a/system/services/src/com/percussion/services/security/PSServletRequestWrapper.java b/system/services/src/com/percussion/services/security/PSServletRequestWrapper.java index acc30372cb..2f3f4d2b06 100644 --- a/system/services/src/com/percussion/services/security/PSServletRequestWrapper.java +++ b/system/services/src/com/percussion/services/security/PSServletRequestWrapper.java @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; diff --git a/system/services/src/com/percussion/services/security/PSTypedPrincipal.java b/system/services/src/com/percussion/services/security/PSTypedPrincipal.java index e6c501b733..47bb0b84b6 100644 --- a/system/services/src/com/percussion/services/security/PSTypedPrincipal.java +++ b/system/services/src/com/percussion/services/security/PSTypedPrincipal.java @@ -21,9 +21,9 @@ import java.io.Serializable; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Simple implementation of the {@link IPSTypedPrincipal} interface. diff --git a/system/services/src/com/percussion/services/security/data/PSAclEntryImpl.java b/system/services/src/com/percussion/services/security/data/PSAclEntryImpl.java index 6115e8c284..0c0eed85c6 100644 --- a/system/services/src/com/percussion/services/security/data/PSAclEntryImpl.java +++ b/system/services/src/com/percussion/services/security/data/PSAclEntryImpl.java @@ -23,7 +23,7 @@ import com.percussion.security.IPSTypedPrincipal; import com.percussion.security.IPSTypedPrincipal.PrincipalTypes; import com.percussion.utils.xml.IPSXmlSerialization; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.annotations.Cache; diff --git a/system/services/src/com/percussion/services/security/data/PSBackEndRole.java b/system/services/src/com/percussion/services/security/data/PSBackEndRole.java index 89eadbee93..413a1e045d 100644 --- a/system/services/src/com/percussion/services/security/data/PSBackEndRole.java +++ b/system/services/src/com/percussion/services/security/data/PSBackEndRole.java @@ -17,7 +17,7 @@ package com.percussion.services.security.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/security/data/PSCatalogerConfig.java b/system/services/src/com/percussion/services/security/data/PSCatalogerConfig.java index 4e5a41497f..8bb9f5e16d 100644 --- a/system/services/src/com/percussion/services/security/data/PSCatalogerConfig.java +++ b/system/services/src/com/percussion/services/security/data/PSCatalogerConfig.java @@ -27,9 +27,9 @@ import java.util.Map; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/services/src/com/percussion/services/security/data/PSCommunity.java b/system/services/src/com/percussion/services/security/data/PSCommunity.java index ac0282860f..b75529b525 100644 --- a/system/services/src/com/percussion/services/security/data/PSCommunity.java +++ b/system/services/src/com/percussion/services/security/data/PSCommunity.java @@ -45,10 +45,10 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.*; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociation.java b/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociation.java index 0cd66ec33f..06df0b648d 100644 --- a/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociation.java +++ b/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociation.java @@ -25,9 +25,9 @@ import javax.persistence.Table; import javax.persistence.Transient; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociationPK.java b/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociationPK.java index 64adcb5c5c..0d8a1285f5 100644 --- a/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociationPK.java +++ b/system/services/src/com/percussion/services/security/data/PSCommunityRoleAssociationPK.java @@ -22,10 +22,10 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * The primary key class for the {@link PSCommunityRoleAssociation association}. diff --git a/system/services/src/com/percussion/services/security/data/PSCommunityVisibility.java b/system/services/src/com/percussion/services/security/data/PSCommunityVisibility.java index 8da7f1b047..2d4b1b6d83 100644 --- a/system/services/src/com/percussion/services/security/data/PSCommunityVisibility.java +++ b/system/services/src/com/percussion/services/security/data/PSCommunityVisibility.java @@ -30,9 +30,9 @@ import java.util.Objects; import java.util.Set; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/security/data/PSLogin.java b/system/services/src/com/percussion/services/security/data/PSLogin.java index 82c57c08f9..d03b6ea4bb 100644 --- a/system/services/src/com/percussion/services/security/data/PSLogin.java +++ b/system/services/src/com/percussion/services/security/data/PSLogin.java @@ -20,7 +20,7 @@ import com.percussion.design.objectstore.PSRole; import com.percussion.i18n.PSLocale; import com.percussion.services.utils.xml.PSXmlSerializationHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.SAXException; import java.io.IOException; diff --git a/system/services/src/com/percussion/services/security/data/PSUserAccessLevel.java b/system/services/src/com/percussion/services/security/data/PSUserAccessLevel.java index 7c8eb93d84..93efcf91a1 100644 --- a/system/services/src/com/percussion/services/security/data/PSUserAccessLevel.java +++ b/system/services/src/com/percussion/services/security/data/PSUserAccessLevel.java @@ -25,9 +25,9 @@ import java.util.Objects; import java.util.Set; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Provides the sum of a user's permissions for a given resource. diff --git a/system/services/src/com/percussion/services/security/impl/PSBackEndRoleMgr.java b/system/services/src/com/percussion/services/security/impl/PSBackEndRoleMgr.java index 8a00769a31..d88a0b53d2 100644 --- a/system/services/src/com/percussion/services/security/impl/PSBackEndRoleMgr.java +++ b/system/services/src/com/percussion/services/security/impl/PSBackEndRoleMgr.java @@ -52,7 +52,7 @@ import com.percussion.utils.jdbc.PSConnectionDetail; import com.percussion.utils.jdbc.PSConnectionHelper; import com.percussion.utils.request.PSRequestInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/security/impl/PSRoleMgr.java b/system/services/src/com/percussion/services/security/impl/PSRoleMgr.java index 4e5e1e8fe1..a73e902e70 100644 --- a/system/services/src/com/percussion/services/security/impl/PSRoleMgr.java +++ b/system/services/src/com/percussion/services/security/impl/PSRoleMgr.java @@ -41,7 +41,7 @@ import com.percussion.util.PSBaseBean; import com.percussion.utils.servlet.PSServletUtils; import com.percussion.utils.xml.PSInvalidXmlException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/security/loginmods/data/PSGroup.java b/system/services/src/com/percussion/services/security/loginmods/data/PSGroup.java index 210dcd5cba..fbb4fa3433 100644 --- a/system/services/src/com/percussion/services/security/loginmods/data/PSGroup.java +++ b/system/services/src/com/percussion/services/security/loginmods/data/PSGroup.java @@ -25,9 +25,9 @@ import java.util.Set; import org.apache.commons.collections.iterators.IteratorEnumeration; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Implements a security group diff --git a/system/services/src/com/percussion/services/security/loginmods/data/PSPrincipal.java b/system/services/src/com/percussion/services/security/loginmods/data/PSPrincipal.java index 438adec489..53f38e3cfa 100644 --- a/system/services/src/com/percussion/services/security/loginmods/data/PSPrincipal.java +++ b/system/services/src/com/percussion/services/security/loginmods/data/PSPrincipal.java @@ -20,8 +20,8 @@ import java.security.Principal; import java.util.Objects; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * An implementation of a security principal diff --git a/system/services/src/com/percussion/services/security/test/PSMockRoleCataloger.java b/system/services/src/com/percussion/services/security/test/PSMockRoleCataloger.java index aed3a11e6e..37fe721159 100644 --- a/system/services/src/com/percussion/services/security/test/PSMockRoleCataloger.java +++ b/system/services/src/com/percussion/services/security/test/PSMockRoleCataloger.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Mock implementation of the {@link IPSRoleCataloger} for testing purposes. diff --git a/system/services/src/com/percussion/services/security/test/PSMockSubjectCataloger.java b/system/services/src/com/percussion/services/security/test/PSMockSubjectCataloger.java index bf1127db02..04ec5f3db7 100644 --- a/system/services/src/com/percussion/services/security/test/PSMockSubjectCataloger.java +++ b/system/services/src/com/percussion/services/security/test/PSMockSubjectCataloger.java @@ -34,7 +34,7 @@ import javax.security.auth.Subject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Mock implementation of the {@link IPSSubjectCataloger} for testing purposes. diff --git a/system/services/src/com/percussion/services/siteimportsummary/impl/PSSiteImportSummaryDao.java b/system/services/src/com/percussion/services/siteimportsummary/impl/PSSiteImportSummaryDao.java index 1b7aba9ad6..d9aaae0d70 100644 --- a/system/services/src/com/percussion/services/siteimportsummary/impl/PSSiteImportSummaryDao.java +++ b/system/services/src/com/percussion/services/siteimportsummary/impl/PSSiteImportSummaryDao.java @@ -23,7 +23,7 @@ import com.percussion.services.siteimportsummary.data.PSSiteImportSummary; import com.percussion.share.dao.IPSGenericDao; import com.percussion.util.PSBaseBean; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/system/services/src/com/percussion/services/sitemgr/PSSiteHelper.java b/system/services/src/com/percussion/services/sitemgr/PSSiteHelper.java index b7a11824fd..0fae379b49 100644 --- a/system/services/src/com/percussion/services/sitemgr/PSSiteHelper.java +++ b/system/services/src/com/percussion/services/sitemgr/PSSiteHelper.java @@ -33,8 +33,8 @@ import com.percussion.services.utils.jexl.PSServiceJexlEvaluatorBase; import com.percussion.util.IPSHtmlParameters; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/sitemgr/data/PSLocationScheme.java b/system/services/src/com/percussion/services/sitemgr/data/PSLocationScheme.java index f0ef956a7f..a7bd7533d1 100644 --- a/system/services/src/com/percussion/services/sitemgr/data/PSLocationScheme.java +++ b/system/services/src/com/percussion/services/sitemgr/data/PSLocationScheme.java @@ -30,10 +30,10 @@ import com.percussion.utils.xml.PSInvalidXmlException; import com.percussion.utils.xml.PSXmlUtils; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; diff --git a/system/services/src/com/percussion/services/sitemgr/data/PSLocationSchemeParameter.java b/system/services/src/com/percussion/services/sitemgr/data/PSLocationSchemeParameter.java index 7268c203ea..3a087796b1 100644 --- a/system/services/src/com/percussion/services/sitemgr/data/PSLocationSchemeParameter.java +++ b/system/services/src/com/percussion/services/sitemgr/data/PSLocationSchemeParameter.java @@ -28,10 +28,10 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/sitemgr/data/PSPublishingContext.java b/system/services/src/com/percussion/services/sitemgr/data/PSPublishingContext.java index 36e6aa120e..c21043e430 100644 --- a/system/services/src/com/percussion/services/sitemgr/data/PSPublishingContext.java +++ b/system/services/src/com/percussion/services/sitemgr/data/PSPublishingContext.java @@ -43,10 +43,10 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.w3c.dom.Document; diff --git a/system/services/src/com/percussion/services/sitemgr/data/PSSite.java b/system/services/src/com/percussion/services/sitemgr/data/PSSite.java index c6a714ab3e..b5db522c46 100644 --- a/system/services/src/com/percussion/services/sitemgr/data/PSSite.java +++ b/system/services/src/com/percussion/services/sitemgr/data/PSSite.java @@ -34,8 +34,8 @@ import com.percussion.utils.xml.IPSXmlSerialization; import com.percussion.xml.PSXmlDocumentBuilder; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Fetch; @@ -68,7 +68,7 @@ import static com.percussion.util.PSBase64Decoder.decode; import static com.percussion.util.PSBase64Encoder.encode; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; /** * A site represents a logical (and currently physical) place to publish diff --git a/system/services/src/com/percussion/services/sitemgr/data/PSSiteProperty.java b/system/services/src/com/percussion/services/sitemgr/data/PSSiteProperty.java index b8a1e20d79..559e4321c6 100644 --- a/system/services/src/com/percussion/services/sitemgr/data/PSSiteProperty.java +++ b/system/services/src/com/percussion/services/sitemgr/data/PSSiteProperty.java @@ -23,10 +23,10 @@ import com.percussion.services.sitemgr.IPSSite; import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/sitemgr/impl/PSSiteManager.java b/system/services/src/com/percussion/services/sitemgr/impl/PSSiteManager.java index 5543b5c6c1..c612dc52f6 100644 --- a/system/services/src/com/percussion/services/sitemgr/impl/PSSiteManager.java +++ b/system/services/src/com/percussion/services/sitemgr/impl/PSSiteManager.java @@ -63,7 +63,7 @@ import com.percussion.utils.request.PSRequestInfo; import com.percussion.utils.types.PSPair; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/system/PSAssignmentTypeHelper.java b/system/services/src/com/percussion/services/system/PSAssignmentTypeHelper.java index ff99e7ed8b..32dbbb4f55 100644 --- a/system/services/src/com/percussion/services/system/PSAssignmentTypeHelper.java +++ b/system/services/src/com/percussion/services/system/PSAssignmentTypeHelper.java @@ -55,7 +55,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/system/data/PSAudit.java b/system/services/src/com/percussion/services/system/data/PSAudit.java index 68fb2022e9..afd86d0e6d 100644 --- a/system/services/src/com/percussion/services/system/data/PSAudit.java +++ b/system/services/src/com/percussion/services/system/data/PSAudit.java @@ -21,9 +21,9 @@ import java.util.Date; import java.util.Objects; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; import com.percussion.services.catalog.PSTypeEnum; diff --git a/system/services/src/com/percussion/services/system/data/PSAuditTrail.java b/system/services/src/com/percussion/services/system/data/PSAuditTrail.java index 96da06d803..0c8e4438a0 100644 --- a/system/services/src/com/percussion/services/system/data/PSAuditTrail.java +++ b/system/services/src/com/percussion/services/system/data/PSAuditTrail.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Objects; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/system/data/PSDependency.java b/system/services/src/com/percussion/services/system/data/PSDependency.java index 92ef93c484..a9ce4de4b2 100644 --- a/system/services/src/com/percussion/services/system/data/PSDependency.java +++ b/system/services/src/com/percussion/services/system/data/PSDependency.java @@ -26,9 +26,9 @@ import java.util.Objects; import java.util.Set; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/system/data/PSDependent.java b/system/services/src/com/percussion/services/system/data/PSDependent.java index 9f70f5fe1d..447f307f00 100644 --- a/system/services/src/com/percussion/services/system/data/PSDependent.java +++ b/system/services/src/com/percussion/services/system/data/PSDependent.java @@ -23,10 +23,10 @@ import java.io.Serializable; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/system/data/PSMimeContentAdapter.java b/system/services/src/com/percussion/services/system/data/PSMimeContentAdapter.java index c8fe5ef8b2..0e4824a01c 100644 --- a/system/services/src/com/percussion/services/system/data/PSMimeContentAdapter.java +++ b/system/services/src/com/percussion/services/system/data/PSMimeContentAdapter.java @@ -32,9 +32,9 @@ import java.io.Serializable; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/system/data/PSSharedProperty.java b/system/services/src/com/percussion/services/system/data/PSSharedProperty.java index ccefb8820a..0e7b907adb 100644 --- a/system/services/src/com/percussion/services/system/data/PSSharedProperty.java +++ b/system/services/src/com/percussion/services/system/data/PSSharedProperty.java @@ -33,10 +33,10 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/system/impl/PSSystemService.java b/system/services/src/com/percussion/services/system/impl/PSSystemService.java index c9da12d7f3..9d4c305c83 100644 --- a/system/services/src/com/percussion/services/system/impl/PSSystemService.java +++ b/system/services/src/com/percussion/services/system/impl/PSSystemService.java @@ -58,7 +58,7 @@ import com.percussion.utils.jdbc.IPSDatasourceManager; import com.percussion.utils.jdbc.PSConnectionDetail; import com.percussion.workflow.mail.IPSMailMessageContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -99,8 +99,8 @@ import static com.percussion.webservices.PSWebserviceUtils.getUserCommunityId; import static com.percussion.webservices.PSWebserviceUtils.getUserName; import static com.percussion.webservices.PSWebserviceUtils.getUserRoles; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * Implements all services defined with the IPSSystemService diff --git a/system/services/src/com/percussion/services/touchitem/PSTouchItemConfiguration.java b/system/services/src/com/percussion/services/touchitem/PSTouchItemConfiguration.java index 84deef36bf..e6b941af43 100644 --- a/system/services/src/com/percussion/services/touchitem/PSTouchItemConfiguration.java +++ b/system/services/src/com/percussion/services/touchitem/PSTouchItemConfiguration.java @@ -17,7 +17,7 @@ package com.percussion.services.touchitem; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.server.PSItemDefManager; diff --git a/system/services/src/com/percussion/services/ui/data/PSHierarchyNode.java b/system/services/src/com/percussion/services/ui/data/PSHierarchyNode.java index f3cf9087b3..c0c025c151 100644 --- a/system/services/src/com/percussion/services/ui/data/PSHierarchyNode.java +++ b/system/services/src/com/percussion/services/ui/data/PSHierarchyNode.java @@ -38,10 +38,10 @@ import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/ui/data/PSHierarchyNodeProperty.java b/system/services/src/com/percussion/services/ui/data/PSHierarchyNodeProperty.java index d42965e467..f785fbd6b5 100644 --- a/system/services/src/com/percussion/services/ui/data/PSHierarchyNodeProperty.java +++ b/system/services/src/com/percussion/services/ui/data/PSHierarchyNodeProperty.java @@ -31,10 +31,10 @@ import javax.persistence.Table; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/ui/data/PSHierarchyNodePropertyPK.java b/system/services/src/com/percussion/services/ui/data/PSHierarchyNodePropertyPK.java index 8e07ae931c..1f68a2c311 100644 --- a/system/services/src/com/percussion/services/ui/data/PSHierarchyNodePropertyPK.java +++ b/system/services/src/com/percussion/services/ui/data/PSHierarchyNodePropertyPK.java @@ -22,8 +22,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * The primary key for {@link PSHierarchyNodeProperty} object. This is diff --git a/system/services/src/com/percussion/services/ui/impl/PSUiService.java b/system/services/src/com/percussion/services/ui/impl/PSUiService.java index 9f95c6a64b..2ca3cce640 100644 --- a/system/services/src/com/percussion/services/ui/impl/PSUiService.java +++ b/system/services/src/com/percussion/services/ui/impl/PSUiService.java @@ -26,7 +26,7 @@ import com.percussion.services.ui.data.PSHierarchyNodeProperty; import com.percussion.util.PSBaseBean; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.criterion.Order; diff --git a/system/services/src/com/percussion/services/useritems/impl/PSUserItemsDao.java b/system/services/src/com/percussion/services/useritems/impl/PSUserItemsDao.java index 4b5ad1ed6c..879a304cfb 100644 --- a/system/services/src/com/percussion/services/useritems/impl/PSUserItemsDao.java +++ b/system/services/src/com/percussion/services/useritems/impl/PSUserItemsDao.java @@ -22,8 +22,8 @@ import com.percussion.services.useritems.data.PSUserItem; import com.percussion.share.dao.IPSGenericDao; import com.percussion.util.PSBaseBean; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/system/services/src/com/percussion/services/utils/general/PSAssemblyServiceUtils.java b/system/services/src/com/percussion/services/utils/general/PSAssemblyServiceUtils.java index 1b2944efb6..f58ba273d4 100644 --- a/system/services/src/com/percussion/services/utils/general/PSAssemblyServiceUtils.java +++ b/system/services/src/com/percussion/services/utils/general/PSAssemblyServiceUtils.java @@ -30,7 +30,7 @@ import com.percussion.util.PSParseUrlQueryString; import com.percussion.utils.guid.IPSGuid; import com.percussion.utils.types.PSPair; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.jcr.ItemNotFoundException; import javax.jcr.RepositoryException; diff --git a/system/services/src/com/percussion/services/utils/jexl/PSVelocityUtils.java b/system/services/src/com/percussion/services/utils/jexl/PSVelocityUtils.java index 98387117a9..847a85f666 100644 --- a/system/services/src/com/percussion/services/utils/jexl/PSVelocityUtils.java +++ b/system/services/src/com/percussion/services/utils/jexl/PSVelocityUtils.java @@ -19,7 +19,7 @@ import com.percussion.error.PSExceptionUtils; import com.percussion.server.PSServer; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/utils/jsf/PSNormalizePath.java b/system/services/src/com/percussion/services/utils/jsf/PSNormalizePath.java index 3934bfb24a..6b175960ed 100644 --- a/system/services/src/com/percussion/services/utils/jsf/PSNormalizePath.java +++ b/system/services/src/com/percussion/services/utils/jsf/PSNormalizePath.java @@ -16,7 +16,7 @@ */ package com.percussion.services.utils.jsf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; diff --git a/system/services/src/com/percussion/services/utils/jsf/validators/PSBaseValidator.java b/system/services/src/com/percussion/services/utils/jsf/validators/PSBaseValidator.java index 37f369199b..88c484b983 100644 --- a/system/services/src/com/percussion/services/utils/jsf/validators/PSBaseValidator.java +++ b/system/services/src/com/percussion/services/utils/jsf/validators/PSBaseValidator.java @@ -25,7 +25,7 @@ import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Base class for validators, encapsulates message production diff --git a/system/services/src/com/percussion/services/utils/jsf/validators/PSPathExists.java b/system/services/src/com/percussion/services/utils/jsf/validators/PSPathExists.java index 35b9281483..27b949cad2 100644 --- a/system/services/src/com/percussion/services/utils/jsf/validators/PSPathExists.java +++ b/system/services/src/com/percussion/services/utils/jsf/validators/PSPathExists.java @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; import javax.faces.validator.ValidatorException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Checks that the path exists within the Rx system. Forwarde or backslashes may diff --git a/system/services/src/com/percussion/services/utils/jsf/validators/PSUniqueValidator.java b/system/services/src/com/percussion/services/utils/jsf/validators/PSUniqueValidator.java index 2fd6ef7b96..e6b28ec3f0 100644 --- a/system/services/src/com/percussion/services/utils/jsf/validators/PSUniqueValidator.java +++ b/system/services/src/com/percussion/services/utils/jsf/validators/PSUniqueValidator.java @@ -16,7 +16,7 @@ */ package com.percussion.services.utils.jsf.validators; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import java.util.Collection; diff --git a/system/services/src/com/percussion/services/utils/jspel/PSItemUtilities.java b/system/services/src/com/percussion/services/utils/jspel/PSItemUtilities.java index 3add407e7c..566ca3936d 100644 --- a/system/services/src/com/percussion/services/utils/jspel/PSItemUtilities.java +++ b/system/services/src/com/percussion/services/utils/jspel/PSItemUtilities.java @@ -31,7 +31,7 @@ import com.percussion.utils.request.PSRequestInfo; import org.apache.commons.collections.MultiHashMap; import org.apache.commons.collections.MultiMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.ByteArrayOutputStream; import java.util.HashSet; diff --git a/system/services/src/com/percussion/services/utils/jspel/PSLinkUtilities.java b/system/services/src/com/percussion/services/utils/jspel/PSLinkUtilities.java index a90e1a27a5..5df34004c7 100644 --- a/system/services/src/com/percussion/services/utils/jspel/PSLinkUtilities.java +++ b/system/services/src/com/percussion/services/utils/jspel/PSLinkUtilities.java @@ -20,7 +20,7 @@ import java.net.MalformedURLException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A class to provide link utilities to JSPs or XSL. Both JSPs and XSL allow diff --git a/system/services/src/com/percussion/services/utils/jspel/PSRoleUtilities.java b/system/services/src/com/percussion/services/utils/jspel/PSRoleUtilities.java index eded8de53f..cbab882339 100644 --- a/system/services/src/com/percussion/services/utils/jspel/PSRoleUtilities.java +++ b/system/services/src/com/percussion/services/utils/jspel/PSRoleUtilities.java @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Various static methods called from el to determine a user's roles or role diff --git a/system/services/src/com/percussion/services/utils/orm/PSDataCollectionHelper.java b/system/services/src/com/percussion/services/utils/orm/PSDataCollectionHelper.java index 9d47af20d0..c127cc87ce 100644 --- a/system/services/src/com/percussion/services/utils/orm/PSDataCollectionHelper.java +++ b/system/services/src/com/percussion/services/utils/orm/PSDataCollectionHelper.java @@ -16,7 +16,7 @@ */ package com.percussion.services.utils.orm; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.PSTypeEnum; import com.percussion.services.guidmgr.IPSGuidManager; diff --git a/system/services/src/com/percussion/services/utils/orm/data/PSTempId.java b/system/services/src/com/percussion/services/utils/orm/data/PSTempId.java index 9e2338e89e..6e9badc65b 100644 --- a/system/services/src/com/percussion/services/utils/orm/data/PSTempId.java +++ b/system/services/src/com/percussion/services/utils/orm/data/PSTempId.java @@ -23,8 +23,8 @@ import javax.persistence.Entity; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Represents a single temporary item. These temporary items are created in diff --git a/system/services/src/com/percussion/services/utils/orm/data/PSTempIdPK.java b/system/services/src/com/percussion/services/utils/orm/data/PSTempIdPK.java index e9925896c8..2b8768427e 100644 --- a/system/services/src/com/percussion/services/utils/orm/data/PSTempIdPK.java +++ b/system/services/src/com/percussion/services/utils/orm/data/PSTempIdPK.java @@ -22,8 +22,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for temp ids diff --git a/system/services/src/com/percussion/services/utils/xml/PSObjectStream.java b/system/services/src/com/percussion/services/utils/xml/PSObjectStream.java index 6631540e12..ba5283d747 100644 --- a/system/services/src/com/percussion/services/utils/xml/PSObjectStream.java +++ b/system/services/src/com/percussion/services/utils/xml/PSObjectStream.java @@ -26,7 +26,7 @@ import java.util.Vector; import java.util.concurrent.atomic.AtomicLong; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.Validate.isTrue; /** * Will save a stream of objects to be used later. diff --git a/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinition.java b/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinition.java index 33ef65529d..f4077aa488 100644 --- a/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinition.java +++ b/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinition.java @@ -25,7 +25,7 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinitionDao.java b/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinitionDao.java index f6a4fd8f3d..7166091dd6 100644 --- a/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinitionDao.java +++ b/system/services/src/com/percussion/services/widgetbuilder/PSWidgetBuilderDefinitionDao.java @@ -20,7 +20,7 @@ import com.percussion.services.guidmgr.IPSGuidManager; import com.percussion.share.dao.IPSGenericDao; import com.percussion.util.PSBaseBean; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; diff --git a/system/services/src/com/percussion/services/workflow/PSWorkflowActionsHelper.java b/system/services/src/com/percussion/services/workflow/PSWorkflowActionsHelper.java index 2ff68ed8da..ebfcc95be5 100644 --- a/system/services/src/com/percussion/services/workflow/PSWorkflowActionsHelper.java +++ b/system/services/src/com/percussion/services/workflow/PSWorkflowActionsHelper.java @@ -48,7 +48,7 @@ import java.util.Set; import org.apache.commons.collections.ListUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/services/src/com/percussion/services/workflow/data/PSAgingTransition.java b/system/services/src/com/percussion/services/workflow/data/PSAgingTransition.java index 5c1a9f0b49..c75bbf550c 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSAgingTransition.java +++ b/system/services/src/com/percussion/services/workflow/data/PSAgingTransition.java @@ -21,9 +21,9 @@ import java.io.IOException; import java.util.Objects; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSAssignedRole.java b/system/services/src/com/percussion/services/workflow/data/PSAssignedRole.java index dd969f0c7c..2f91838c9c 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSAssignedRole.java +++ b/system/services/src/com/percussion/services/workflow/data/PSAssignedRole.java @@ -33,9 +33,9 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSAssignedRolePK.java b/system/services/src/com/percussion/services/workflow/data/PSAssignedRolePK.java index 5226bc0673..fa1fedc0c9 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSAssignedRolePK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSAssignedRolePK.java @@ -22,8 +22,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for an assigned role diff --git a/system/services/src/com/percussion/services/workflow/data/PSAssignmentTypeEnum.java b/system/services/src/com/percussion/services/workflow/data/PSAssignmentTypeEnum.java index b4229ef79e..92988bcdca 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSAssignmentTypeEnum.java +++ b/system/services/src/com/percussion/services/workflow/data/PSAssignmentTypeEnum.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Class to enumerate the assignment types. diff --git a/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUser.java b/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUser.java index 23efb9b2e6..267694a956 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUser.java +++ b/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUser.java @@ -23,9 +23,9 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUserPK.java b/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUserPK.java index 905b45d8f7..25e4512b47 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUserPK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSContentAdhocUserPK.java @@ -22,9 +22,9 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for adhoc user info diff --git a/system/services/src/com/percussion/services/workflow/data/PSContentApproval.java b/system/services/src/com/percussion/services/workflow/data/PSContentApproval.java index bd643d7e6b..353258cea3 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSContentApproval.java +++ b/system/services/src/com/percussion/services/workflow/data/PSContentApproval.java @@ -22,9 +22,9 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/workflow/data/PSContentApprovalPK.java b/system/services/src/com/percussion/services/workflow/data/PSContentApprovalPK.java index 150f8180fc..7d92375af4 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSContentApprovalPK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSContentApprovalPK.java @@ -22,9 +22,9 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for {@link PSContentApproval} diff --git a/system/services/src/com/percussion/services/workflow/data/PSContentWorkflowState.java b/system/services/src/com/percussion/services/workflow/data/PSContentWorkflowState.java index fcffebf495..d0230c5a7a 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSContentWorkflowState.java +++ b/system/services/src/com/percussion/services/workflow/data/PSContentWorkflowState.java @@ -19,8 +19,8 @@ import com.percussion.services.catalog.PSTypeEnum; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/workflow/data/PSListCopier.java b/system/services/src/com/percussion/services/workflow/data/PSListCopier.java index c06df59e60..679312b9b6 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSListCopier.java +++ b/system/services/src/com/percussion/services/workflow/data/PSListCopier.java @@ -17,7 +17,7 @@ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.IPSCatalogIdentifier; import com.percussion.utils.guid.IPSGuid; diff --git a/system/services/src/com/percussion/services/workflow/data/PSNotification.java b/system/services/src/com/percussion/services/workflow/data/PSNotification.java index 5736854d07..fdf9d51524 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSNotification.java +++ b/system/services/src/com/percussion/services/workflow/data/PSNotification.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.IPSCatalogItem; import com.percussion.services.catalog.PSTypeEnum; @@ -39,10 +39,10 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSNotificationDef.java b/system/services/src/com/percussion/services/workflow/data/PSNotificationDef.java index 5f7aa86c6c..3b17319c0b 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSNotificationDef.java +++ b/system/services/src/com/percussion/services/workflow/data/PSNotificationDef.java @@ -34,9 +34,9 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSNotificationDefPK.java b/system/services/src/com/percussion/services/workflow/data/PSNotificationDefPK.java index fb4420cebd..3aa984fbcd 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSNotificationDefPK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSNotificationDefPK.java @@ -23,8 +23,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for workflow notification lookup diff --git a/system/services/src/com/percussion/services/workflow/data/PSNotificationPK.java b/system/services/src/com/percussion/services/workflow/data/PSNotificationPK.java index b2b95996ca..54b565fecb 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSNotificationPK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSNotificationPK.java @@ -22,8 +22,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for transition notification lookup diff --git a/system/services/src/com/percussion/services/workflow/data/PSState.java b/system/services/src/com/percussion/services/workflow/data/PSState.java index b1a732f6e3..d4703b5620 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSState.java +++ b/system/services/src/com/percussion/services/workflow/data/PSState.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import static com.percussion.services.workflow.data.PSTransformTransitionUtils.convertTransitions; import static com.percussion.services.workflow.data.PSTransformTransitionUtils.copyAgingTransitions; import static com.percussion.services.workflow.data.PSTransformTransitionUtils.copyTransitions; @@ -47,10 +47,10 @@ import javax.persistence.Table; import javax.persistence.Transient; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cascade; import org.xml.sax.SAXException; diff --git a/system/services/src/com/percussion/services/workflow/data/PSStatePK.java b/system/services/src/com/percussion/services/workflow/data/PSStatePK.java index 7653d3b23f..ff4c7dd7cc 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSStatePK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSStatePK.java @@ -23,8 +23,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for state lookup diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransformTransitionUtils.java b/system/services/src/com/percussion/services/workflow/data/PSTransformTransitionUtils.java index e0716bc3de..dc071b85a1 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransformTransitionUtils.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransformTransitionUtils.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; /** * The utility class used to manage persisted and non-persisted transition objects. diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransition.java b/system/services/src/com/percussion/services/workflow/data/PSTransition.java index 6e94356ce2..bd6a3080ae 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransition.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransition.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.workflow.IPSTransitionsContext; @@ -26,10 +26,10 @@ import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransitionBase.java b/system/services/src/com/percussion/services/workflow/data/PSTransitionBase.java index c5b7057402..41657f7471 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransitionBase.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransitionBase.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.PSTypeEnum; import com.percussion.services.guidmgr.data.PSGuid; diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransitionHib.java b/system/services/src/com/percussion/services/workflow/data/PSTransitionHib.java index 0739cad77e..6a4cbba27e 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransitionHib.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransitionHib.java @@ -21,10 +21,10 @@ import com.percussion.services.utils.xml.PSXmlSerializationHelper; import com.percussion.utils.guid.IPSGuid; import com.percussion.workflow.IPSTransitionsContext; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; import javax.persistence.*; diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransitionPK.java b/system/services/src/com/percussion/services/workflow/data/PSTransitionPK.java index 2fc7ebfc7d..4cdbaaea26 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransitionPK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransitionPK.java @@ -23,8 +23,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for transition lookup diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransitionRole.java b/system/services/src/com/percussion/services/workflow/data/PSTransitionRole.java index 33efc62103..74e6edce85 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransitionRole.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransitionRole.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.IPSCatalogItem; import com.percussion.services.catalog.PSTypeEnum; @@ -34,9 +34,9 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSTransitionRolePK.java b/system/services/src/com/percussion/services/workflow/data/PSTransitionRolePK.java index d5bf6f79d6..aefea83eab 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSTransitionRolePK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSTransitionRolePK.java @@ -22,8 +22,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for the PSTransitionRole diff --git a/system/services/src/com/percussion/services/workflow/data/PSWorkflow.java b/system/services/src/com/percussion/services/workflow/data/PSWorkflow.java index 56c2fca5f2..bc445ac874 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSWorkflow.java +++ b/system/services/src/com/percussion/services/workflow/data/PSWorkflow.java @@ -16,7 +16,7 @@ */ package com.percussion.services.workflow.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.services.catalog.IPSCatalogItem; import com.percussion.services.catalog.IPSCatalogSummary; @@ -45,10 +45,10 @@ import javax.persistence.OneToMany; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/system/services/src/com/percussion/services/workflow/data/PSWorkflowCommunity.java b/system/services/src/com/percussion/services/workflow/data/PSWorkflowCommunity.java index ead3a6fb80..02389257bb 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSWorkflowCommunity.java +++ b/system/services/src/com/percussion/services/workflow/data/PSWorkflowCommunity.java @@ -25,8 +25,8 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.io.Serializable; import java.util.Objects; diff --git a/system/services/src/com/percussion/services/workflow/data/PSWorkflowRole.java b/system/services/src/com/percussion/services/workflow/data/PSWorkflowRole.java index 6316b1c3f3..1ea4475c3a 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSWorkflowRole.java +++ b/system/services/src/com/percussion/services/workflow/data/PSWorkflowRole.java @@ -33,10 +33,10 @@ import javax.persistence.IdClass; import javax.persistence.Table; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.xml.sax.SAXException; /** diff --git a/system/services/src/com/percussion/services/workflow/data/PSWorkflowRolePK.java b/system/services/src/com/percussion/services/workflow/data/PSWorkflowRolePK.java index 2e8ec3bfbf..b283a7b6f1 100644 --- a/system/services/src/com/percussion/services/workflow/data/PSWorkflowRolePK.java +++ b/system/services/src/com/percussion/services/workflow/data/PSWorkflowRolePK.java @@ -23,8 +23,8 @@ import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * Primary key for workflow role lookup diff --git a/system/services/src/com/percussion/services/workflow/impl/PSWorkflowService.java b/system/services/src/com/percussion/services/workflow/impl/PSWorkflowService.java index f03b53c345..6e87cf680d 100644 --- a/system/services/src/com/percussion/services/workflow/impl/PSWorkflowService.java +++ b/system/services/src/com/percussion/services/workflow/impl/PSWorkflowService.java @@ -52,8 +52,8 @@ import com.percussion.util.PSBaseBean; import com.percussion.utils.guid.IPSGuid; import com.percussion.workflow.PSWorkFlowUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; @@ -74,8 +74,8 @@ import java.util.List; import java.util.Map; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * Implementation of the workflow service diff --git a/system/servlet/src/com/percussion/webdav/method/PSPropFindMethod.java b/system/servlet/src/com/percussion/webdav/method/PSPropFindMethod.java index 1cb0947014..9cc721acea 100644 --- a/system/servlet/src/com/percussion/webdav/method/PSPropFindMethod.java +++ b/system/servlet/src/com/percussion/webdav/method/PSPropFindMethod.java @@ -52,7 +52,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/servlet/src/com/percussion/webdav/method/PSWebdavConfigValidator.java b/system/servlet/src/com/percussion/webdav/method/PSWebdavConfigValidator.java index 6105be51f0..8c82b9a940 100644 --- a/system/servlet/src/com/percussion/webdav/method/PSWebdavConfigValidator.java +++ b/system/servlet/src/com/percussion/webdav/method/PSWebdavConfigValidator.java @@ -36,7 +36,7 @@ import com.percussion.webdav.objectstore.PSPropertyFieldNameMapping; import com.percussion.webdav.objectstore.PSWebdavConfigDef; import com.percussion.webdav.objectstore.PSWebdavContentType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/servlet/src/com/percussion/webdav/method/PSWebdavUtils.java b/system/servlet/src/com/percussion/webdav/method/PSWebdavUtils.java index 81a75661d5..c9064e5c25 100644 --- a/system/servlet/src/com/percussion/webdav/method/PSWebdavUtils.java +++ b/system/servlet/src/com/percussion/webdav/method/PSWebdavUtils.java @@ -39,7 +39,7 @@ import com.percussion.webdav.error.IPSWebdavErrors; import com.percussion.webdav.error.PSWebdavException; import com.percussion.webdav.objectstore.PSWebdavConfig; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/PSActionVisibilityChecker.java b/system/src/main/java/com/percussion/cms/PSActionVisibilityChecker.java index 4043ce44d5..177e804923 100644 --- a/system/src/main/java/com/percussion/cms/PSActionVisibilityChecker.java +++ b/system/src/main/java/com/percussion/cms/PSActionVisibilityChecker.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class knows how to determine if a given user should be allowed to see a given {@link diff --git a/system/src/main/java/com/percussion/cms/PSActionVisibilityGlobalState.java b/system/src/main/java/com/percussion/cms/PSActionVisibilityGlobalState.java index 87fb1c9827..bfd3c025f8 100644 --- a/system/src/main/java/com/percussion/cms/PSActionVisibilityGlobalState.java +++ b/system/src/main/java/com/percussion/cms/PSActionVisibilityGlobalState.java @@ -18,7 +18,7 @@ import java.util.Collection; import java.util.Collections; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This object is used by the {@link PSActionVisibilityChecker} as a way to extract specific state diff --git a/system/src/main/java/com/percussion/cms/PSActionVisibilityObjectState.java b/system/src/main/java/com/percussion/cms/PSActionVisibilityObjectState.java index e98f71ce48..ac6c0a0b2e 100644 --- a/system/src/main/java/com/percussion/cms/PSActionVisibilityObjectState.java +++ b/system/src/main/java/com/percussion/cms/PSActionVisibilityObjectState.java @@ -18,7 +18,7 @@ import com.percussion.cms.objectstore.PSCmsObject; import com.percussion.cms.objectstore.PSObjectPermissions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This object is used by the {@link PSActionVisibilityChecker} as a way to extract specific state diff --git a/system/src/main/java/com/percussion/cms/PSInlineLinkField.java b/system/src/main/java/com/percussion/cms/PSInlineLinkField.java index 0136ea00c3..77ba176945 100644 --- a/system/src/main/java/com/percussion/cms/PSInlineLinkField.java +++ b/system/src/main/java/com/percussion/cms/PSInlineLinkField.java @@ -18,8 +18,8 @@ import static com.percussion.util.PSXMLDomUtil.getElementData; import static com.percussion.utils.xml.PSSaxHelper.ELEMENTS_NO_SELF_CLOSE_LIST; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isEmpty; import com.percussion.cms.handlers.PSContentEditorHandler; import com.percussion.cms.handlers.PSRelationshipCommandHandler; @@ -66,7 +66,7 @@ import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.Jsoup; diff --git a/system/src/main/java/com/percussion/cms/PSSingleValueBuilder.java b/system/src/main/java/com/percussion/cms/PSSingleValueBuilder.java index 077ef1124f..92afbc62be 100644 --- a/system/src/main/java/com/percussion/cms/PSSingleValueBuilder.java +++ b/system/src/main/java/com/percussion/cms/PSSingleValueBuilder.java @@ -51,7 +51,7 @@ import com.percussion.webservices.PSWebserviceUtils; import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.helper.W3CDom; diff --git a/system/src/main/java/com/percussion/cms/handlers/PSConditionalCloneHandler.java b/system/src/main/java/com/percussion/cms/handlers/PSConditionalCloneHandler.java index d28f969367..76b9e03a27 100644 --- a/system/src/main/java/com/percussion/cms/handlers/PSConditionalCloneHandler.java +++ b/system/src/main/java/com/percussion/cms/handlers/PSConditionalCloneHandler.java @@ -81,8 +81,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/cms/handlers/PSContentEditorHandler.java b/system/src/main/java/com/percussion/cms/handlers/PSContentEditorHandler.java index 00d93be505..7a8fc9b764 100644 --- a/system/src/main/java/com/percussion/cms/handlers/PSContentEditorHandler.java +++ b/system/src/main/java/com/percussion/cms/handlers/PSContentEditorHandler.java @@ -96,7 +96,7 @@ import java.util.Map; import java.util.Set; import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/system/src/main/java/com/percussion/cms/handlers/PSGlobalTemplateUpdateHandler.java b/system/src/main/java/com/percussion/cms/handlers/PSGlobalTemplateUpdateHandler.java index 42269d75a8..350a91a11c 100644 --- a/system/src/main/java/com/percussion/cms/handlers/PSGlobalTemplateUpdateHandler.java +++ b/system/src/main/java/com/percussion/cms/handlers/PSGlobalTemplateUpdateHandler.java @@ -58,7 +58,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Appender; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/system/src/main/java/com/percussion/cms/handlers/PSModifyCommandHandler.java b/system/src/main/java/com/percussion/cms/handlers/PSModifyCommandHandler.java index ada1a0ae68..a92d40e43d 100644 --- a/system/src/main/java/com/percussion/cms/handlers/PSModifyCommandHandler.java +++ b/system/src/main/java/com/percussion/cms/handlers/PSModifyCommandHandler.java @@ -103,7 +103,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/cms/handlers/PSQueryCommandHandler.java b/system/src/main/java/com/percussion/cms/handlers/PSQueryCommandHandler.java index 1e574ccb07..e58eff9817 100644 --- a/system/src/main/java/com/percussion/cms/handlers/PSQueryCommandHandler.java +++ b/system/src/main/java/com/percussion/cms/handlers/PSQueryCommandHandler.java @@ -78,7 +78,7 @@ import java.util.List; import java.util.Map; import java.util.Stack; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.ProcessingInstruction; diff --git a/system/src/main/java/com/percussion/cms/handlers/PSWorkflowCommandHandler.java b/system/src/main/java/com/percussion/cms/handlers/PSWorkflowCommandHandler.java index d1d07dd35b..4c664fb8fb 100644 --- a/system/src/main/java/com/percussion/cms/handlers/PSWorkflowCommandHandler.java +++ b/system/src/main/java/com/percussion/cms/handlers/PSWorkflowCommandHandler.java @@ -17,7 +17,7 @@ package com.percussion.cms.handlers; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSAaRelationship.java b/system/src/main/java/com/percussion/cms/objectstore/PSAaRelationship.java index 081aae30bf..8ff00da333 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSAaRelationship.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSAaRelationship.java @@ -29,7 +29,7 @@ import com.percussion.utils.guid.IPSGuid; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class adds a few methods that are specific to Active Assembly category of relationships to diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSAction.java b/system/src/main/java/com/percussion/cms/objectstore/PSAction.java index 0087606556..dda05171b2 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSAction.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSAction.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSComponentSummary.java b/system/src/main/java/com/percussion/cms/objectstore/PSComponentSummary.java index 9d7dee5aaa..e0ddb1abd4 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSComponentSummary.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSComponentSummary.java @@ -40,9 +40,9 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.time.FastDateFormat; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSContentType.java b/system/src/main/java/com/percussion/cms/objectstore/PSContentType.java index a4b24d971c..b0f9878ebb 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSContentType.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSContentType.java @@ -24,7 +24,7 @@ import com.percussion.util.PSXMLDomUtil; import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSCoreItem.java b/system/src/main/java/com/percussion/cms/objectstore/PSCoreItem.java index ca814b1ddb..fde06a3d8f 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSCoreItem.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSCoreItem.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSFolder.java b/system/src/main/java/com/percussion/cms/objectstore/PSFolder.java index d2dc44f52b..33c9e78bff 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSFolder.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSFolder.java @@ -16,7 +16,7 @@ */ package com.percussion.cms.objectstore; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSConstants; import com.percussion.cms.PSCmsException; @@ -28,8 +28,8 @@ import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; import java.util.Iterator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSInvalidChildTypeException.java b/system/src/main/java/com/percussion/cms/objectstore/PSInvalidChildTypeException.java index ec48153a24..383b1912cf 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSInvalidChildTypeException.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSInvalidChildTypeException.java @@ -18,7 +18,7 @@ import com.percussion.cms.IPSCmsErrors; import com.percussion.error.PSException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Indicates that an invalid complex child field name has been specified. */ public class PSInvalidChildTypeException extends PSException { diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSItemDefinition.java b/system/src/main/java/com/percussion/cms/objectstore/PSItemDefinition.java index 6d64363bee..5e73dcbea0 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSItemDefinition.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSItemDefinition.java @@ -52,8 +52,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSRelationshipFilter.java b/system/src/main/java/com/percussion/cms/objectstore/PSRelationshipFilter.java index 00aadf4d2a..94b6e74042 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSRelationshipFilter.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSRelationshipFilter.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/cms/objectstore/PSSearch.java b/system/src/main/java/com/percussion/cms/objectstore/PSSearch.java index 6ed8cd0907..9dadbd706b 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/PSSearch.java +++ b/system/src/main/java/com/percussion/cms/objectstore/PSSearch.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/objectstore/client/PSContentEditorFieldCataloger.java b/system/src/main/java/com/percussion/cms/objectstore/client/PSContentEditorFieldCataloger.java index b698b4d8b8..95b03a344d 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/client/PSContentEditorFieldCataloger.java +++ b/system/src/main/java/com/percussion/cms/objectstore/client/PSContentEditorFieldCataloger.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/cms/objectstore/server/PSItemDefManager.java b/system/src/main/java/com/percussion/cms/objectstore/server/PSItemDefManager.java index 3f9fda60aa..fd7bfe68e2 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/server/PSItemDefManager.java +++ b/system/src/main/java/com/percussion/cms/objectstore/server/PSItemDefManager.java @@ -16,7 +16,7 @@ */ package com.percussion.cms.objectstore.server; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.IPSCataloger; @@ -82,8 +82,8 @@ import javax.jcr.Node; import javax.jcr.Property; import javax.jcr.RepositoryException; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/cms/objectstore/server/PSLocalCataloger.java b/system/src/main/java/com/percussion/cms/objectstore/server/PSLocalCataloger.java index d3e5ff0911..c635467b37 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/server/PSLocalCataloger.java +++ b/system/src/main/java/com/percussion/cms/objectstore/server/PSLocalCataloger.java @@ -66,7 +66,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/objectstore/server/PSRelationshipDbProcessor.java b/system/src/main/java/com/percussion/cms/objectstore/server/PSRelationshipDbProcessor.java index bc572ede5d..5297d22e7a 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/server/PSRelationshipDbProcessor.java +++ b/system/src/main/java/com/percussion/cms/objectstore/server/PSRelationshipDbProcessor.java @@ -72,7 +72,7 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/cms/objectstore/server/PSServerItem.java b/system/src/main/java/com/percussion/cms/objectstore/server/PSServerItem.java index 15bd9dc55c..932c88089f 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/server/PSServerItem.java +++ b/system/src/main/java/com/percussion/cms/objectstore/server/PSServerItem.java @@ -76,7 +76,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/cms/objectstore/ws/PSRemoteFolderProcessor.java b/system/src/main/java/com/percussion/cms/objectstore/ws/PSRemoteFolderProcessor.java index 2eae97da5c..9cca98d533 100644 --- a/system/src/main/java/com/percussion/cms/objectstore/ws/PSRemoteFolderProcessor.java +++ b/system/src/main/java/com/percussion/cms/objectstore/ws/PSRemoteFolderProcessor.java @@ -16,7 +16,7 @@ */ package com.percussion.cms.objectstore.ws; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSCmsErrors; import com.percussion.cms.PSCmsException; diff --git a/system/src/main/java/com/percussion/conn/PSDesignerConnection.java b/system/src/main/java/com/percussion/conn/PSDesignerConnection.java index 1a808cd012..680bf2fa7c 100644 --- a/system/src/main/java/com/percussion/conn/PSDesignerConnection.java +++ b/system/src/main/java/com/percussion/conn/PSDesignerConnection.java @@ -47,7 +47,7 @@ import java.util.HashMap; import javax.net.SocketFactory; import javax.net.ssl.SSLSocketFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/content/PSContentConverter.java b/system/src/main/java/com/percussion/content/PSContentConverter.java index 09b3307a7e..02cf3dd422 100644 --- a/system/src/main/java/com/percussion/content/PSContentConverter.java +++ b/system/src/main/java/com/percussion/content/PSContentConverter.java @@ -21,7 +21,7 @@ import com.percussion.search.lucene.textconverter.PSLuceneTextConverterFactory; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/content/PSContentFactory.java b/system/src/main/java/com/percussion/content/PSContentFactory.java index 1cfc3e13b3..5328874d3d 100644 --- a/system/src/main/java/com/percussion/content/PSContentFactory.java +++ b/system/src/main/java/com/percussion/content/PSContentFactory.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/content/PSTextExtractorExit.java b/system/src/main/java/com/percussion/content/PSTextExtractorExit.java index 87d489dc03..eff861295f 100644 --- a/system/src/main/java/com/percussion/content/PSTextExtractorExit.java +++ b/system/src/main/java/com/percussion/content/PSTextExtractorExit.java @@ -36,7 +36,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/cx/objectstore/PSMenuAction.java b/system/src/main/java/com/percussion/cx/objectstore/PSMenuAction.java index 2eba09b9f6..5791d79197 100644 --- a/system/src/main/java/com/percussion/cx/objectstore/PSMenuAction.java +++ b/system/src/main/java/com/percussion/cx/objectstore/PSMenuAction.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/data/PSFolderPermissionsDataFilter.java b/system/src/main/java/com/percussion/data/PSFolderPermissionsDataFilter.java index 5e4f4bec04..c99efcf6dd 100644 --- a/system/src/main/java/com/percussion/data/PSFolderPermissionsDataFilter.java +++ b/system/src/main/java/com/percussion/data/PSFolderPermissionsDataFilter.java @@ -25,7 +25,7 @@ import com.percussion.server.webservices.PSServerFolderProcessor; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Filters rows representing folders based on the user's permissions for the folder. The row is diff --git a/system/src/main/java/com/percussion/data/PSSqlUpdateBuilder.java b/system/src/main/java/com/percussion/data/PSSqlUpdateBuilder.java index 3812af2580..6ec09b5461 100644 --- a/system/src/main/java/com/percussion/data/PSSqlUpdateBuilder.java +++ b/system/src/main/java/com/percussion/data/PSSqlUpdateBuilder.java @@ -18,8 +18,8 @@ package com.percussion.data; import static com.percussion.util.PSSqlHelper.isMysql; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.isNotEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; import com.percussion.design.objectstore.IPSBackEndMapping; import com.percussion.design.objectstore.IPSReplacementValue; diff --git a/system/src/main/java/com/percussion/data/PSStylesheetCleanupFilter.java b/system/src/main/java/com/percussion/data/PSStylesheetCleanupFilter.java index f24a594177..1d03293b9b 100644 --- a/system/src/main/java/com/percussion/data/PSStylesheetCleanupFilter.java +++ b/system/src/main/java/com/percussion/data/PSStylesheetCleanupFilter.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.oro.text.GlobCompiler; diff --git a/system/src/main/java/com/percussion/data/PSTableMetaData.java b/system/src/main/java/com/percussion/data/PSTableMetaData.java index 9efa9450ae..6ea7deac6a 100644 --- a/system/src/main/java/com/percussion/data/PSTableMetaData.java +++ b/system/src/main/java/com/percussion/data/PSTableMetaData.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Objects; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/debug/PSTraceBasicRequest.java b/system/src/main/java/com/percussion/debug/PSTraceBasicRequest.java index f3cdb2e1fc..e2f4bcef33 100644 --- a/system/src/main/java/com/percussion/debug/PSTraceBasicRequest.java +++ b/system/src/main/java/com/percussion/debug/PSTraceBasicRequest.java @@ -18,7 +18,7 @@ package com.percussion.debug; import com.percussion.server.PSRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Used to generate trace messages for the Basic Request information trace message type (0x0001). diff --git a/system/src/main/java/com/percussion/design/catalog/exit/server/PSExtensionCatalogHandler.java b/system/src/main/java/com/percussion/design/catalog/exit/server/PSExtensionCatalogHandler.java index 97392e954c..9a78ea3a22 100644 --- a/system/src/main/java/com/percussion/design/catalog/exit/server/PSExtensionCatalogHandler.java +++ b/system/src/main/java/com/percussion/design/catalog/exit/server/PSExtensionCatalogHandler.java @@ -34,7 +34,7 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.Collection; import java.util.Iterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSApplication.java b/system/src/main/java/com/percussion/design/objectstore/PSApplication.java index 7aa66fd90c..2ca669e66b 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSApplication.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSApplication.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.log4j.Level; import org.apache.xerces.dom.ParentNode; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSAuthentication.java b/system/src/main/java/com/percussion/design/objectstore/PSAuthentication.java index cc7c398651..9c656a5aff 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSAuthentication.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSAuthentication.java @@ -28,7 +28,7 @@ import java.net.URL; import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSBackEndTable.java b/system/src/main/java/com/percussion/design/objectstore/PSBackEndTable.java index 644b1917e6..d68651d329 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSBackEndTable.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSBackEndTable.java @@ -23,7 +23,7 @@ import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSChoiceTableInfo.java b/system/src/main/java/com/percussion/design/objectstore/PSChoiceTableInfo.java index f4629ab569..ab65f67cb9 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSChoiceTableInfo.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSChoiceTableInfo.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Objects; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSCloneOverrideField.java b/system/src/main/java/com/percussion/design/objectstore/PSCloneOverrideField.java index e88139e542..802480b7b8 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSCloneOverrideField.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSCloneOverrideField.java @@ -21,8 +21,8 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSConditionalEffect.java b/system/src/main/java/com/percussion/design/objectstore/PSConditionalEffect.java index 773e587bf3..282491c3ad 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSConditionalEffect.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSConditionalEffect.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSConfig.java b/system/src/main/java/com/percussion/design/objectstore/PSConfig.java index 9b07bc3ad8..38bc25f8dd 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSConfig.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSConfig.java @@ -31,7 +31,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSContentEditor.java b/system/src/main/java/com/percussion/design/objectstore/PSContentEditor.java index fbcce0f0d2..ddea59c0e9 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSContentEditor.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSContentEditor.java @@ -30,8 +30,8 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSContentEditorMapper.java b/system/src/main/java/com/percussion/design/objectstore/PSContentEditorMapper.java index 78ce2986f2..8402d0426f 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSContentEditorMapper.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSContentEditorMapper.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSContentEditorPipe.java b/system/src/main/java/com/percussion/design/objectstore/PSContentEditorPipe.java index 1d86aec05b..b3f846ddb8 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSContentEditorPipe.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSContentEditorPipe.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSContentTypeHelper.java b/system/src/main/java/com/percussion/design/objectstore/PSContentTypeHelper.java index 7798f805a1..6b3d0ea4c8 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSContentTypeHelper.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSContentTypeHelper.java @@ -67,7 +67,7 @@ import javax.jcr.RepositoryException; import javax.jcr.nodetype.NoSuchNodeTypeException; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSControlDependencyMap.java b/system/src/main/java/com/percussion/design/objectstore/PSControlDependencyMap.java index fa73c6d63f..963437d283 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSControlDependencyMap.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSControlDependencyMap.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Manages input data extensions that are derived from control dependencies. Once the map is diff --git a/system/src/main/java/com/percussion/design/objectstore/PSDatabaseComponentCollection.java b/system/src/main/java/com/percussion/design/objectstore/PSDatabaseComponentCollection.java index c37613161c..1be0fa6930 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSDatabaseComponentCollection.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSDatabaseComponentCollection.java @@ -23,8 +23,8 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSDirectory.java b/system/src/main/java/com/percussion/design/objectstore/PSDirectory.java index d774566cf3..c259dd0a0f 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSDirectory.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSDirectory.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSDisplayError.java b/system/src/main/java/com/percussion/design/objectstore/PSDisplayError.java index 3f21455237..5eb5418cd9 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSDisplayError.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSDisplayError.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSDisplayMapping.java b/system/src/main/java/com/percussion/design/objectstore/PSDisplayMapping.java index 66b4454044..5c633a98a6 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSDisplayMapping.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSDisplayMapping.java @@ -19,7 +19,7 @@ import com.percussion.xml.PSXmlDocumentBuilder; import com.percussion.xml.PSXmlTreeWalker; import java.util.List; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSDisplayText.java b/system/src/main/java/com/percussion/design/objectstore/PSDisplayText.java index 85363e9486..c9ca41df5b 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSDisplayText.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSDisplayText.java @@ -18,7 +18,7 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.List; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSField.java b/system/src/main/java/com/percussion/design/objectstore/PSField.java index ce19e45fc9..1006e22ade 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSField.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSField.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSFieldError.java b/system/src/main/java/com/percussion/design/objectstore/PSFieldError.java index 7f4a208154..80268fe645 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSFieldError.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSFieldError.java @@ -17,7 +17,7 @@ package com.percussion.design.objectstore; import com.percussion.xml.PSXmlTreeWalker; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSFieldSet.java b/system/src/main/java/com/percussion/design/objectstore/PSFieldSet.java index 84fe0d4422..df97817cc5 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSFieldSet.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSFieldSet.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSFieldValidationException.java b/system/src/main/java/com/percussion/design/objectstore/PSFieldValidationException.java index d3812aab66..a0c6854e0d 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSFieldValidationException.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSFieldValidationException.java @@ -17,7 +17,7 @@ package com.percussion.design.objectstore; import com.percussion.cms.PSCmsException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This is a specific exception class derived from PSCmsException to hold the field validation diff --git a/system/src/main/java/com/percussion/design/objectstore/PSFile.java b/system/src/main/java/com/percussion/design/objectstore/PSFile.java index c9e41a1073..b4aed59c1f 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSFile.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSFile.java @@ -34,7 +34,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.List; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSJdbcDriverConfig.java b/system/src/main/java/com/percussion/design/objectstore/PSJdbcDriverConfig.java index 5c3eab2650..67bd3ca3b6 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSJdbcDriverConfig.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSJdbcDriverConfig.java @@ -19,9 +19,9 @@ import com.percussion.util.PSXMLDomUtil; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSObjectStore.java b/system/src/main/java/com/percussion/design/objectstore/PSObjectStore.java index 108bebad6a..a220c42bd8 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSObjectStore.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSObjectStore.java @@ -56,7 +56,7 @@ import java.util.List; import java.util.Properties; import java.util.Vector; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSPipe.java b/system/src/main/java/com/percussion/design/objectstore/PSPipe.java index 73457a3020..b3f8626bc0 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSPipe.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSPipe.java @@ -17,7 +17,7 @@ package com.percussion.design.objectstore; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * The PSPipe abstract class is used to define how an XML document is being mapped to one or more diff --git a/system/src/main/java/com/percussion/design/objectstore/PSRelationship.java b/system/src/main/java/com/percussion/design/objectstore/PSRelationship.java index 9e8ed41532..094d4bf7f2 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSRelationship.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSRelationship.java @@ -16,7 +16,7 @@ */ package com.percussion.design.objectstore; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.cms.IPSConstants; import com.percussion.cms.handlers.PSRelationshipCommandHandler; @@ -34,8 +34,8 @@ import java.util.Map; import java.util.Set; import javax.persistence.Transient; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSRelationshipConfig.java b/system/src/main/java/com/percussion/design/objectstore/PSRelationshipConfig.java index eac2380882..463ba39983 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSRelationshipConfig.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSRelationshipConfig.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.ResourceBundle; import java.util.Set; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyData.java b/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyData.java index 795764b87b..d8c3e83588 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyData.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyData.java @@ -26,8 +26,8 @@ import javax.persistence.IdClass; import javax.persistence.Table; import javax.persistence.Transient; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyDataPk.java b/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyDataPk.java index e27781471b..4e89beef0a 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyDataPk.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSRelationshipPropertyDataPk.java @@ -20,8 +20,8 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * The primary key for {@link PSRelationshipPropertyData} object. This is needed for the persistent diff --git a/system/src/main/java/com/percussion/design/objectstore/PSReplacementValueFactory.java b/system/src/main/java/com/percussion/design/objectstore/PSReplacementValueFactory.java index 439d2a42e0..b04b0ed4c6 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSReplacementValueFactory.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSReplacementValueFactory.java @@ -22,7 +22,7 @@ import java.text.MessageFormat; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/design/objectstore/PSRole.java b/system/src/main/java/com/percussion/design/objectstore/PSRole.java index 534834d6c5..bc564d649c 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSRole.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSRole.java @@ -25,8 +25,8 @@ import com.percussion.utils.guid.IPSGuid; import com.percussion.xml.PSXmlTreeWalker; import java.util.List; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSRule.java b/system/src/main/java/com/percussion/design/objectstore/PSRule.java index 2368829613..bfa1c9e0bf 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSRule.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSRule.java @@ -20,7 +20,7 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSSharedFieldGroup.java b/system/src/main/java/com/percussion/design/objectstore/PSSharedFieldGroup.java index 464b567849..5bf5038d65 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSSharedFieldGroup.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSSharedFieldGroup.java @@ -19,7 +19,7 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSUISet.java b/system/src/main/java/com/percussion/design/objectstore/PSUISet.java index c56b5e0946..10c614567f 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSUISet.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSUISet.java @@ -20,7 +20,7 @@ import com.percussion.xml.PSXmlTreeWalker; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/design/objectstore/PSWorkflowInfo.java b/system/src/main/java/com/percussion/design/objectstore/PSWorkflowInfo.java index 1e7bb9cbbc..75548d5c14 100644 --- a/system/src/main/java/com/percussion/design/objectstore/PSWorkflowInfo.java +++ b/system/src/main/java/com/percussion/design/objectstore/PSWorkflowInfo.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/design/objectstore/legacy/PSAllowAllCtypeWorkflowsUpdater.java b/system/src/main/java/com/percussion/design/objectstore/legacy/PSAllowAllCtypeWorkflowsUpdater.java index db00ac91b4..b9d6852d10 100644 --- a/system/src/main/java/com/percussion/design/objectstore/legacy/PSAllowAllCtypeWorkflowsUpdater.java +++ b/system/src/main/java/com/percussion/design/objectstore/legacy/PSAllowAllCtypeWorkflowsUpdater.java @@ -37,7 +37,7 @@ import java.util.Collections; import java.util.List; import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/design/objectstore/legacy/PSBaseDSConverter.java b/system/src/main/java/com/percussion/design/objectstore/legacy/PSBaseDSConverter.java index da3ba4c1f1..c518c2d6ad 100644 --- a/system/src/main/java/com/percussion/design/objectstore/legacy/PSBaseDSConverter.java +++ b/system/src/main/java/com/percussion/design/objectstore/legacy/PSBaseDSConverter.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/design/objectstore/legacy/PSConfigurationCtx.java b/system/src/main/java/com/percussion/design/objectstore/legacy/PSConfigurationCtx.java index bb59dbc797..b867539ea0 100644 --- a/system/src/main/java/com/percussion/design/objectstore/legacy/PSConfigurationCtx.java +++ b/system/src/main/java/com/percussion/design/objectstore/legacy/PSConfigurationCtx.java @@ -31,7 +31,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/system/src/main/java/com/percussion/design/objectstore/legacy/PSDatasourceConverter.java b/system/src/main/java/com/percussion/design/objectstore/legacy/PSDatasourceConverter.java index 125373feb5..513ace8df9 100644 --- a/system/src/main/java/com/percussion/design/objectstore/legacy/PSDatasourceConverter.java +++ b/system/src/main/java/com/percussion/design/objectstore/legacy/PSDatasourceConverter.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.PropertyConfigurator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/design/objectstore/server/PSServerXmlObjectStore.java b/system/src/main/java/com/percussion/design/objectstore/server/PSServerXmlObjectStore.java index 2c35588730..e71ea7d8b8 100644 --- a/system/src/main/java/com/percussion/design/objectstore/server/PSServerXmlObjectStore.java +++ b/system/src/main/java/com/percussion/design/objectstore/server/PSServerXmlObjectStore.java @@ -107,7 +107,7 @@ import java.util.Set; import java.util.Vector; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/design/objectstore/server/PSXmlObjectStoreHandler.java b/system/src/main/java/com/percussion/design/objectstore/server/PSXmlObjectStoreHandler.java index aa069bfbf0..013991cdc5 100644 --- a/system/src/main/java/com/percussion/design/objectstore/server/PSXmlObjectStoreHandler.java +++ b/system/src/main/java/com/percussion/design/objectstore/server/PSXmlObjectStoreHandler.java @@ -113,7 +113,7 @@ import java.util.Map; import java.util.Properties; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/src/main/java/com/percussion/extension/PSExtensionDef.java b/system/src/main/java/com/percussion/extension/PSExtensionDef.java index 7760a45f22..7f264f07df 100644 --- a/system/src/main/java/com/percussion/extension/PSExtensionDef.java +++ b/system/src/main/java/com/percussion/extension/PSExtensionDef.java @@ -23,7 +23,7 @@ import java.io.Serializable; import java.net.URL; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/extension/PSExtensionHandlerConfiguration.java b/system/src/main/java/com/percussion/extension/PSExtensionHandlerConfiguration.java index cbca03c12c..c2b948b696 100644 --- a/system/src/main/java/com/percussion/extension/PSExtensionHandlerConfiguration.java +++ b/system/src/main/java/com/percussion/extension/PSExtensionHandlerConfiguration.java @@ -38,7 +38,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/extension/PSExtensionMethod.java b/system/src/main/java/com/percussion/extension/PSExtensionMethod.java index ce49d10e8d..c7422a817a 100644 --- a/system/src/main/java/com/percussion/extension/PSExtensionMethod.java +++ b/system/src/main/java/com/percussion/extension/PSExtensionMethod.java @@ -21,7 +21,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/extension/PSExtensionMethodParam.java b/system/src/main/java/com/percussion/extension/PSExtensionMethodParam.java index 94606940f1..1eb3e936e4 100644 --- a/system/src/main/java/com/percussion/extension/PSExtensionMethodParam.java +++ b/system/src/main/java/com/percussion/extension/PSExtensionMethodParam.java @@ -18,7 +18,7 @@ import java.io.Serializable; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/extension/PSExtensionParams.java b/system/src/main/java/com/percussion/extension/PSExtensionParams.java index 8879782dbd..546bdb7e9c 100644 --- a/system/src/main/java/com/percussion/extension/PSExtensionParams.java +++ b/system/src/main/java/com/percussion/extension/PSExtensionParams.java @@ -20,7 +20,7 @@ import com.percussion.design.objectstore.IPSReplacementValue; import com.percussion.util.PSDataTypeConverter; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Extension utilities to extract parameters, etc. diff --git a/system/src/main/java/com/percussion/extension/PSExtensionRef.java b/system/src/main/java/com/percussion/extension/PSExtensionRef.java index 55d94d25d4..557ea18c8c 100644 --- a/system/src/main/java/com/percussion/extension/PSExtensionRef.java +++ b/system/src/main/java/com/percussion/extension/PSExtensionRef.java @@ -19,8 +19,8 @@ import java.io.Serializable; import java.util.Comparator; import java.util.StringTokenizer; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * A simple, immutable class used to refer uniquely to an extension by its handler name, context diff --git a/system/src/main/java/com/percussion/extension/PSValidateCharacters.java b/system/src/main/java/com/percussion/extension/PSValidateCharacters.java index cb57c3f7f7..2efa189361 100644 --- a/system/src/main/java/com/percussion/extension/PSValidateCharacters.java +++ b/system/src/main/java/com/percussion/extension/PSValidateCharacters.java @@ -16,8 +16,8 @@ */ package com.percussion.extension; -import static org.apache.commons.lang.StringUtils.containsAny; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.StringUtils.containsAny; +import static org.apache.commons.lang3.Validate.notEmpty; import com.percussion.data.PSConversionException; import com.percussion.security.SecureStringUtils; diff --git a/system/src/main/java/com/percussion/extension/PSValidateUniqueName.java b/system/src/main/java/com/percussion/extension/PSValidateUniqueName.java index 870149b59d..30cf65e6c6 100644 --- a/system/src/main/java/com/percussion/extension/PSValidateUniqueName.java +++ b/system/src/main/java/com/percussion/extension/PSValidateUniqueName.java @@ -26,7 +26,7 @@ import java.io.File; import java.util.List; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/fastforward/globaltemplate/PSGlobalTemplate.java b/system/src/main/java/com/percussion/fastforward/globaltemplate/PSGlobalTemplate.java index 7ede97a5ad..d08b9bc64c 100644 --- a/system/src/main/java/com/percussion/fastforward/globaltemplate/PSGlobalTemplate.java +++ b/system/src/main/java/com/percussion/fastforward/globaltemplate/PSGlobalTemplate.java @@ -17,7 +17,7 @@ package com.percussion.fastforward.globaltemplate; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import com.percussion.xml.PSNodePrinter; import com.percussion.xml.PSXmlDocumentBuilder; diff --git a/system/src/main/java/com/percussion/fastforward/managednav/PSManagedNavService.java b/system/src/main/java/com/percussion/fastforward/managednav/PSManagedNavService.java index 8ac29ccaa9..d398eb8737 100644 --- a/system/src/main/java/com/percussion/fastforward/managednav/PSManagedNavService.java +++ b/system/src/main/java/com/percussion/fastforward/managednav/PSManagedNavService.java @@ -24,8 +24,8 @@ import static com.percussion.fastforward.managednav.PSNavFolderUtils.getParentFolder; import static com.percussion.fastforward.managednav.PSNavFolderUtils.removeNavonParents; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSConstants; import com.percussion.cms.PSCmsException; @@ -72,7 +72,7 @@ import java.util.Map; import java.util.Map.Entry; import javax.jcr.Node; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/src/main/java/com/percussion/fastforward/managednav/PSNavFolderUtils.java b/system/src/main/java/com/percussion/fastforward/managednav/PSNavFolderUtils.java index a8b9bfaa4f..c4171c4c45 100644 --- a/system/src/main/java/com/percussion/fastforward/managednav/PSNavFolderUtils.java +++ b/system/src/main/java/com/percussion/fastforward/managednav/PSNavFolderUtils.java @@ -16,8 +16,8 @@ */ package com.percussion.fastforward.managednav; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.IPSFieldValue; diff --git a/system/src/main/java/com/percussion/install/PSCreateMenuVisibilityAcls.java b/system/src/main/java/com/percussion/install/PSCreateMenuVisibilityAcls.java index 92626added..9e993e0a73 100644 --- a/system/src/main/java/com/percussion/install/PSCreateMenuVisibilityAcls.java +++ b/system/src/main/java/com/percussion/install/PSCreateMenuVisibilityAcls.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginAddDesignerRole.java b/system/src/main/java/com/percussion/install/PSUpgradePluginAddDesignerRole.java index 1953e544ed..d499109da6 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginAddDesignerRole.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginAddDesignerRole.java @@ -33,7 +33,7 @@ import java.io.PrintStream; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginConvertCommunityVisibility.java b/system/src/main/java/com/percussion/install/PSUpgradePluginConvertCommunityVisibility.java index 7dd6a24ebd..a39be3fa1c 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginConvertCommunityVisibility.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginConvertCommunityVisibility.java @@ -52,7 +52,7 @@ import java.util.Map.Entry; import java.util.Set; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginConvertContentTypes.java b/system/src/main/java/com/percussion/install/PSUpgradePluginConvertContentTypes.java index 5708d36fa6..7150efe868 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginConvertContentTypes.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginConvertContentTypes.java @@ -54,7 +54,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginCreateCtWfAssociations.java b/system/src/main/java/com/percussion/install/PSUpgradePluginCreateCtWfAssociations.java index b4900f8646..ab63fc5fdc 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginCreateCtWfAssociations.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginCreateCtWfAssociations.java @@ -39,8 +39,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginFixWFNotification.java b/system/src/main/java/com/percussion/install/PSUpgradePluginFixWFNotification.java index db78503362..02f4f59c32 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginFixWFNotification.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginFixWFNotification.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginMoveCatalogerConfigs.java b/system/src/main/java/com/percussion/install/PSUpgradePluginMoveCatalogerConfigs.java index 728aceb4c7..413532ca09 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginMoveCatalogerConfigs.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginMoveCatalogerConfigs.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginUniqueContextSchemeName.java b/system/src/main/java/com/percussion/install/PSUpgradePluginUniqueContextSchemeName.java index b5faa1d89b..6b2064e77e 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginUniqueContextSchemeName.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginUniqueContextSchemeName.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginUpdateCategoryTree.java b/system/src/main/java/com/percussion/install/PSUpgradePluginUpdateCategoryTree.java index fe304fa140..4e0d00d38b 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginUpdateCategoryTree.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginUpdateCategoryTree.java @@ -24,7 +24,7 @@ import java.io.FileOutputStream; import java.io.PrintStream; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/install/PSUpgradePluginUpgradeKeywords.java b/system/src/main/java/com/percussion/install/PSUpgradePluginUpgradeKeywords.java index f570ebfbf7..28cc1e454e 100644 --- a/system/src/main/java/com/percussion/install/PSUpgradePluginUpgradeKeywords.java +++ b/system/src/main/java/com/percussion/install/PSUpgradePluginUpgradeKeywords.java @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; /** diff --git a/system/src/main/java/com/percussion/relationship/effect/PSAttachCloneToFolder.java b/system/src/main/java/com/percussion/relationship/effect/PSAttachCloneToFolder.java index 7230be8b87..0574f40944 100644 --- a/system/src/main/java/com/percussion/relationship/effect/PSAttachCloneToFolder.java +++ b/system/src/main/java/com/percussion/relationship/effect/PSAttachCloneToFolder.java @@ -36,7 +36,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This effect attaches a new clone based on a relationship list from the predefined list of diff --git a/system/src/main/java/com/percussion/search/PSAddVariantSiteFolder.java b/system/src/main/java/com/percussion/search/PSAddVariantSiteFolder.java index e2e20a5608..5110d13b97 100644 --- a/system/src/main/java/com/percussion/search/PSAddVariantSiteFolder.java +++ b/system/src/main/java/com/percussion/search/PSAddVariantSiteFolder.java @@ -58,7 +58,7 @@ import java.util.Objects; import java.util.Set; import javax.jcr.RepositoryException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/search/PSGenerateSearchQueryExit.java b/system/src/main/java/com/percussion/search/PSGenerateSearchQueryExit.java index 88867e82cc..2bae728811 100644 --- a/system/src/main/java/com/percussion/search/PSGenerateSearchQueryExit.java +++ b/system/src/main/java/com/percussion/search/PSGenerateSearchQueryExit.java @@ -75,7 +75,7 @@ import java.util.Objects; import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/search/PSWSSearchResponse.java b/system/src/main/java/com/percussion/search/PSWSSearchResponse.java index 4a99c0752d..01b7418d25 100644 --- a/system/src/main/java/com/percussion/search/PSWSSearchResponse.java +++ b/system/src/main/java/com/percussion/search/PSWSSearchResponse.java @@ -17,7 +17,7 @@ package com.percussion.search; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.design.objectstore.PSUnknownNodeTypeException; import com.percussion.util.IPSHtmlParameters; @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/search/data/PSSearchIndexQueueItem.java b/system/src/main/java/com/percussion/search/data/PSSearchIndexQueueItem.java index d8ef5e2010..4d450bf738 100644 --- a/system/src/main/java/com/percussion/search/data/PSSearchIndexQueueItem.java +++ b/system/src/main/java/com/percussion/search/data/PSSearchIndexQueueItem.java @@ -16,7 +16,7 @@ */ package com.percussion.search.data; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.objectstore.PSComponentSummary; import com.percussion.search.PSSearchEditorChangeEvent; @@ -35,7 +35,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/system/src/main/java/com/percussion/search/impl/PSSearchIndexQueue.java b/system/src/main/java/com/percussion/search/impl/PSSearchIndexQueue.java index 217bd78549..e506ca825f 100644 --- a/system/src/main/java/com/percussion/search/impl/PSSearchIndexQueue.java +++ b/system/src/main/java/com/percussion/search/impl/PSSearchIndexQueue.java @@ -16,7 +16,7 @@ */ package com.percussion.search.impl; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSConstants; import com.percussion.data.PSIdGenerator; @@ -33,7 +33,7 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; diff --git a/system/src/main/java/com/percussion/search/lucene/PSKeyConverter.java b/system/src/main/java/com/percussion/search/lucene/PSKeyConverter.java index bd8573a47e..a602bec34a 100644 --- a/system/src/main/java/com/percussion/search/lucene/PSKeyConverter.java +++ b/system/src/main/java/com/percussion/search/lucene/PSKeyConverter.java @@ -22,7 +22,7 @@ import com.percussion.util.PSStringOperation; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Handles the transformation of Rhythmyx ids to string identifiers used to uniquely identify diff --git a/system/src/main/java/com/percussion/search/lucene/PSSearchEngineImpl.java b/system/src/main/java/com/percussion/search/lucene/PSSearchEngineImpl.java index 8ef7c2d141..520d8d5ee8 100644 --- a/system/src/main/java/com/percussion/search/lucene/PSSearchEngineImpl.java +++ b/system/src/main/java/com/percussion/search/lucene/PSSearchEngineImpl.java @@ -29,7 +29,7 @@ import java.text.MessageFormat; import java.util.Iterator; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.index.CorruptIndexException; diff --git a/system/src/main/java/com/percussion/search/lucene/PSSearchIndexerImpl.java b/system/src/main/java/com/percussion/search/lucene/PSSearchIndexerImpl.java index 754b56f3fe..c5bd363d03 100644 --- a/system/src/main/java/com/percussion/search/lucene/PSSearchIndexerImpl.java +++ b/system/src/main/java/com/percussion/search/lucene/PSSearchIndexerImpl.java @@ -50,7 +50,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.analysis.Analyzer; diff --git a/system/src/main/java/com/percussion/search/lucene/PSSearchQueryImpl.java b/system/src/main/java/com/percussion/search/lucene/PSSearchQueryImpl.java index f3f9cefafb..e3dda7a7df 100644 --- a/system/src/main/java/com/percussion/search/lucene/PSSearchQueryImpl.java +++ b/system/src/main/java/com/percussion/search/lucene/PSSearchQueryImpl.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; import javax.annotation.concurrent.ThreadSafe; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.analysis.Analyzer; diff --git a/system/src/main/java/com/percussion/search/lucene/PSSearchUtils.java b/system/src/main/java/com/percussion/search/lucene/PSSearchUtils.java index 5b944f4857..77cf23b791 100644 --- a/system/src/main/java/com/percussion/search/lucene/PSSearchUtils.java +++ b/system/src/main/java/com/percussion/search/lucene/PSSearchUtils.java @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/search/lucene/textconverter/PSLuceneTextConverterFactory.java b/system/src/main/java/com/percussion/search/lucene/textconverter/PSLuceneTextConverterFactory.java index 07b1381f6b..99ef6c2646 100644 --- a/system/src/main/java/com/percussion/search/lucene/textconverter/PSLuceneTextConverterFactory.java +++ b/system/src/main/java/com/percussion/search/lucene/textconverter/PSLuceneTextConverterFactory.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/search/lucene/textconverter/PSTextConverterPlainText.java b/system/src/main/java/com/percussion/search/lucene/textconverter/PSTextConverterPlainText.java index 18408177e4..b9f42356ee 100644 --- a/system/src/main/java/com/percussion/search/lucene/textconverter/PSTextConverterPlainText.java +++ b/system/src/main/java/com/percussion/search/lucene/textconverter/PSTextConverterPlainText.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Extracts the text from text files and returns it. It does not process the text, just returns it diff --git a/system/src/main/java/com/percussion/search/lucene/textconverter/PSTikaTextConvertor.java b/system/src/main/java/com/percussion/search/lucene/textconverter/PSTikaTextConvertor.java index f4ea0ec057..21232a3f97 100644 --- a/system/src/main/java/com/percussion/search/lucene/textconverter/PSTikaTextConvertor.java +++ b/system/src/main/java/com/percussion/search/lucene/textconverter/PSTikaTextConvertor.java @@ -27,8 +27,8 @@ import java.io.InputStream; import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tika.config.TikaConfig; diff --git a/system/src/main/java/com/percussion/security/PSBackEndConnection.java b/system/src/main/java/com/percussion/security/PSBackEndConnection.java index e03d8e8d3a..2fcaa9650a 100644 --- a/system/src/main/java/com/percussion/security/PSBackEndConnection.java +++ b/system/src/main/java/com/percussion/security/PSBackEndConnection.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Properties; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/security/PSCataloger.java b/system/src/main/java/com/percussion/security/PSCataloger.java index 1e0aed2911..5f44f99df3 100644 --- a/system/src/main/java/com/percussion/security/PSCataloger.java +++ b/system/src/main/java/com/percussion/security/PSCataloger.java @@ -45,7 +45,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** An abstract base class which holds all common functionality to all catalogers. */ @SuppressWarnings(value = {"unchecked"}) diff --git a/system/src/main/java/com/percussion/security/PSDirectoryCataloger.java b/system/src/main/java/com/percussion/security/PSDirectoryCataloger.java index 67f36ba537..3246f295bf 100644 --- a/system/src/main/java/com/percussion/security/PSDirectoryCataloger.java +++ b/system/src/main/java/com/percussion/security/PSDirectoryCataloger.java @@ -37,7 +37,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * An abstact base class providing default implementations and helper functionality for diff --git a/system/src/main/java/com/percussion/security/PSExitCreateDefaultCommunityAcl.java b/system/src/main/java/com/percussion/security/PSExitCreateDefaultCommunityAcl.java index 7bd1283e13..295c0645a4 100644 --- a/system/src/main/java/com/percussion/security/PSExitCreateDefaultCommunityAcl.java +++ b/system/src/main/java/com/percussion/security/PSExitCreateDefaultCommunityAcl.java @@ -42,7 +42,7 @@ import java.text.MessageFormat; import java.util.Collections; import java.util.Enumeration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/system/src/main/java/com/percussion/security/PSExitDeleteObjectAcl.java b/system/src/main/java/com/percussion/security/PSExitDeleteObjectAcl.java index af2eddb952..ebb6935d3c 100644 --- a/system/src/main/java/com/percussion/security/PSExitDeleteObjectAcl.java +++ b/system/src/main/java/com/percussion/security/PSExitDeleteObjectAcl.java @@ -33,7 +33,7 @@ import com.percussion.services.security.data.PSAclImpl; import com.percussion.utils.guid.IPSGuid; import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/system/src/main/java/com/percussion/security/PSJndiGroupProvider.java b/system/src/main/java/com/percussion/security/PSJndiGroupProvider.java index 4b8d2c857b..101f320eea 100644 --- a/system/src/main/java/com/percussion/security/PSJndiGroupProvider.java +++ b/system/src/main/java/com/percussion/security/PSJndiGroupProvider.java @@ -40,7 +40,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Provides support for cataloging groups for a {@link PSJndiProvider}. Also responsible for diff --git a/system/src/main/java/com/percussion/security/PSJndiProvider.java b/system/src/main/java/com/percussion/security/PSJndiProvider.java index 6c09fc501e..1e6cf5400f 100644 --- a/system/src/main/java/com/percussion/security/PSJndiProvider.java +++ b/system/src/main/java/com/percussion/security/PSJndiProvider.java @@ -31,7 +31,7 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Common base class for security providers which use JNDI (including PSDirectoryProvider, diff --git a/system/src/main/java/com/percussion/security/PSJndiUtils.java b/system/src/main/java/com/percussion/security/PSJndiUtils.java index 779571d0e8..2addf53734 100644 --- a/system/src/main/java/com/percussion/security/PSJndiUtils.java +++ b/system/src/main/java/com/percussion/security/PSJndiUtils.java @@ -42,7 +42,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.naming.directory.SearchControls; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/security/PSRoleCataloger.java b/system/src/main/java/com/percussion/security/PSRoleCataloger.java index 0b75366ca9..f0b51ce956 100644 --- a/system/src/main/java/com/percussion/security/PSRoleCataloger.java +++ b/system/src/main/java/com/percussion/security/PSRoleCataloger.java @@ -39,7 +39,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/security/PSRoleManager.java b/system/src/main/java/com/percussion/security/PSRoleManager.java index 9a1617de48..0c233d1245 100644 --- a/system/src/main/java/com/percussion/security/PSRoleManager.java +++ b/system/src/main/java/com/percussion/security/PSRoleManager.java @@ -45,7 +45,7 @@ import java.util.Set; import java.util.TreeSet; import javax.security.auth.Subject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/security/PSRunAsUser.java b/system/src/main/java/com/percussion/security/PSRunAsUser.java index f8f31c97b2..58ab6ceebd 100644 --- a/system/src/main/java/com/percussion/security/PSRunAsUser.java +++ b/system/src/main/java/com/percussion/security/PSRunAsUser.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map; import javax.security.auth.Subject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/security/PSThreadRequestUtils.java b/system/src/main/java/com/percussion/security/PSThreadRequestUtils.java index ce89139376..15ac6e7a87 100644 --- a/system/src/main/java/com/percussion/security/PSThreadRequestUtils.java +++ b/system/src/main/java/com/percussion/security/PSThreadRequestUtils.java @@ -41,7 +41,7 @@ import javax.security.auth.Subject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/security/PSUserEntry.java b/system/src/main/java/com/percussion/security/PSUserEntry.java index e4d7c7b6de..4fcda6df9f 100644 --- a/system/src/main/java/com/percussion/security/PSUserEntry.java +++ b/system/src/main/java/com/percussion/security/PSUserEntry.java @@ -23,7 +23,7 @@ import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.Iterator; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/security/PSWebServerProvider.java b/system/src/main/java/com/percussion/security/PSWebServerProvider.java index 0fc042f68d..6ce308d457 100644 --- a/system/src/main/java/com/percussion/security/PSWebServerProvider.java +++ b/system/src/main/java/com/percussion/security/PSWebServerProvider.java @@ -27,7 +27,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The PSWebServerProvider class is used to access the security services provided by the web server. diff --git a/system/src/main/java/com/percussion/security/TLSSocketFactory.java b/system/src/main/java/com/percussion/security/TLSSocketFactory.java index 82a52f1f5f..e40fc77675 100644 --- a/system/src/main/java/com/percussion/security/TLSSocketFactory.java +++ b/system/src/main/java/com/percussion/security/TLSSocketFactory.java @@ -43,7 +43,7 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/system/src/main/java/com/percussion/server/PSApplicationHandler.java b/system/src/main/java/com/percussion/server/PSApplicationHandler.java index 53cadb01cf..e51778d5d0 100644 --- a/system/src/main/java/com/percussion/server/PSApplicationHandler.java +++ b/system/src/main/java/com/percussion/server/PSApplicationHandler.java @@ -97,7 +97,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The PSApplicationHandler class is used to handle requests for a given application. diff --git a/system/src/main/java/com/percussion/server/PSBaseControlManager.java b/system/src/main/java/com/percussion/server/PSBaseControlManager.java index 359c427f59..d8b1bdb2e5 100644 --- a/system/src/main/java/com/percussion/server/PSBaseControlManager.java +++ b/system/src/main/java/com/percussion/server/PSBaseControlManager.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/server/PSCustomControlManager.java b/system/src/main/java/com/percussion/server/PSCustomControlManager.java index 76a66d1948..947f76e48f 100644 --- a/system/src/main/java/com/percussion/server/PSCustomControlManager.java +++ b/system/src/main/java/com/percussion/server/PSCustomControlManager.java @@ -30,7 +30,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/server/PSInternalRequest.java b/system/src/main/java/com/percussion/server/PSInternalRequest.java index 6cce462b67..8ce632701d 100644 --- a/system/src/main/java/com/percussion/server/PSInternalRequest.java +++ b/system/src/main/java/com/percussion/server/PSInternalRequest.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.io.InputStream; import java.sql.ResultSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; /** diff --git a/system/src/main/java/com/percussion/server/PSRequest.java b/system/src/main/java/com/percussion/server/PSRequest.java index f364b63e1f..4a6426ca90 100644 --- a/system/src/main/java/com/percussion/server/PSRequest.java +++ b/system/src/main/java/com/percussion/server/PSRequest.java @@ -69,7 +69,7 @@ import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/system/src/main/java/com/percussion/server/PSServer.java b/system/src/main/java/com/percussion/server/PSServer.java index 608eaca437..f0ecfa87ad 100644 --- a/system/src/main/java/com/percussion/server/PSServer.java +++ b/system/src/main/java/com/percussion/server/PSServer.java @@ -16,7 +16,7 @@ package com.percussion.server; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSConstants; import com.percussion.cms.objectstore.PSCmsObject; @@ -170,7 +170,7 @@ import javax.naming.NamingException; import javax.servlet.ServletConfig; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/server/PSStartupProcessManager.java b/system/src/main/java/com/percussion/server/PSStartupProcessManager.java index 5476a58cb1..b3007a0d29 100644 --- a/system/src/main/java/com/percussion/server/PSStartupProcessManager.java +++ b/system/src/main/java/com/percussion/server/PSStartupProcessManager.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.Properties; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/server/PSSystemControlManager.java b/system/src/main/java/com/percussion/server/PSSystemControlManager.java index 7f2aa8ed9f..a208b0cf6d 100644 --- a/system/src/main/java/com/percussion/server/PSSystemControlManager.java +++ b/system/src/main/java/com/percussion/server/PSSystemControlManager.java @@ -19,7 +19,7 @@ import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** @author JaySeletz */ public class PSSystemControlManager extends PSBaseControlManager { diff --git a/system/src/main/java/com/percussion/server/PSUserSession.java b/system/src/main/java/com/percussion/server/PSUserSession.java index 776c818a0b..3f7b840d33 100644 --- a/system/src/main/java/com/percussion/server/PSUserSession.java +++ b/system/src/main/java/com/percussion/server/PSUserSession.java @@ -54,7 +54,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/server/PSUserSessionManager.java b/system/src/main/java/com/percussion/server/PSUserSessionManager.java index a3a1401465..34aa0fdc91 100644 --- a/system/src/main/java/com/percussion/server/PSUserSessionManager.java +++ b/system/src/main/java/com/percussion/server/PSUserSessionManager.java @@ -17,7 +17,7 @@ package com.percussion.server; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.Validate.isTrue; import com.percussion.design.objectstore.PSServerConfiguration; import com.percussion.design.objectstore.server.IPSObjectStoreHandler; diff --git a/system/src/main/java/com/percussion/server/cache/PSCacheStatisticsSnapshot.java b/system/src/main/java/com/percussion/server/cache/PSCacheStatisticsSnapshot.java index 90c01551f3..9c24e9b2b2 100644 --- a/system/src/main/java/com/percussion/server/cache/PSCacheStatisticsSnapshot.java +++ b/system/src/main/java/com/percussion/server/cache/PSCacheStatisticsSnapshot.java @@ -19,7 +19,7 @@ import com.percussion.xml.PSXmlDocumentBuilder; import java.math.BigDecimal; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/server/cache/PSFolderRelationshipCache.java b/system/src/main/java/com/percussion/server/cache/PSFolderRelationshipCache.java index 2fe6dae006..7189f1540c 100644 --- a/system/src/main/java/com/percussion/server/cache/PSFolderRelationshipCache.java +++ b/system/src/main/java/com/percussion/server/cache/PSFolderRelationshipCache.java @@ -57,8 +57,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.SQLQuery; diff --git a/system/src/main/java/com/percussion/server/cache/PSItemSummaryCache.java b/system/src/main/java/com/percussion/server/cache/PSItemSummaryCache.java index 7004d3229a..9c09191367 100644 --- a/system/src/main/java/com/percussion/server/cache/PSItemSummaryCache.java +++ b/system/src/main/java/com/percussion/server/cache/PSItemSummaryCache.java @@ -17,9 +17,9 @@ package com.percussion.server.cache; import static com.percussion.util.PSDataTypeConverter.parseStringToDate; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSCmsErrors; import com.percussion.cms.IPSConstants; diff --git a/system/src/main/java/com/percussion/server/command/PSConsoleCommandEncryptDBPasswords.java b/system/src/main/java/com/percussion/server/command/PSConsoleCommandEncryptDBPasswords.java index 049eda1131..1680e88726 100644 --- a/system/src/main/java/com/percussion/server/command/PSConsoleCommandEncryptDBPasswords.java +++ b/system/src/main/java/com/percussion/server/command/PSConsoleCommandEncryptDBPasswords.java @@ -31,7 +31,7 @@ import java.sql.SQLException; import java.util.Locale; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/system/src/main/java/com/percussion/server/compare/PSCompareRequestHandler.java b/system/src/main/java/com/percussion/server/compare/PSCompareRequestHandler.java index bc1ce66deb..cc647bf9ff 100644 --- a/system/src/main/java/com/percussion/server/compare/PSCompareRequestHandler.java +++ b/system/src/main/java/com/percussion/server/compare/PSCompareRequestHandler.java @@ -38,7 +38,7 @@ import java.util.Collection; import java.util.Iterator; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -129,7 +129,7 @@ public void processRequest(PSRequest request) { } res = getComparisionResult(assemblyPage1, assemblyPage2, lang); } catch (Exception e) { - PSConsole.printMsg(HANDLER, ExceptionUtils.getFullStackTrace(e)); + PSConsole.printMsg(HANDLER, ExceptionUtils.getStackTrace(e)); res = e.getMessage(); } diff --git a/system/src/main/java/com/percussion/server/webservices/PSSearchHandler.java b/system/src/main/java/com/percussion/server/webservices/PSSearchHandler.java index 3dcabd28f2..74aca07d21 100644 --- a/system/src/main/java/com/percussion/server/webservices/PSSearchHandler.java +++ b/system/src/main/java/com/percussion/server/webservices/PSSearchHandler.java @@ -122,8 +122,8 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/server/webservices/PSServerFolderProcessor.java b/system/src/main/java/com/percussion/server/webservices/PSServerFolderProcessor.java index 39a1fa61a9..d19e17031d 100644 --- a/system/src/main/java/com/percussion/server/webservices/PSServerFolderProcessor.java +++ b/system/src/main/java/com/percussion/server/webservices/PSServerFolderProcessor.java @@ -16,9 +16,9 @@ */ package com.percussion.server.webservices; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.Validate.notNull; import com.percussion.cms.IPSCmsErrors; import com.percussion.cms.PSCmsException; @@ -128,8 +128,8 @@ import java.util.Set; import java.util.regex.Pattern; import javax.jcr.query.InvalidQueryException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.transaction.annotation.Propagation; diff --git a/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteFolderActionProcessor.java b/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteFolderActionProcessor.java index df2b064c7e..0b72f7f2ed 100644 --- a/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteFolderActionProcessor.java +++ b/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteFolderActionProcessor.java @@ -18,8 +18,8 @@ package com.percussion.server.webservices.crosssite; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.countMatches; -import static org.apache.commons.lang.Validate.isTrue; +import static org.apache.commons.lang3.StringUtils.countMatches; +import static org.apache.commons.lang3.Validate.isTrue; import com.percussion.cms.PSCmsException; import com.percussion.cms.objectstore.PSComponentSummary; @@ -41,7 +41,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteLinkTypeEnum.java b/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteLinkTypeEnum.java index ff9a9ea5b7..38496b8818 100644 --- a/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteLinkTypeEnum.java +++ b/system/src/main/java/com/percussion/server/webservices/crosssite/PSCrossSiteLinkTypeEnum.java @@ -17,7 +17,7 @@ package com.percussion.server.webservices.crosssite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Enumeration for the cross site link types that are processed by this processor. Each type is diff --git a/system/src/main/java/com/percussion/server/webservices/crosssite/PSMoveActionCategoryEnum.java b/system/src/main/java/com/percussion/server/webservices/crosssite/PSMoveActionCategoryEnum.java index 1c16426225..6d9161434f 100644 --- a/system/src/main/java/com/percussion/server/webservices/crosssite/PSMoveActionCategoryEnum.java +++ b/system/src/main/java/com/percussion/server/webservices/crosssite/PSMoveActionCategoryEnum.java @@ -17,7 +17,7 @@ package com.percussion.server.webservices.crosssite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Enumeration for the folder action categories that are processed by this processor. Each category diff --git a/system/src/main/java/com/percussion/server/webservices/crosssite/PSRemoveActionCategoryEnum.java b/system/src/main/java/com/percussion/server/webservices/crosssite/PSRemoveActionCategoryEnum.java index 19f9ebc3e5..561a77c872 100644 --- a/system/src/main/java/com/percussion/server/webservices/crosssite/PSRemoveActionCategoryEnum.java +++ b/system/src/main/java/com/percussion/server/webservices/crosssite/PSRemoveActionCategoryEnum.java @@ -17,7 +17,7 @@ package com.percussion.server.webservices.crosssite; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Enumeration for the remove from folder action categories that are processed by this processor per diff --git a/system/src/main/java/com/percussion/servlets/PSActionPanelServlet.java b/system/src/main/java/com/percussion/servlets/PSActionPanelServlet.java index ccbc954851..bb3c8441ba 100644 --- a/system/src/main/java/com/percussion/servlets/PSActionPanelServlet.java +++ b/system/src/main/java/com/percussion/servlets/PSActionPanelServlet.java @@ -50,7 +50,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.collections.MultiMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This servlet is now misnamed. A better name would be PSLinkDispatchServlet. However, that would diff --git a/system/src/main/java/com/percussion/servlets/PSCorsFilter.java b/system/src/main/java/com/percussion/servlets/PSCorsFilter.java index 8745993b52..19a6920069 100644 --- a/system/src/main/java/com/percussion/servlets/PSCorsFilter.java +++ b/system/src/main/java/com/percussion/servlets/PSCorsFilter.java @@ -26,7 +26,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; diff --git a/system/src/main/java/com/percussion/servlets/PSDispatcherFilter.java b/system/src/main/java/com/percussion/servlets/PSDispatcherFilter.java index 887ea113a1..4ea20d07b1 100644 --- a/system/src/main/java/com/percussion/servlets/PSDispatcherFilter.java +++ b/system/src/main/java/com/percussion/servlets/PSDispatcherFilter.java @@ -34,7 +34,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.logging.log4j.LogManager; diff --git a/system/src/main/java/com/percussion/servlets/PSLoginServlet.java b/system/src/main/java/com/percussion/servlets/PSLoginServlet.java index a259a4b59c..0608ba329a 100644 --- a/system/src/main/java/com/percussion/servlets/PSLoginServlet.java +++ b/system/src/main/java/com/percussion/servlets/PSLoginServlet.java @@ -20,7 +20,7 @@ import static com.percussion.cms.IPSConstants.SECURITY_LOG; import static com.percussion.utils.request.PSRequestInfoBase.KEY_PSREQUEST; import static com.percussion.utils.request.PSRequestInfoBase.getRequestInfo; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; @@ -50,8 +50,8 @@ import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/servlets/PSSecurityFilter.java b/system/src/main/java/com/percussion/servlets/PSSecurityFilter.java index 81bd41c5dd..bea6acc987 100644 --- a/system/src/main/java/com/percussion/servlets/PSSecurityFilter.java +++ b/system/src/main/java/com/percussion/servlets/PSSecurityFilter.java @@ -16,7 +16,7 @@ */ package com.percussion.servlets; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import com.percussion.auditlog.PSActionOutcome; import com.percussion.auditlog.PSAuditLogService; @@ -90,9 +90,9 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.util.WebUtils; diff --git a/system/src/main/java/com/percussion/servlets/PSSetCommunityFilter.java b/system/src/main/java/com/percussion/servlets/PSSetCommunityFilter.java index b315479fed..bf22f17ace 100644 --- a/system/src/main/java/com/percussion/servlets/PSSetCommunityFilter.java +++ b/system/src/main/java/com/percussion/servlets/PSSetCommunityFilter.java @@ -37,8 +37,8 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/servlets/PSTdSchemaXmlServlet.java b/system/src/main/java/com/percussion/servlets/PSTdSchemaXmlServlet.java index fa50e748d3..153408bb6f 100644 --- a/system/src/main/java/com/percussion/servlets/PSTdSchemaXmlServlet.java +++ b/system/src/main/java/com/percussion/servlets/PSTdSchemaXmlServlet.java @@ -52,7 +52,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/servlets/taglib/PSJSFBaseTag.java b/system/src/main/java/com/percussion/servlets/taglib/PSJSFBaseTag.java index 9573ea38f9..08d32fc545 100644 --- a/system/src/main/java/com/percussion/servlets/taglib/PSJSFBaseTag.java +++ b/system/src/main/java/com/percussion/servlets/taglib/PSJSFBaseTag.java @@ -22,7 +22,7 @@ import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; import javax.faces.webapp.UIComponentTag; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Base class for our JSF tags, provides basic implementations inspired by the core jsf book. diff --git a/system/src/main/java/com/percussion/servlets/taglib/PSMenuItemTag.java b/system/src/main/java/com/percussion/servlets/taglib/PSMenuItemTag.java index 8d97bdcba6..95df0297e5 100644 --- a/system/src/main/java/com/percussion/servlets/taglib/PSMenuItemTag.java +++ b/system/src/main/java/com/percussion/servlets/taglib/PSMenuItemTag.java @@ -17,7 +17,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.myfaces.shared.taglib.UIComponentTagUtils; /** diff --git a/system/src/main/java/com/percussion/servlets/taglib/PSUIMenuItem.java b/system/src/main/java/com/percussion/servlets/taglib/PSUIMenuItem.java index a0f3c0ef7c..04e95bb8b4 100644 --- a/system/src/main/java/com/percussion/servlets/taglib/PSUIMenuItem.java +++ b/system/src/main/java/com/percussion/servlets/taglib/PSUIMenuItem.java @@ -20,7 +20,7 @@ import javax.faces.component.html.HtmlCommandLink; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Handle the input and rendering for the menu item diff --git a/system/src/main/java/com/percussion/servlets/taglib/PSUISpanId.java b/system/src/main/java/com/percussion/servlets/taglib/PSUISpanId.java index f20b284a82..6cb8257500 100644 --- a/system/src/main/java/com/percussion/servlets/taglib/PSUISpanId.java +++ b/system/src/main/java/com/percussion/servlets/taglib/PSUISpanId.java @@ -20,7 +20,7 @@ import javax.faces.component.UIOutput; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Create a span tag with a calculated id. diff --git a/system/src/main/java/com/percussion/servlets/utils/PSExtractComponentUrls.java b/system/src/main/java/com/percussion/servlets/utils/PSExtractComponentUrls.java index edd8a3274b..961ef0e3bf 100644 --- a/system/src/main/java/com/percussion/servlets/utils/PSExtractComponentUrls.java +++ b/system/src/main/java/com/percussion/servlets/utils/PSExtractComponentUrls.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/system/src/main/java/com/percussion/util/PSCms.java b/system/src/main/java/com/percussion/util/PSCms.java index 3a81c2715b..cec53adedf 100644 --- a/system/src/main/java/com/percussion/util/PSCms.java +++ b/system/src/main/java/com/percussion/util/PSCms.java @@ -16,7 +16,7 @@ */ package com.percussion.util; -import static org.apache.commons.lang.StringUtils.equalsIgnoreCase; +import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import com.percussion.cms.IPSConstants; import com.percussion.cms.PSCmsException; @@ -63,7 +63,7 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/system/src/main/java/com/percussion/util/PSDataSource.java b/system/src/main/java/com/percussion/util/PSDataSource.java index 6ea46ed02f..cc32764bf7 100644 --- a/system/src/main/java/com/percussion/util/PSDataSource.java +++ b/system/src/main/java/com/percussion/util/PSDataSource.java @@ -25,7 +25,7 @@ import java.util.Properties; import java.util.logging.Logger; import javax.sql.DataSource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Datasource which creates a database connection using a driver loaded from an external file. diff --git a/system/src/main/java/com/percussion/util/PSUrlUtils.java b/system/src/main/java/com/percussion/util/PSUrlUtils.java index 0db600a7fd..f92f483cf2 100644 --- a/system/src/main/java/com/percussion/util/PSUrlUtils.java +++ b/system/src/main/java/com/percussion/util/PSUrlUtils.java @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A utility class that contains methods useful for processing URLs. All methods are static as it is diff --git a/system/src/main/java/com/percussion/utils/jsr170/PSProperty.java b/system/src/main/java/com/percussion/utils/jsr170/PSProperty.java index 3c285cf8c2..5a65f0f28a 100644 --- a/system/src/main/java/com/percussion/utils/jsr170/PSProperty.java +++ b/system/src/main/java/com/percussion/utils/jsr170/PSProperty.java @@ -50,10 +50,10 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.PropertyDefinition; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/src/main/java/com/percussion/workflow/PSStatesContextPK.java b/system/src/main/java/com/percussion/workflow/PSStatesContextPK.java index 7c889d49af..3152ea6c88 100644 --- a/system/src/main/java/com/percussion/workflow/PSStatesContextPK.java +++ b/system/src/main/java/com/percussion/workflow/PSStatesContextPK.java @@ -19,7 +19,7 @@ import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Embeddable; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; /** * Primary key for state lookup diff --git a/system/src/main/java/com/percussion/workflow/PSTransitionInfo.java b/system/src/main/java/com/percussion/workflow/PSTransitionInfo.java index c67e7fca88..89e87c71f8 100644 --- a/system/src/main/java/com/percussion/workflow/PSTransitionInfo.java +++ b/system/src/main/java/com/percussion/workflow/PSTransitionInfo.java @@ -16,7 +16,7 @@ */ package com.percussion.workflow; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** Aggregates some basic info about a transition */ public class PSTransitionInfo { diff --git a/system/src/main/java/com/percussion/workflow/PSWorkFlowUtils.java b/system/src/main/java/com/percussion/workflow/PSWorkFlowUtils.java index b7db2be81a..e6b637666f 100644 --- a/system/src/main/java/com/percussion/workflow/PSWorkFlowUtils.java +++ b/system/src/main/java/com/percussion/workflow/PSWorkFlowUtils.java @@ -57,7 +57,7 @@ import java.sql.Timestamp; import java.util.*; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.EmailConstants; import org.apache.commons.mail.EmailException; diff --git a/system/src/main/java/com/percussion/workflow/PSWorkflowAppsContext.java b/system/src/main/java/com/percussion/workflow/PSWorkflowAppsContext.java index 985075fc3b..96cf84cc67 100644 --- a/system/src/main/java/com/percussion/workflow/PSWorkflowAppsContext.java +++ b/system/src/main/java/com/percussion/workflow/PSWorkflowAppsContext.java @@ -18,7 +18,7 @@ import com.percussion.services.workflow.data.PSWorkflow; import java.sql.SQLException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Represents a workflow in the system. This object is not cached at this time as it may be updated diff --git a/system/src/main/java/com/percussion/workflow/actions/PSItemSummaryFinder.java b/system/src/main/java/com/percussion/workflow/actions/PSItemSummaryFinder.java index a5da7e35bb..9ff1582ba9 100644 --- a/system/src/main/java/com/percussion/workflow/actions/PSItemSummaryFinder.java +++ b/system/src/main/java/com/percussion/workflow/actions/PSItemSummaryFinder.java @@ -22,7 +22,7 @@ import com.percussion.services.legacy.IPSCmsContentSummaries; import com.percussion.services.legacy.PSCmsContentSummariesLocator; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/system/src/main/java/com/percussion/workflow/actions/PSWFActionService.java b/system/src/main/java/com/percussion/workflow/actions/PSWFActionService.java index 3da0f46049..c828b10241 100644 --- a/system/src/main/java/com/percussion/workflow/actions/PSWFActionService.java +++ b/system/src/main/java/com/percussion/workflow/actions/PSWFActionService.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/system/src/main/java/com/percussion/workflow/actions/PSWorkflowInfoFinder.java b/system/src/main/java/com/percussion/workflow/actions/PSWorkflowInfoFinder.java index 9c0cf29727..d765cc7cb9 100644 --- a/system/src/main/java/com/percussion/workflow/actions/PSWorkflowInfoFinder.java +++ b/system/src/main/java/com/percussion/workflow/actions/PSWorkflowInfoFinder.java @@ -28,7 +28,7 @@ import com.percussion.webservices.system.PSSystemWsLocator; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/system/src/main/java/com/percussion/xmldom/PSXmlDomUtils.java b/system/src/main/java/com/percussion/xmldom/PSXmlDomUtils.java index 5227964e39..319f2975ee 100644 --- a/system/src/main/java/com/percussion/xmldom/PSXmlDomUtils.java +++ b/system/src/main/java/com/percussion/xmldom/PSXmlDomUtils.java @@ -39,7 +39,7 @@ import java.io.Writer; import java.util.Iterator; import javax.xml.parsers.DocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/system/webservices/src/com/percussion/webservices/PSBaseSOAPImpl.java b/system/webservices/src/com/percussion/webservices/PSBaseSOAPImpl.java index 70bd890bdb..77201a74d6 100644 --- a/system/webservices/src/com/percussion/webservices/PSBaseSOAPImpl.java +++ b/system/webservices/src/com/percussion/webservices/PSBaseSOAPImpl.java @@ -35,7 +35,7 @@ import org.apache.axis.attachments.Attachments; import org.apache.axis.transport.http.HTTPConstants; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -196,7 +196,7 @@ protected String authenticate() throws PSInvalidSessionFault logger.debug("Authentication Error Code:" + code, ex); throw new PSInvalidSessionFault(code, PSWebserviceErrors.createErrorMessage(code, ex.toString()), - ExceptionUtils.getFullStackTrace(ex)); + ExceptionUtils.getStackTrace(ex)); } } @@ -271,7 +271,7 @@ protected void handleInvalidContract(IllegalArgumentException e, logger.error("SOAP Invalid Contract for service "+serviceName,e); throw new PSContractViolationFault(code, - PSWebserviceErrors.createErrorMessage(code, serviceName, e.toString()), ExceptionUtils.getFullStackTrace(e)); + PSWebserviceErrors.createErrorMessage(code, serviceName, e.toString()), ExceptionUtils.getStackTrace(e)); } /** @@ -305,7 +305,7 @@ protected void handleRuntimeException(RuntimeException e, String serviceName) throw new PSNotAuthorizedFault(code, PSWebserviceErrors.createErrorMessage(code, getRemoteUser(), serviceName, e.toString()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } else logger.error("SOAP RuntimeException for service "+serviceName,e); diff --git a/system/webservices/src/com/percussion/webservices/PSErrorException.java b/system/webservices/src/com/percussion/webservices/PSErrorException.java index e990d3da6d..84491aa3ff 100644 --- a/system/webservices/src/com/percussion/webservices/PSErrorException.java +++ b/system/webservices/src/com/percussion/webservices/PSErrorException.java @@ -16,9 +16,9 @@ */ package com.percussion.webservices; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * This exception describes errors that happend in web service calls. diff --git a/system/webservices/src/com/percussion/webservices/PSErrorResultsException.java b/system/webservices/src/com/percussion/webservices/PSErrorResultsException.java index d1455ed32f..c036967d1f 100644 --- a/system/webservices/src/com/percussion/webservices/PSErrorResultsException.java +++ b/system/webservices/src/com/percussion/webservices/PSErrorResultsException.java @@ -17,8 +17,8 @@ package com.percussion.webservices; import com.percussion.utils.guid.IPSGuid; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.ArrayList; import java.util.HashMap; diff --git a/system/webservices/src/com/percussion/webservices/PSErrorsException.java b/system/webservices/src/com/percussion/webservices/PSErrorsException.java index 915eac5530..cbb986fd8e 100644 --- a/system/webservices/src/com/percussion/webservices/PSErrorsException.java +++ b/system/webservices/src/com/percussion/webservices/PSErrorsException.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * This exception may be thrown by web services which operate on multiple diff --git a/system/webservices/src/com/percussion/webservices/PSTemplateImageUtils.java b/system/webservices/src/com/percussion/webservices/PSTemplateImageUtils.java index 6bcf837013..fc18862536 100644 --- a/system/webservices/src/com/percussion/webservices/PSTemplateImageUtils.java +++ b/system/webservices/src/com/percussion/webservices/PSTemplateImageUtils.java @@ -17,7 +17,7 @@ package com.percussion.webservices; import com.percussion.server.PSServer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/webservices/src/com/percussion/webservices/PSWebserviceErrors.java b/system/webservices/src/com/percussion/webservices/PSWebserviceErrors.java index 6c22b3b9f9..7cf3dc23a9 100644 --- a/system/webservices/src/com/percussion/webservices/PSWebserviceErrors.java +++ b/system/webservices/src/com/percussion/webservices/PSWebserviceErrors.java @@ -16,7 +16,7 @@ */ package com.percussion.webservices; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.text.MessageFormat; import java.util.Locale; diff --git a/system/webservices/src/com/percussion/webservices/PSWebserviceUtils.java b/system/webservices/src/com/percussion/webservices/PSWebserviceUtils.java index 003c34dd26..3e39797c0a 100644 --- a/system/webservices/src/com/percussion/webservices/PSWebserviceUtils.java +++ b/system/webservices/src/com/percussion/webservices/PSWebserviceUtils.java @@ -102,8 +102,8 @@ import com.percussion.webservices.ui.IPSUiDesignWs; import com.percussion.webservices.ui.PSUiWsLocator; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; @@ -119,7 +119,7 @@ import java.util.Map; import java.util.Objects; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; /** * Utilities useful for all or multiple webservices. @@ -615,7 +615,7 @@ public static void handleMissingLockError(IPSGuid id, Class cz, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, cz.getName(), guid .getValue()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); results.addError(id, error); } else @@ -625,7 +625,7 @@ public static void handleMissingLockError(IPSGuid id, Class cz, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, cz.getName(), guid .getValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -675,7 +675,7 @@ public static void extendLock(IPSGuid id, Class cz, String session, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, cz.getName(), guid .getValue(), e.getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -701,7 +701,7 @@ public static PSErrorException checkDependencies(IPSGuid id) } error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code,displayName, id.longValue(), depTypes), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } return error; @@ -735,7 +735,7 @@ public static PSErrorException checkAssociationDependencies(IPSGuid parent, .valueOf(children.get(0).getType())).getDisplayName(), PSStringUtils.listToString(pair.getFirst(), ", "), pair .getSecond()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } return error; @@ -826,7 +826,7 @@ public static PSComponentSummary getItemSummary(int id,boolean refresh) throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSComponentSummary.class.getName(), id), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } return summary; @@ -956,7 +956,7 @@ public static IPSCatalogItem getSlotOrTemplateFromName(String name, log.error(PSExceptionUtils.getMessageForLog(e)); throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND_BY_NAME, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND_BY_NAME, PSSlotType.class - .getName(), name), ExceptionUtils.getFullStackTrace(e)); + .getName(), name), ExceptionUtils.getStackTrace(e)); } } @@ -1016,7 +1016,7 @@ public static IPSTemplateSlot loadSlot(IPSGuid slotId) throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND, IPSTemplateSlot.class.getName(), slotId), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); } } @@ -1051,7 +1051,7 @@ public static IPSAssemblyTemplate loadTemplate(IPSGuid templateId, throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND, IPSAssemblyTemplate.class.getName(), new PSDesignGuid(templateId).getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -1083,7 +1083,7 @@ public static IPSAssemblyTemplate loadUnmodifiableTemplate( throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND, IPSAssemblyTemplate.class.getName(), new PSDesignGuid(templateId).getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -1173,7 +1173,7 @@ public static void saveRelationship(PSRelationship rel) throw new PSErrorException(IPSWebserviceErrors.FAILED_SAVE_RELATIONSHIPS, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_SAVE_RELATIONSHIPS, e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); } @@ -1241,7 +1241,7 @@ public static void saveAaRelationships(List rels) throw new PSErrorException(IPSWebserviceErrors.FAILED_SAVE_RELATIONSHIPS, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_SAVE_RELATIONSHIPS, PSExceptionUtils.getMessageForLog(e)), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); } } @@ -1349,7 +1349,7 @@ public static PSLocator validateItemCheckoutByUser(PSLocator locator) throw new PSErrorException(IPSWebserviceErrors.ITEM_NOT_CHECKOUT_BY_USER, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.ITEM_NOT_CHECKOUT_BY_USER, locator .getId(), getUserName()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } else { @@ -1690,7 +1690,7 @@ public static PSWorkflow getWorkflow(int workflowId) throw new PSErrorException(IPSWebserviceErrors.FAILED_LOAD_WORKFLOW, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_LOAD_WORKFLOW, workflowId), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } return wf; @@ -1718,7 +1718,7 @@ public static PSState getStateById(PSWorkflow wf, long id) throw new PSErrorException(IPSWebserviceErrors.CANNOT_FIND_WORKFLOW_STATE_ID, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.CANNOT_FIND_WORKFLOW_STATE_ID, id, wf.getGUID() .longValue(), wf.getName()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } /** @@ -1769,7 +1769,7 @@ public static void transitionItem(int id, String trigger, String comment, Throwable rootCause = PSExceptionHelper.findRootCause(e,false); PSErrorException error = new PSErrorException(IPSWebserviceErrors.FAILED_TRANSITION_ITEM, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_TRANSITION_ITEM, trigger, id), - ExceptionUtils.getFullStackTrace(rootCause),e); + ExceptionUtils.getStackTrace(rootCause),e); throw new PSErrorException("Failed transition due to server error.",error); } @@ -1878,7 +1878,7 @@ public static List loadAcls(List aclIds) PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSAclImpl.class .getName(), id.longValue()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -2104,7 +2104,7 @@ public static void saveRelationshipConfigSet( { throw new PSErrorException(errorCode, PSWebserviceErrors.createErrorMessage(errorCode, e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } diff --git a/system/webservices/src/com/percussion/webservices/aop/security/strategy/PSSecurityStrategy.java b/system/webservices/src/com/percussion/webservices/aop/security/strategy/PSSecurityStrategy.java index a85ad7c0cb..8d117623e6 100644 --- a/system/webservices/src/com/percussion/webservices/aop/security/strategy/PSSecurityStrategy.java +++ b/system/webservices/src/com/percussion/webservices/aop/security/strategy/PSSecurityStrategy.java @@ -44,8 +44,8 @@ import java.util.Set; import org.aopalliance.intercept.MethodInvocation; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -546,7 +546,7 @@ private boolean checkGuidWithAcl(IPSAcl acl, IPSGuid guid, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, dguid.toString(), perm), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); failedGuids.put(guid, error); isFailed = true; } diff --git a/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyDesignWs.java b/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyDesignWs.java index adf6239529..9bba5d6f53 100644 --- a/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyDesignWs.java +++ b/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyDesignWs.java @@ -58,8 +58,8 @@ import com.percussion.webservices.assembly.data.PSAssemblyTemplateWs; import com.percussion.webservices.content.IPSContentDesignWs; import com.percussion.webservices.content.PSContentWsLocator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -258,7 +258,7 @@ public void deleteAssemblyTemplates(List ids, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, IPSAssemblyTemplate.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -383,7 +383,7 @@ public void deleteSlots(List ids, boolean ignoreDependencies, PSWebserviceErrors.createErrorMessage(code, IPSTemplateSlot.class.getName(), guid.getValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -540,7 +540,7 @@ public List loadSlots(List ids, boolean lock, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, IPSTemplateSlot.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -610,7 +610,7 @@ public void saveAssemblyTemplates(List templates, PSWebserviceErrors.createErrorMessage(code, IPSAssemblyTemplate.class.getName(), guid.getValue(), PSWebserviceErrors.appendMessages(e)), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -948,7 +948,7 @@ public void saveSlots(List slots, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, IPSTemplateSlot.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); }else { int code = IPSWebserviceErrors.OBJECT_NOT_LOCKED_FOR_REQUESTOR; @@ -957,7 +957,7 @@ public void saveSlots(List slots, boolean release, PSWebserviceErrors.createErrorMessage(code, IPSTemplateSlot.class.getName(), guid.getValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -983,7 +983,7 @@ public void saveSlots(List slots, boolean release, PSWebserviceErrors.createErrorMessage(code, IPSTemplateSlot.class.getName(), guid.getValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } diff --git a/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyWs.java b/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyWs.java index 8b9ceb4511..ed0b70a86a 100644 --- a/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyWs.java +++ b/system/webservices/src/com/percussion/webservices/assembly/impl/PSAssemblyWs.java @@ -26,7 +26,7 @@ import com.percussion.util.PSBaseBean; import com.percussion.webservices.assembly.IPSAssemblyWs; import com.percussion.webservices.assembly.data.PSAssemblyTemplateWs; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/webservices/src/com/percussion/webservices/content/ContentSOAPImpl.java b/system/webservices/src/com/percussion/webservices/content/ContentSOAPImpl.java index 5a47b0e0c4..f20b330c7b 100644 --- a/system/webservices/src/com/percussion/webservices/content/ContentSOAPImpl.java +++ b/system/webservices/src/com/percussion/webservices/content/ContentSOAPImpl.java @@ -67,8 +67,8 @@ import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.attachments.AttachmentPart; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -119,7 +119,7 @@ public PSAutoTranslation[] loadTranslationSettings() throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, "loadTranslationSettings", e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -493,12 +493,12 @@ public PSChildEntry[] createChildEntries( catch (PSUnknownChildException e) { throw new PSUnknownChildFault(e.getCode(), e.getLocalizedMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } catch (PSInvalidStateException e) { throw new PSContractViolationFault(e.getCode(), - e.getLocalizedMessage(), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage(), ExceptionUtils.getStackTrace(e)); } catch (PSErrorException e) { @@ -540,7 +540,7 @@ public PSItem[] createItems(CreateItemsRequest createItemsRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSUnknownContentTypeException e) { @@ -548,7 +548,7 @@ public PSItem[] createItems(CreateItemsRequest createItemsRequest) throw new PSUnknownContentTypeFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, createItemsRequest.getContentType(), - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorException e) { @@ -723,12 +723,12 @@ public void deleteChildEntries( catch (PSUnknownChildException e) { throw new PSUnknownChildFault(e.getCode(), e.getLocalizedMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } catch (PSInvalidStateException e) { throw new PSContractViolationFault(e.getCode(), - e.getLocalizedMessage(), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage(), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -1247,7 +1247,7 @@ public PSChildEntry[] loadChildEntries( catch (PSUnknownChildException e) { throw new PSUnknownChildFault(e.getCode(), e.getLocalizedMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } catch (PSErrorResultsException e) { @@ -1602,7 +1602,7 @@ public PSItem[] newCopies(NewCopiesRequest newCopiesRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorResultsException e) { @@ -1678,7 +1678,7 @@ public PSItem[] newPromotableVersions( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorResultsException e) { @@ -1733,7 +1733,7 @@ public PSItem[] newTranslations(NewTranslationsRequest newTranslationsRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorResultsException e) { @@ -1934,12 +1934,12 @@ public void reorderChildEntries( catch (PSUnknownChildException e) { throw new PSUnknownChildFault(e.getCode(), e.getLocalizedMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } catch (PSInvalidStateException e) { throw new PSContractViolationFault(e.getCode(), - e.getLocalizedMessage(), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage(), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -2018,12 +2018,12 @@ public void saveChildEntries(SaveChildEntriesRequest saveChildEntriesRequest) catch (PSUnknownChildException e) { throw new PSUnknownChildFault(e.getCode(), e.getLocalizedMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } catch (PSInvalidStateException e) { throw new PSContractViolationFault(e.getCode(), - e.getLocalizedMessage(), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage(), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { diff --git a/system/webservices/src/com/percussion/webservices/content/impl/PSContentBaseWs.java b/system/webservices/src/com/percussion/webservices/content/impl/PSContentBaseWs.java index 58f8c6ec66..3ff45a5dcf 100644 --- a/system/webservices/src/com/percussion/webservices/content/impl/PSContentBaseWs.java +++ b/system/webservices/src/com/percussion/webservices/content/impl/PSContentBaseWs.java @@ -19,8 +19,8 @@ import com.percussion.webservices.IPSWebserviceErrors; import com.percussion.webservices.PSErrorException; import com.percussion.webservices.PSWebserviceErrors; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -63,7 +63,7 @@ protected void throwOperationError(String operation, Exception e) int code = IPSWebserviceErrors.OPERATION_FAILED_ERROR; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage( code, operation, e.getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); } /** @@ -80,7 +80,7 @@ protected void throwUnexpectedError(Exception e) throws PSErrorException int code = IPSWebserviceErrors.UNEXPECTED_ERROR; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage( - code, e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + code, e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } diff --git a/system/webservices/src/com/percussion/webservices/content/impl/PSContentDesignWs.java b/system/webservices/src/com/percussion/webservices/content/impl/PSContentDesignWs.java index d2ef560ff0..eee1a061e5 100644 --- a/system/webservices/src/com/percussion/webservices/content/impl/PSContentDesignWs.java +++ b/system/webservices/src/com/percussion/webservices/content/impl/PSContentDesignWs.java @@ -83,8 +83,8 @@ import com.percussion.webservices.content.IPSContentDesignWs; import com.percussion.webservices.content.IPSContentWs; import com.percussion.webservices.content.PSContentWsLocator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -450,7 +450,7 @@ public void deleteContentTypes(List ids, PSWebserviceErrors.createErrorMessage(code, PSItemDefinition.class.getName(), guid.getValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -569,7 +569,7 @@ public void deleteLocales(List ids, boolean ignoreDependencies, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSTemplateSlot.class .getName(), guid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -682,7 +682,7 @@ public List loadAssociatedTemplates( PSWebserviceErrors.createErrorMessage(code, nodeDef .getClass().getName(), nodeDef.getGUID().longValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e), e.getLocker(), e.getRemainigTime()); + .getStackTrace(e), e.getLocker(), e.getRemainigTime()); results.addError(nodeDef.getGUID(), error); } } @@ -694,7 +694,7 @@ public List loadAssociatedTemplates( PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, IPSNodeDefinition.class.getName(), guid .getValue(), e.getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(contentTypeId, error); } @@ -759,7 +759,7 @@ public List loadAssociatedWorkflows( PSWebserviceErrors.createErrorMessage(code, nodeDef .getClass().getName(), nodeDef.getGUID().longValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e), e.getLocker(), e.getRemainigTime()); + .getStackTrace(e), e.getLocker(), e.getRemainigTime()); results.addError(nodeDef.getGUID(), error); } } @@ -771,7 +771,7 @@ public List loadAssociatedWorkflows( PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, IPSNodeDefinition.class.getName(), guid .getValue(), e.getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(contentTypeId, error); } @@ -812,7 +812,7 @@ public PSContentEditorSharedDef loadContentEditorSharedDef(boolean lock, throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue(), e.getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e), e.getLocker(), e.getRemainigTime()); + .getStackTrace(e), e.getLocker(), e.getRemainigTime()); } } @@ -855,7 +855,7 @@ public PSContentEditorSystemDef loadContentEditorSystemDef(boolean lock, throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue(), e.getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e), e.getLocker(), e.getRemainigTime()); + .getStackTrace(e), e.getLocker(), e.getRemainigTime()); } } @@ -907,7 +907,7 @@ public List loadContentTypes(List ids, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSItemDefinition.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -929,7 +929,7 @@ public List loadContentTypes(List ids, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSItemDefinition.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -963,7 +963,7 @@ public List loadContentTypes(List ids, PSWebserviceErrors.createErrorMessage(code, nodeDef .getClass().getName(), nodeDef.getGUID().longValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e), e.getLocker(), e.getRemainigTime()); + .getStackTrace(e), e.getLocker(), e.getRemainigTime()); results.addError(nodeDef.getGUID(), error); } } @@ -1015,7 +1015,7 @@ public List loadKeywords(List ids, boolean lock, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSKeyword.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -1065,7 +1065,7 @@ public List loadLocales(List ids, boolean lock, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSLocale.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); results.addError(id, error); } else @@ -1120,7 +1120,7 @@ public List loadTranslationSettings(boolean lock, catch (PSLockException e) { throw new PSLockErrorException(e.getErrorCode(), e.getMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -1238,7 +1238,7 @@ public void saveAssociatedTemplates(IPSGuid contentTypeId, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, TYPE, guid .toString()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); results.addError(contentTypeId, error); } else @@ -1248,7 +1248,7 @@ public void saveAssociatedTemplates(IPSGuid contentTypeId, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, TYPE, guid .toString(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(contentTypeId, error); } } @@ -1259,7 +1259,7 @@ public void saveAssociatedTemplates(IPSGuid contentTypeId, PSDesignGuid guid = new PSDesignGuid(contentTypeId); PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, TYPE, guid.toString()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(contentTypeId, error); } catch (Exception e) @@ -1268,7 +1268,7 @@ public void saveAssociatedTemplates(IPSGuid contentTypeId, PSDesignGuid guid = new PSDesignGuid(contentTypeId); PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, TYPE, guid.toString(), e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); results.addError(contentTypeId, error); } @@ -1365,7 +1365,7 @@ public void saveAssociatedWorkflows(IPSGuid contentTypeId, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, TYPE, guid .toString()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); results.addError(contentTypeId, error); } else @@ -1375,7 +1375,7 @@ public void saveAssociatedWorkflows(IPSGuid contentTypeId, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, TYPE, guid .toString(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(contentTypeId, error); } } @@ -1386,7 +1386,7 @@ public void saveAssociatedWorkflows(IPSGuid contentTypeId, PSDesignGuid guid = new PSDesignGuid(contentTypeId); PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, TYPE, guid.toString()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(contentTypeId, error); } catch (Exception e) @@ -1395,7 +1395,7 @@ public void saveAssociatedWorkflows(IPSGuid contentTypeId, PSDesignGuid guid = new PSDesignGuid(contentTypeId); PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, TYPE, guid.toString(), e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); results.addError(contentTypeId, error); } @@ -1475,7 +1475,7 @@ public void saveContentEditorSharedDef(PSContentEditorSharedDef def, int code = IPSWebserviceErrors.UNABLE_SAVE_SHARED_DEF_VALIDATION; throw new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, errMsg), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } os.saveContentEditorSharedDefFile(def); if (!release) @@ -1490,14 +1490,14 @@ public void saveContentEditorSharedDef(PSContentEditorSharedDef def, throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } int code = IPSWebserviceErrors.OBJECT_NOT_LOCKED_FOR_REQUESTOR; throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } } catch (PSLockException e) @@ -1505,7 +1505,7 @@ public void saveContentEditorSharedDef(PSContentEditorSharedDef def, int code = IPSWebserviceErrors.SAVE_FAILED; throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id.longValue(), - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (IOException e) { @@ -1559,7 +1559,7 @@ public void saveContentEditorSystemDef(PSContentEditorSystemDef def, throw new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue(), errMsg), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } os.saveContentEditorSystemDef(def); if (!release) @@ -1574,14 +1574,14 @@ public void saveContentEditorSystemDef(PSContentEditorSystemDef def, throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } int code = IPSWebserviceErrors.OBJECT_NOT_LOCKED_FOR_REQUESTOR; throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id .longValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } } catch (PSLockException e) @@ -1589,7 +1589,7 @@ public void saveContentEditorSystemDef(PSContentEditorSystemDef def, int code = IPSWebserviceErrors.SAVE_FAILED; throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, def.getClass().getName(), id.longValue(), - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (IOException e) { @@ -1677,7 +1677,7 @@ public void saveContentTypes(List contentTypes, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSItemDefinition.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } else @@ -1688,7 +1688,7 @@ public void saveContentTypes(List contentTypes, PSWebserviceErrors.createErrorMessage(code, PSItemDefinition.class.getName(), guid.getValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -1701,7 +1701,7 @@ public void saveContentTypes(List contentTypes, PSWebserviceErrors.createErrorMessage(code, PSItemDefinition.class.getName(), guid.getValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -1780,7 +1780,7 @@ public void saveKeywords(List keywords, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSKeyword.class .getName(), guid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -1873,7 +1873,7 @@ public void saveLocales(List locales, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSLocale.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); results.addError(id, error); } else @@ -1884,7 +1884,7 @@ public void saveLocales(List locales, boolean release, PSWebserviceErrors.createErrorMessage(code, PSLocale.class .getName(), guid.getValue(), lock.getLocker(), lock .getRemainingTime()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); results.addError(id, error); } } @@ -1896,7 +1896,7 @@ public void saveLocales(List locales, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSLocale.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -1992,7 +1992,7 @@ public void saveTranslationSettings( throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, PSAutoTranslation.class.getName(), guid.longValue()), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } else { @@ -2001,7 +2001,7 @@ public void saveTranslationSettings( throw new PSLockErrorException(code, PSWebserviceErrors .createErrorMessage(code, PSAutoTranslation.class.getName(), guid.longValue()), ExceptionUtils - .getFullStackTrace(new Exception()), lock.getLocker(), lock + .getStackTrace(new Exception()), lock.getLocker(), lock .getRemainingTime()); } } @@ -2009,7 +2009,7 @@ public void saveTranslationSettings( catch (PSLockException e) { throw new PSLockErrorException(e.getErrorCode(), e.getMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } if (release) diff --git a/system/webservices/src/com/percussion/webservices/content/impl/PSContentWs.java b/system/webservices/src/com/percussion/webservices/content/impl/PSContentWs.java index 7a9469ca38..09737d57d3 100644 --- a/system/webservices/src/com/percussion/webservices/content/impl/PSContentWs.java +++ b/system/webservices/src/com/percussion/webservices/content/impl/PSContentWs.java @@ -136,8 +136,8 @@ import com.percussion.webservices.ui.PSUiWsLocator; import com.percussion.workflow.PSWorkFlowUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Component; @@ -159,8 +159,8 @@ import static com.percussion.cms.objectstore.PSProcessorProxy.RELATIONSHIP_COMPTYPE; import static com.percussion.webservices.PSWebserviceUtils.getRequest; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * The public content webservice implementations. @@ -352,7 +352,7 @@ public List createItems(String contentType, int count) return items; } catch (PSInvalidContentTypeException e) { throw new PSUnknownContentTypeException(e.getErrorCode(), e.getMessage(), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } catch (PSCmsException e) { // this should never happen throwUnexpectedError(e); @@ -394,7 +394,7 @@ public void deleteItems(List ids) throws PSErrorsException { PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSCoreItem.class.getName(), id.getUUID(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); errors.addError(id, error); } @@ -450,7 +450,7 @@ public String[] findItemPaths(IPSGuid id) throws PSErrorException { int code = IPSWebserviceErrors.FAILED_FIND_PATH_FROM_ID; PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, locator.getId(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); logger.error(PSExceptionUtils.getMessageForLog(e)); logger.debug(PSExceptionUtils.getDebugMessageForLog(e)); @@ -475,7 +475,7 @@ public List findItems(List ids, boolean loadOperations) throw new PSErrorException(IPSWebserviceErrors.LOAD_OBJECTS_ERROR, PSWebserviceErrors .createErrorMessage(IPSWebserviceErrors.LOAD_OBJECTS_ERROR, e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } PSComponentSummaries cs = new PSComponentSummaries(); for (PSComponentSummary c : components) { @@ -508,7 +508,7 @@ public List findItemIdsByFolder(String folderPath) throws PSErrorExcept int code = IPSWebserviceErrors.UNEXPECTED_ERROR; PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); logger.error(PSExceptionUtils.getMessageForLog(e)); logger.debug(PSExceptionUtils.getDebugMessageForLog(e)); @@ -830,7 +830,7 @@ public List newCopies(List ids, List paths, String int code = IPSWebserviceErrors.NEWCOPY_FAILED; PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, id.getUUID(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -920,7 +920,7 @@ public List newPromotableVersions(List ids, List pa int code = IPSWebserviceErrors.NEWPROMOTABLEVERSION_FAILED; PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, id.getUUID(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -1068,7 +1068,7 @@ private void addToErrorResults(final Exception e, final PSLegacyGuid id, final i final PSErrorResultsException errorResults) { final PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, id.getUUID(), - PSExceptionUtils.getMessageForLog(e)), ExceptionUtils.getFullStackTrace(e)); + PSExceptionUtils.getMessageForLog(e)), ExceptionUtils.getStackTrace(e)); errorResults.addError(id, error); } @@ -1148,7 +1148,7 @@ private void insureNoTranslations(final List summaries, int code = IPSWebserviceErrors.NEWTRANSLATION_FAILED; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, id.getUUID(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } if (owners != null && !owners.isEmpty()) { throw new IllegalArgumentException("Item " + id.toString() + "(" + id.longValue() @@ -1311,7 +1311,7 @@ private void transitionItemIfNeeded(PSItemStatus itemStatus, PSComponentSummary PSWebserviceErrors.createErrorMessage( IPSWebserviceErrors.CANNOT_FIND_WORKFLOW_STATE_ID, stateId, wf.getGUID().longValue(), wf.getName()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } logger.debug("workflowId={}, stateId={}, isPublishable={}", stateId, @@ -1356,7 +1356,7 @@ private PSTransition getTransitionToQuickEdit(PSState pubState, PSWorkflow wf) PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.CANNOT_FIND_TRANS_TO_QE_STATE, pubState.getStateId(), pubState.getName(), wf.getGUID().longValue(), wf.getName()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } @@ -1424,7 +1424,7 @@ private void checkInOutItem(int id, int revision, boolean isCheckout, String com errorCode = IPSWebserviceErrors.FAILED_CHECK_IN_ITEM; String message = PSWebserviceErrors.createErrorMessage(errorCode, id, PSExceptionUtils.getMessageForLog(e)); - String stack = ExceptionUtils.getFullStackTrace(e); + String stack = ExceptionUtils.getStackTrace(e); throw new PSErrorException(errorCode, message, stack, e); } finally { req.setParameters(oldParams); @@ -1474,7 +1474,7 @@ public void promoteRevisions(List ids) throws PSErrorsException { results.addError(id, new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, guid.longValue(), method), - ExceptionUtils.getFullStackTrace(new Exception()))); + ExceptionUtils.getStackTrace(new Exception()))); } // ensure non-public @@ -1486,7 +1486,7 @@ public void promoteRevisions(List ids) throws PSErrorsException { new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, guid.longValue(), wf.getName(), currState.getName()), - ExceptionUtils.getFullStackTrace(new Exception()))); + ExceptionUtils.getStackTrace(new Exception()))); } // checkout the revision @@ -1583,7 +1583,7 @@ private boolean validateItemState(PSComponentSummary item, PSItemStatus itemStat PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.CURR_STATE_NOT_MATCH, currState.getStateId(), currState.getName(), toState.getStateId(), toState.getName()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } /** @@ -1621,7 +1621,7 @@ private PSTransition getTransition(PSState fromState, PSState toState, PSWorkflo IPSWebserviceErrors.CANNOT_FIND_TRANS_4_STATE_2_STATE, fromState.getStateId(), fromState.getName(), toState.getStateId(), toState.getName(), wf.getGUID().longValue(), wf.getName()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } @Deprecated @@ -1910,7 +1910,7 @@ else if (guid.getRevision() == -1) : IPSWebserviceErrors.FAILED_LOAD_ITEM; PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, id.getUUID(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -2377,7 +2377,7 @@ private void ensureCheckedOut(PSServerItem parent, String operation) int code = IPSWebserviceErrors.ITEM_NOT_CHECKED_OUT; throw new PSInvalidStateException(code, PSWebserviceErrors.createErrorMessage(code, parent.getContentId(), operation), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } } @@ -2393,7 +2393,7 @@ private PSErrorException handleLoadFailed(IPSGuid id, Exception e) { PSDesignGuid dguid = new PSDesignGuid(id); return new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSTypeEnum.valueOf(id.getType()), dguid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } /** @@ -2408,7 +2408,7 @@ private PSErrorException handleItemSaveFailedError(IPSGuid id, Exception e) { PSDesignGuid dguid = new PSDesignGuid(id); return new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSTypeEnum.valueOf(id.getType()), dguid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } /** @@ -2467,7 +2467,7 @@ private PSErrorException handleChildError(int code, IPSGuid guid, String name, I PSDesignGuid parentGuid = new PSDesignGuid(id); return new PSUnknownChildException(code, PSWebserviceErrors.createErrorMessage(code, childGuid.getValue(), name, parentGuid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } /** @@ -2482,7 +2482,7 @@ private void handleMissingChildType(String child) throws PSUnknownChildException throw new PSUnknownChildException( code, PSWebserviceErrors.createErrorMessage(code, PSTypeEnum.LEGACY_CHILD_CONTENT_TYPE.name(), child), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } @@ -2796,7 +2796,7 @@ public List findDependents(IPSGuid id, PSRelationshipFilter filte throw new PSErrorException(IPSWebserviceErrors.FAILED_FIND_CHILD_ITEMS, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_FIND_CHILD_ITEMS, id.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -2862,7 +2862,7 @@ public List findOwners(IPSGuid id, PSRelationshipFilter filter, throw new PSErrorException(IPSWebserviceErrors.FAILED_FIND_PARENT_ITEMS, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_FIND_PARENT_ITEMS, id.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -2975,7 +2975,7 @@ private String loadFolderPath(PSLegacyGuid folderId) throws PSErrorException { throw new PSErrorException(IPSWebserviceErrors.NO_FOLDER_PATH_FOR_FOLDERID, PSWebserviceErrors.createErrorMessage( IPSWebserviceErrors.NO_FOLDER_PATH_FOR_FOLDERID, folderId.getContentId()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } return paths[0]; } catch (PSCmsException | PSNotFoundException e) { @@ -2983,7 +2983,7 @@ private String loadFolderPath(PSLegacyGuid folderId) throws PSErrorException { throw new PSErrorException(IPSWebserviceErrors.FAILED_LOAD_FOLDER_PATH, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_LOAD_FOLDER_PATH, folderId.toString(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3087,7 +3087,7 @@ private IPSSite loadSite(IPSGuid siteId) throws PSErrorException { throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND, IPSSite.class.getName(), guid.longValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3259,14 +3259,14 @@ private PSAaRelationship getAaRelationshipById(IPSGuid rid) throws PSErrorExcept throw new PSErrorException(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.OBJECT_NOT_FOUND, PSRelationship.class.getName(), rid.longValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } return new PSAaRelationship(rels.get(0)); } catch (PSCmsException e) { throw new PSErrorException(IPSWebserviceErrors.FAILED_LOAD_RELATIONSHIP, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_LOAD_RELATIONSHIP, rid.longValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3365,7 +3365,7 @@ private PSFolder addFolder(String name, int parentId, int srcId, boolean loadTra int code = IPSWebserviceErrors.FAILED_LOAD_FOLDER; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, ids.get(0).toString(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } PSFolder folder = (PSFolder) folders.get(0).clone(); folder.setName(name); @@ -3427,7 +3427,7 @@ private void createFolderRelationship(PSFolder child, PSLocator parent) throws P throw new PSErrorException(IPSWebserviceErrors.FAILED_SAVE_RELATIONSHIPS, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_SAVE_RELATIONSHIPS, PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3451,7 +3451,7 @@ public void addFolderChildren(IPSGuid parentId, List childIds) throws P PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_ADD_FOLDER_CHILDREN, childIds.toString(), parentId.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3590,7 +3590,7 @@ public void deleteFolders(List ids, boolean purgeItems, boolean checkFo PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSFolder.class.getName(), id.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); errors.addError(id, error); } } @@ -3641,7 +3641,7 @@ public List findFolderChildren(IPSGuid id, boolean isLoadOperatio PSWebserviceErrors.createErrorMessage( IPSWebserviceErrors.FAILED_FIND_FOLDER_CHILDREN, id.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3659,7 +3659,7 @@ public List findChildFolders(IPSGuid id) throws PSErrorException PSWebserviceErrors.createErrorMessage( IPSWebserviceErrors.FAILED_FIND_FOLDER_CHILDREN, id.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3717,7 +3717,7 @@ public String[] findFolderPaths(IPSGuid id) throws PSErrorException { throw new PSErrorException(IPSWebserviceErrors.FAILED_FIND_PATH_FROM_ID, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_FIND_PATH_FROM_ID, locator.getId(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3732,7 +3732,7 @@ public String[] findFolderPaths(IPSGuid id, String relationshipTypeName) throw new PSErrorException(IPSWebserviceErrors.FAILED_FIND_PATH_FROM_ID, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_FIND_PATH_FROM_ID, locator.getId(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3791,7 +3791,7 @@ public PSFolder loadFolder(IPSGuid id, boolean loadTransientData) throws PSError throw new PSErrorException(IPSWebserviceErrors.FAILED_LOAD_FOLDER, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_LOAD_FOLDER, id.toString(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3910,7 +3910,7 @@ private void setFolderTransientData(PSFolder folder) throws PSErrorException { PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.LOAD_FAILED, PSCommunity.class.getName(), id.longValue(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -3929,7 +3929,7 @@ private void setFolderTransientData(PSFolder folder) throws PSErrorException { throw new PSErrorException(IPSWebserviceErrors.LOAD_FAILED, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.LOAD_FAILED, PSDisplayFormat.class.getName(), id.longValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } } @@ -3974,7 +3974,7 @@ public List loadFolders(String[] paths) int code = IPSWebserviceErrors.FAILED_LOAD_FOLDER; PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, id.toString(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } catch (PSErrorException e) { @@ -4024,14 +4024,14 @@ private int getFolderIdFromPath(String path, boolean isRequired, String relation if (id == -1 && isRequired) { throw new PSErrorException(IPSWebserviceErrors.PATH_NOT_EXIST, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.PATH_NOT_EXIST, path), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } return id; } catch (PSCmsException e) { throw new PSErrorException(IPSWebserviceErrors.FAILED_FIND_ID_FROM_PATH, PSWebserviceErrors.createErrorMessage(IPSWebserviceErrors.FAILED_FIND_ID_FROM_PATH, path, PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -4233,7 +4233,7 @@ public void removeFolderChildren(IPSGuid parentId, List childIds, boole int errorCode = IPSWebserviceErrors.FAILED_DELETE_RELATIONSHIPS; PSErrorException error = new PSErrorException(errorCode, PSWebserviceErrors.createErrorMessage(errorCode, e1.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e1)); + ExceptionUtils.getStackTrace(e1)); results.addError(id, error); } catch (PSException | PSValidationException e) // failed to delete item { @@ -4242,7 +4242,7 @@ public void removeFolderChildren(IPSGuid parentId, List childIds, boole new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, "Item", id.toString(), PSExceptionUtils.getMessageForLog(e)), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -4300,7 +4300,7 @@ private List getChildSummaries(IPSGuid parentId, List getChildSummaries(IPSGuid parentId, List loadCommunities(List ids, boolean lock, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSCommunity.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } @@ -337,7 +337,7 @@ public void saveCommunities(List communities, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSCommunity.class.getName(), message), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); PSErrorsException ex = new PSErrorsException(); for (PSCommunity community : communities) @@ -351,7 +351,7 @@ public void saveCommunities(List communities, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSCommunity.class.getName(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); PSErrorsException ex = new PSErrorsException(); for (PSCommunity community : communities) @@ -396,7 +396,7 @@ public void saveCommunities(List communities, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSCommunity.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } else @@ -407,7 +407,7 @@ public void saveCommunities(List communities, boolean release, PSWebserviceErrors.createErrorMessage(code, PSCommunity.class.getName(), guid.getValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -420,7 +420,7 @@ public void saveCommunities(List communities, boolean release, PSWebserviceErrors.createErrorMessage(code, PSCommunity.class.getName(), guid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -797,7 +797,7 @@ private List getDesignObjectSummaries(PSTypeEnum type) throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, objectType.toString()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); } } diff --git a/system/webservices/src/com/percussion/webservices/security/impl/PSSecurityWs.java b/system/webservices/src/com/percussion/webservices/security/impl/PSSecurityWs.java index c314dd728e..37dd1d80d3 100644 --- a/system/webservices/src/com/percussion/webservices/security/impl/PSSecurityWs.java +++ b/system/webservices/src/com/percussion/webservices/security/impl/PSSecurityWs.java @@ -48,7 +48,7 @@ import com.percussion.webservices.security.IPSSecurityWs; import com.percussion.webservices.system.IPSSystemWs; import com.percussion.webservices.system.PSSystemWsLocator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/system/webservices/src/com/percussion/webservices/securitydesign/SecurityDesignSOAPImpl.java b/system/webservices/src/com/percussion/webservices/securitydesign/SecurityDesignSOAPImpl.java index 3dee6c2df0..0cf9b510a1 100644 --- a/system/webservices/src/com/percussion/webservices/securitydesign/SecurityDesignSOAPImpl.java +++ b/system/webservices/src/com/percussion/webservices/securitydesign/SecurityDesignSOAPImpl.java @@ -36,7 +36,7 @@ import com.percussion.webservices.security.PSSecurityWsLocator; import com.percussion.webservices.security.data.PSCommunity; import com.percussion.webservices.security.data.PSCommunityVisibility; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.rmi.RemoteException; import java.util.Arrays; @@ -76,7 +76,7 @@ public PSCommunity[] createCommunities(String[] names) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (RuntimeException e) { @@ -118,7 +118,7 @@ public void deleteCommunities( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -161,7 +161,7 @@ public PSObjectSummary[] findCommunities( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } @@ -190,7 +190,7 @@ public PSObjectSummary[] findRoles(FindRolesRequest findRolesRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } @@ -230,7 +230,7 @@ public PSCommunity[] loadCommunities( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (RuntimeException e) { @@ -280,7 +280,7 @@ public void saveCommunities( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -321,7 +321,7 @@ public IsValidRhythmyxUserResponse isValidRhythmyxUser( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSSecurityCatalogException e) { @@ -369,7 +369,7 @@ public PSCommunityVisibility[] getVisibilityByCommunity( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorResultsException e) { diff --git a/system/webservices/src/com/percussion/webservices/system/SystemSOAPImpl.java b/system/webservices/src/com/percussion/webservices/system/SystemSOAPImpl.java index 52677e03d9..eb3ae83325 100644 --- a/system/webservices/src/com/percussion/webservices/system/SystemSOAPImpl.java +++ b/system/webservices/src/com/percussion/webservices/system/SystemSOAPImpl.java @@ -41,8 +41,8 @@ import com.percussion.webservices.faults.PSUnknownRelationshipTypeFault; import com.percussion.webservices.faults.PSUseSpecificMethodsFault; import com.percussion.webservices.faults.PSUserNotMemberOfCommunityFault; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.rmi.RemoteException; import java.util.Calendar; @@ -484,12 +484,12 @@ public void switchCommunity(SwitchCommunityRequest switchCommunityRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSUserNotMemberOfCommunityException e) { throw new PSUserNotMemberOfCommunityFault(e.getCode(), - e.getErrorMessage(), ExceptionUtils.getFullStackTrace(e)); + e.getErrorMessage(), ExceptionUtils.getStackTrace(e)); } } @@ -515,12 +515,12 @@ public void switchLocale(SwitchLocaleRequest switchLocaleRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSInvalidLocaleException e) { throw new PSInvalidLocaleFault(e.getCode(), - e.getErrorMessage(), ExceptionUtils.getFullStackTrace(e)); + e.getErrorMessage(), ExceptionUtils.getStackTrace(e)); } } @@ -597,7 +597,7 @@ public GetAllowedTransitionsResponse getAllowedTransitions(long[] ids) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } } diff --git a/system/webservices/src/com/percussion/webservices/system/impl/PSSystemDesignWs.java b/system/webservices/src/com/percussion/webservices/system/impl/PSSystemDesignWs.java index 84253b278a..3d4b32eda9 100644 --- a/system/webservices/src/com/percussion/webservices/system/impl/PSSystemDesignWs.java +++ b/system/webservices/src/com/percussion/webservices/system/impl/PSSystemDesignWs.java @@ -68,8 +68,8 @@ import com.percussion.webservices.system.IPSSystemDesignWs; import com.percussion.webservices.system.IPSSystemWs; import com.percussion.webservices.system.PSSystemWsLocator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.transaction.annotation.Transactional; import java.io.FileNotFoundException; @@ -193,7 +193,7 @@ public void createLocks(List ids, boolean overrideLock, int code = IPSWebserviceErrors.CREATE_EXTEND_LOCK_FAILED; PSLockErrorException error = new PSLockErrorException(code, PSWebserviceErrors.createErrorMessage(code, id.longValue(), e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e), + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e), e.getLocker(), e.getRemainigTime()); results.addError(id, error); @@ -302,7 +302,7 @@ public void deleteAcls(List ids, boolean ignoreDependencies, PSWebserviceErrors.createErrorMessage(code, PSAclImpl.class.getName(), guid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -537,7 +537,7 @@ public void extendLocks(List ids, String session, String user) int code = IPSWebserviceErrors.CREATE_EXTEND_LOCK_FAILED; PSLockErrorException error = new PSLockErrorException(code, PSWebserviceErrors.createErrorMessage(code, id.longValue(), e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e), + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e), e.getLocker(), e.getRemainigTime()); errors.addError(id, error); @@ -793,7 +793,7 @@ public PSMimeContentAdapter loadConfiguration(String name, boolean lock, catch (PSLockException e) { throw new PSLockErrorException(e.getErrorCode(), e.getMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } } @@ -835,7 +835,7 @@ public List loadItemFilters(List ids, boolean lock, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSItemFilter.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -911,7 +911,7 @@ public List loadRelationshipTypes(List ids, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSRelationshipConfig.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -981,7 +981,7 @@ public List loadSharedProperties(String[] names, PSWebserviceErrors.createErrorMessage(code, property .getClass().getName(), id.longValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e), e.getLocker(), e.getRemainigTime()); + .getStackTrace(e), e.getLocker(), e.getRemainigTime()); errors.addError(id, error); } } @@ -1065,7 +1065,7 @@ public List saveAcls(List acls, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, className, guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); errors.put(id, error); } else @@ -1076,7 +1076,7 @@ public List saveAcls(List acls, PSWebserviceErrors.createErrorMessage(code, className, guid.getValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); errors.put(id, error); } } @@ -1096,7 +1096,7 @@ public List saveAcls(List acls, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, className, guid.getValue()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); for (PSAclImpl acl : acls) { IPSGuid id = acl.getGUID(); @@ -1217,7 +1217,7 @@ public void saveConfiguration(PSMimeContentAdapter configuration, catch (PSLockException e) { throw new PSLockErrorException(e.getErrorCode(), e.getMessage(), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } if (release) @@ -1286,7 +1286,7 @@ public void saveItemFilters(List filters, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSItemFilter.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } else @@ -1297,7 +1297,7 @@ public void saveItemFilters(List filters, boolean release, PSWebserviceErrors.createErrorMessage(code, PSItemFilter.class.getName(), guid.getValue(), lock .getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -1309,7 +1309,7 @@ public void saveItemFilters(List filters, boolean release, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSItemFilter.class .getName(), guid.getValue()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } } @@ -1452,7 +1452,7 @@ public void saveSharedProperties(List properties, PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSSharedProperty.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } else @@ -1463,7 +1463,7 @@ public void saveSharedProperties(List properties, PSWebserviceErrors.createErrorMessage(code, PSSharedProperty.class.getName(), guid.getValue(), lock .getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -1476,7 +1476,7 @@ public void saveSharedProperties(List properties, PSWebserviceErrors.createErrorMessage(code, PSSharedProperty.class.getName(), guid.getValue(), e .getLocalizedMessage()), ExceptionUtils - .getFullStackTrace(e)); + .getStackTrace(e)); results.addError(id, error); } diff --git a/system/webservices/src/com/percussion/webservices/system/impl/PSSystemWs.java b/system/webservices/src/com/percussion/webservices/system/impl/PSSystemWs.java index 32bac6c2c5..1422356270 100644 --- a/system/webservices/src/com/percussion/webservices/system/impl/PSSystemWs.java +++ b/system/webservices/src/com/percussion/webservices/system/impl/PSSystemWs.java @@ -65,8 +65,8 @@ import com.percussion.workflow.PSEntryNotFoundException; import com.percussion.workflow.PSTransitionInfo; import com.percussion.workflow.PSWorkFlowUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @@ -332,7 +332,7 @@ public void switchCommunity(String name) int code = IPSWebserviceErrors.USER_NOT_MEMBER_COMMUNITY; throw new PSUserNotMemberOfCommunityException(code, PSWebserviceErrors.createErrorMessage(code, name), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); } throw new RuntimeException("Failed to switch community: " @@ -386,7 +386,7 @@ public void switchLocale(String code) throws PSInvalidLocaleException int errcode = IPSWebserviceErrors.INVALID_LOCALE; throw new PSInvalidLocaleException(errcode, PSWebserviceErrors .createErrorMessage(errcode, code)+msgSfx.toString(), ExceptionUtils - .getFullStackTrace(new Exception())); + .getStackTrace(new Exception())); } PSRequest psReq = (PSRequest) PSRequestInfo diff --git a/system/webservices/src/com/percussion/webservices/systemdesign/SystemDesignSOAPImpl.java b/system/webservices/src/com/percussion/webservices/systemdesign/SystemDesignSOAPImpl.java index 61d334dc14..068a28f9e5 100644 --- a/system/webservices/src/com/percussion/webservices/systemdesign/SystemDesignSOAPImpl.java +++ b/system/webservices/src/com/percussion/webservices/systemdesign/SystemDesignSOAPImpl.java @@ -49,7 +49,7 @@ import com.percussion.webservices.system.PSSharedProperty; import com.percussion.webservices.system.PSSystemWsLocator; import com.percussion.webservices.system.RelationshipCategory; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.io.FileNotFoundException; import java.io.IOException; @@ -317,7 +317,7 @@ public void deleteSharedProperties( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -365,7 +365,7 @@ public void extendLocks(long[] extendLockRequest) throws RemoteException int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -412,7 +412,7 @@ public PSDependency[] findDependencies(long[] findDependenciesRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, "findDependencies", - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } @@ -669,7 +669,7 @@ public PSSharedProperty[] loadSharedProperties( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, "loadSharedProperties", - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (RuntimeException e) { @@ -720,7 +720,7 @@ public void releaseLocks(long[] releaseLockRequest) throws RemoteException int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } @@ -782,7 +782,7 @@ public void createLocks(CreateLocksRequest createLocksRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors .createErrorMessage(code, serviceName, e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -834,7 +834,7 @@ public PSObjectSummary[] isLocked(long[] isLockedRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorResultsException e) { @@ -1049,7 +1049,7 @@ public void saveSharedProperties( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -1099,7 +1099,7 @@ public long[] createGuids(CreateGuidsRequest createGuidsRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } } @@ -1127,7 +1127,7 @@ public PSItemFilter[] createItemFilters(String[] createItemFiltersRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (RuntimeException e) { @@ -1165,7 +1165,7 @@ public void deleteItemFilters( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { @@ -1229,7 +1229,7 @@ public PSItemFilter[] loadItemFilters( int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (RuntimeException e) { @@ -1275,7 +1275,7 @@ public void saveItemFilters(SaveItemFiltersRequest saveItemFiltersRequest) int code = IPSWebserviceErrors.INVALID_CONTRACT; throw new PSContractViolationFault(code, PSWebserviceErrors.createErrorMessage(code, serviceName, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); } catch (PSErrorsException e) { diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverter.java index 5cb1b88ed4..6ca71f549a 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSAssemblyTemplateConverter.java @@ -31,7 +31,7 @@ import com.percussion.webservices.transformation.impl.PSTransformerFactory; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSFieldConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSFieldConverter.java index 83215cdc7c..875a0b1986 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSFieldConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSFieldConverter.java @@ -22,7 +22,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSFolderConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSFolderConverter.java index 7c39f8e3d0..3ea96798c4 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSFolderConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSFolderConverter.java @@ -36,7 +36,7 @@ import java.util.List; import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSGlobalTemplateUsageConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSGlobalTemplateUsageConverter.java index 74a54764ec..586f32a237 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSGlobalTemplateUsageConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSGlobalTemplateUsageConverter.java @@ -20,7 +20,7 @@ import com.percussion.webservices.assembly.data.TemplateUsageType; import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverter.java index 0417038d81..65edab16b1 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverter.java @@ -31,7 +31,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverterUtils.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverterUtils.java index 218e09a514..c5da1c456e 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverterUtils.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSItemConverterUtils.java @@ -56,7 +56,7 @@ import com.percussion.webservices.content.PSItemSlots; import com.percussion.webservices.content.PSRelatedItem; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSOutputFormatConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSOutputFormatConverter.java index 13563c64f5..3137092462 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSOutputFormatConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSOutputFormatConverter.java @@ -20,7 +20,7 @@ import com.percussion.webservices.assembly.data.OutputFormatType; import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSPublishWhenConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSPublishWhenConverter.java index 09ec4dc971..e15a39ef01 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSPublishWhenConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSPublishWhenConverter.java @@ -20,7 +20,7 @@ import com.percussion.webservices.assembly.data.PublishType; import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSRelatedItemActionConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSRelatedItemActionConverter.java index 71d6c23fa4..3e123d117d 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSRelatedItemActionConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSRelatedItemActionConverter.java @@ -20,7 +20,7 @@ import com.percussion.webservices.content.PSRelatedItemAction; import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchFieldConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchFieldConverter.java index 30818f7f13..d1f1868dcd 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchFieldConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchFieldConverter.java @@ -22,7 +22,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchParamsConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchParamsConverter.java index 882dcdf20f..391eb3a0e7 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchParamsConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchParamsConverter.java @@ -36,7 +36,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchViewConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchViewConverter.java index 44582941a9..409aeee572 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchViewConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSSearchViewConverter.java @@ -39,7 +39,7 @@ import com.percussion.webservices.ui.data.SearchViewParentCategory; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/system/webservices/src/com/percussion/webservices/transformation/converter/PSTemplateTypeConverter.java b/system/webservices/src/com/percussion/webservices/transformation/converter/PSTemplateTypeConverter.java index 4ad4ce8dc0..dcb6656655 100644 --- a/system/webservices/src/com/percussion/webservices/transformation/converter/PSTemplateTypeConverter.java +++ b/system/webservices/src/com/percussion/webservices/transformation/converter/PSTemplateTypeConverter.java @@ -20,7 +20,7 @@ import com.percussion.webservices.assembly.data.TemplateType; import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Converts objects between the classes diff --git a/system/webservices/src/com/percussion/webservices/ui/impl/PSUiBaseWs.java b/system/webservices/src/com/percussion/webservices/ui/impl/PSUiBaseWs.java index d5597023d8..228378e2de 100644 --- a/system/webservices/src/com/percussion/webservices/ui/impl/PSUiBaseWs.java +++ b/system/webservices/src/com/percussion/webservices/ui/impl/PSUiBaseWs.java @@ -31,8 +31,8 @@ import com.percussion.webservices.PSErrorException; import com.percussion.webservices.PSWebserviceErrors; import com.percussion.xml.PSXmlDocumentBuilder; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.SessionFactory; @@ -165,7 +165,7 @@ protected List findComponentsByNameLabel(String name, int code = IPSWebserviceErrors.FIND_FAILED; PSErrorException error = new PSErrorException(code, PSWebserviceErrors .createErrorMessage(code, PSAction.class.getName(), name, label, e - .getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + .getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); throw error; } } diff --git a/system/webservices/src/com/percussion/webservices/ui/impl/PSUiDesignWs.java b/system/webservices/src/com/percussion/webservices/ui/impl/PSUiDesignWs.java index db5dc9072f..126bf2e544 100644 --- a/system/webservices/src/com/percussion/webservices/ui/impl/PSUiDesignWs.java +++ b/system/webservices/src/com/percussion/webservices/ui/impl/PSUiDesignWs.java @@ -60,8 +60,8 @@ import com.percussion.webservices.PSWebserviceUtils; import com.percussion.webservices.ui.IPSUiDesignWs; import com.percussion.webservices.ui.data.ActionType; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.transaction.annotation.Transactional; @@ -76,7 +76,7 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.commons.lang.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notEmpty; /** * The private ui design webservice implementations. @@ -766,7 +766,7 @@ public List idsToPaths(List ids) throws PSErrorResultsException int code = IPSWebserviceErrors.OBJECT_NOT_FOUND; PSDesignGuid guid = new PSDesignGuid(id); PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, - PSHierarchyNode.class.getName(), guid.getValue()), ExceptionUtils.getFullStackTrace(e)); + PSHierarchyNode.class.getName(), guid.getValue()), ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -908,7 +908,7 @@ public List loadHierachyNodes(List ids, boolean lock, int code = IPSWebserviceErrors.OBJECT_NOT_FOUND; PSDesignGuid guid = new PSDesignGuid(id); PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, - PSHierarchyNode.class.getName(), guid.getValue()), ExceptionUtils.getFullStackTrace(e)); + PSHierarchyNode.class.getName(), guid.getValue()), ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -1098,7 +1098,7 @@ public void saveHierarchyNodes(List nodes, boolean release, Str PSDesignGuid guid = new PSDesignGuid(id); PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSHierarchyNode.class.getName(), guid.getValue()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } else @@ -1107,7 +1107,7 @@ public void saveHierarchyNodes(List nodes, boolean release, Str PSDesignGuid guid = new PSDesignGuid(id); PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSHierarchyNode.class.getName(), guid.getValue(), lock.getLocker(), lock.getRemainingTime()), - ExceptionUtils.getFullStackTrace(new Exception())); + ExceptionUtils.getStackTrace(new Exception())); results.addError(id, error); } } @@ -1118,7 +1118,7 @@ public void saveHierarchyNodes(List nodes, boolean release, Str PSDesignGuid guid = new PSDesignGuid(id); PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, PSHierarchyNode.class.getName(), guid.getValue(), e.getLocalizedMessage()), - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); results.addError(id, error); } } @@ -1241,7 +1241,7 @@ public String objectIdToPath(IPSGuid guid) throws PSErrorsException { int code = IPSWebserviceErrors.FAILED_TO_OBTAIN_PATH_FROM_OBJECT_ID; PSErrorException error = new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, - e.getLocalizedMessage()), ExceptionUtils.getFullStackTrace(e)); + e.getLocalizedMessage()), ExceptionUtils.getStackTrace(e)); results.addError(id, error); } @@ -1848,7 +1848,7 @@ private IPSDbComponent loadComponent(PSKey key, String componentType, IPSGuid id { int code = IPSWebserviceErrors.OBJECT_NOT_FOUND; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, - objClass.getName(), guid.longValue()), ExceptionUtils.getFullStackTrace(new Exception())); + objClass.getName(), guid.longValue()), ExceptionUtils.getStackTrace(new Exception())); } @@ -1858,7 +1858,7 @@ private IPSDbComponent loadComponent(PSKey key, String componentType, IPSGuid id { int code = IPSWebserviceErrors.LOAD_FAILED; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, - objClass.getName(), guid.longValue()), ExceptionUtils.getFullStackTrace(e)); + objClass.getName(), guid.longValue()), ExceptionUtils.getStackTrace(e)); } } @@ -1968,7 +1968,7 @@ private List getHierarchyNodeTree(String path) throws PSErrorEx int code = IPSWebserviceErrors.MISSING_HIERARCHY_NODE_FOR_PARENT; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, name, - parent), ExceptionUtils.getFullStackTrace(new Exception())); + parent), ExceptionUtils.getStackTrace(new Exception())); } if (nodes.size() > 1) @@ -1979,7 +1979,7 @@ private List getHierarchyNodeTree(String path) throws PSErrorEx int code = IPSWebserviceErrors.DUPLICATE_HIERARCHY_NODE_FOR_PARENT; throw new PSErrorException(code, PSWebserviceErrors.createErrorMessage(code, name, - parent), ExceptionUtils.getFullStackTrace(new Exception())); + parent), ExceptionUtils.getStackTrace(new Exception())); } PSHierarchyNode node = nodes.get(0); diff --git a/system/webservices/test/com/percussion/webservices/PSAssemblyTestBase.java b/system/webservices/test/com/percussion/webservices/PSAssemblyTestBase.java index 0d2e53a24b..c39d6c54f4 100644 --- a/system/webservices/test/com/percussion/webservices/PSAssemblyTestBase.java +++ b/system/webservices/test/com/percussion/webservices/PSAssemblyTestBase.java @@ -42,7 +42,7 @@ import junit.framework.AssertionFailedError; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/system/webservices/test/com/percussion/webservices/PSContentTestBase.java b/system/webservices/test/com/percussion/webservices/PSContentTestBase.java index e154e969e4..8751d163d5 100644 --- a/system/webservices/test/com/percussion/webservices/PSContentTestBase.java +++ b/system/webservices/test/com/percussion/webservices/PSContentTestBase.java @@ -72,7 +72,7 @@ import junit.framework.AssertionFailedError; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import static org.junit.Assert.assertEquals; diff --git a/system/webservices/test/com/percussion/webservices/PSSecurityTestBase.java b/system/webservices/test/com/percussion/webservices/PSSecurityTestBase.java index 018dfc3010..a2ead2ce13 100644 --- a/system/webservices/test/com/percussion/webservices/PSSecurityTestBase.java +++ b/system/webservices/test/com/percussion/webservices/PSSecurityTestBase.java @@ -35,7 +35,7 @@ import junit.framework.AssertionFailedError; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/system/webservices/test/com/percussion/webservices/PSSystemTestBase.java b/system/webservices/test/com/percussion/webservices/PSSystemTestBase.java index 088004cc45..9a68ed7ecc 100644 --- a/system/webservices/test/com/percussion/webservices/PSSystemTestBase.java +++ b/system/webservices/test/com/percussion/webservices/PSSystemTestBase.java @@ -58,7 +58,7 @@ import junit.framework.AssertionFailedError; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; diff --git a/system/webservices/test/com/percussion/webservices/PSTestBase.java b/system/webservices/test/com/percussion/webservices/PSTestBase.java index 7f6b2b1244..838cd9e055 100644 --- a/system/webservices/test/com/percussion/webservices/PSTestBase.java +++ b/system/webservices/test/com/percussion/webservices/PSTestBase.java @@ -60,7 +60,7 @@ import junit.framework.AssertionFailedError; import org.apache.axis.client.Call; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; diff --git a/system/webservices/test/com/percussion/webservices/PSTestUtils.java b/system/webservices/test/com/percussion/webservices/PSTestUtils.java index 69096cf3f9..f1cd21b98c 100644 --- a/system/webservices/test/com/percussion/webservices/PSTestUtils.java +++ b/system/webservices/test/com/percussion/webservices/PSTestUtils.java @@ -23,7 +23,7 @@ import com.percussion.webservices.systemdesign.SystemDesignSOAPStub; import org.apache.axis.client.Stub; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Utility methods used for web service testing. diff --git a/system/webservices/test/com/percussion/webservices/PSUiTestBase.java b/system/webservices/test/com/percussion/webservices/PSUiTestBase.java index 0440f44b05..31ad50068a 100644 --- a/system/webservices/test/com/percussion/webservices/PSUiTestBase.java +++ b/system/webservices/test/com/percussion/webservices/PSUiTestBase.java @@ -35,7 +35,7 @@ import junit.framework.AssertionFailedError; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; diff --git a/system/webservices/test/com/percussion/webservices/rhythmyx/ContentTestCase.java b/system/webservices/test/com/percussion/webservices/rhythmyx/ContentTestCase.java index fac5036829..c1d02204f7 100644 --- a/system/webservices/test/com/percussion/webservices/rhythmyx/ContentTestCase.java +++ b/system/webservices/test/com/percussion/webservices/rhythmyx/ContentTestCase.java @@ -132,8 +132,8 @@ import junit.framework.AssertionFailedError; import org.apache.axis.attachments.AttachmentPart; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/system/webservices/test/com/percussion/webservices/rhythmyx/SecurityTestCase.java b/system/webservices/test/com/percussion/webservices/rhythmyx/SecurityTestCase.java index 49c095a306..8d82640f5f 100644 --- a/system/webservices/test/com/percussion/webservices/rhythmyx/SecurityTestCase.java +++ b/system/webservices/test/com/percussion/webservices/rhythmyx/SecurityTestCase.java @@ -53,7 +53,7 @@ import junit.framework.AssertionFailedError; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/system/webservices/test/com/percussion/webservices/rhythmyx/SystemTestCase.java b/system/webservices/test/com/percussion/webservices/rhythmyx/SystemTestCase.java index fa4a57eeae..ba7986d32f 100644 --- a/system/webservices/test/com/percussion/webservices/rhythmyx/SystemTestCase.java +++ b/system/webservices/test/com/percussion/webservices/rhythmyx/SystemTestCase.java @@ -85,7 +85,7 @@ import junit.framework.AssertionFailedError; import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category;