From 7d987bf2d810813e317e62e888ab0d240210a91e Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Tue, 23 Jan 2018 08:07:30 -0600 Subject: [PATCH 1/6] #13482 --- dotCMS/build.gradle | 12 +- .../java/com/dotcms/osgi/OSGIConstants.java | 11 + .../com/dotcms/tika/TikaProxyService.java | 271 ++++++++++++++++++ .../com/dotcms/tika/TikaServiceBuilder.java | 20 ++ .../main/java/com/dotcms/tika/TikaUtils.java | 231 +++++++-------- .../fileassets/business/FileAssetAPIImpl.java | 3 +- .../java/com/dotmarketing/util/OSGIUtil.java | 65 +++++ 7 files changed, 495 insertions(+), 118 deletions(-) create mode 100644 dotCMS/src/main/java/com/dotcms/osgi/OSGIConstants.java create mode 100644 dotCMS/src/main/java/com/dotcms/tika/TikaProxyService.java create mode 100644 dotCMS/src/main/java/com/dotcms/tika/TikaServiceBuilder.java diff --git a/dotCMS/build.gradle b/dotCMS/build.gradle index ff82e9de84c5..1f391ba8f645 100644 --- a/dotCMS/build.gradle +++ b/dotCMS/build.gradle @@ -126,11 +126,21 @@ eclipse.project { dependencies { /***** Felix libs need to be placed in the WEB-INF/felix/bundle directory. This was previously handled using a pre-build copy task. *****/ - felix group: 'org.apache.felix', name: 'org.apache.felix.bundlerepository', version:'2.0.8' + felix (group: 'org.apache.felix', name: 'org.apache.felix.bundlerepository', version:'2.0.8') { + exclude(group: 'org.easymock') + } felix group: 'org.apache.felix', name: 'org.apache.felix.fileinstall', version:'3.5.8' felix group: 'org.apache.felix', name: 'org.apache.felix.gogo.command', version:'1.0.2' felix group: 'org.apache.felix', name: 'org.apache.felix.gogo.runtime', version:'1.0.2' felix group: 'org.apache.felix', name: 'org.apache.felix.gogo.shell', version:'1.0.0' + felix (group: 'org.apache.tika', name: 'tika-core', version: '1.17'){ + transitive = false + } + felix (group: 'org.apache.tika', name: 'tika-bundle', version: '1.17'){ + transitive = false + } + felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.24' + felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25' /**** And now the libs we pull in from internal company sources - libs stored in ./plugins, ./bin, ./libs, the starter site, etc. ****/ compile fileTree("src/main/plugins/com.dotcms.config/build/jar").include('plugin-com.dotcms.config.jar') diff --git a/dotCMS/src/main/java/com/dotcms/osgi/OSGIConstants.java b/dotCMS/src/main/java/com/dotcms/osgi/OSGIConstants.java new file mode 100644 index 000000000000..7a68aea67ed0 --- /dev/null +++ b/dotCMS/src/main/java/com/dotcms/osgi/OSGIConstants.java @@ -0,0 +1,11 @@ +package com.dotcms.osgi; + +/** + * @author Jonathan Gamba + * 1/22/18 + */ +public class OSGIConstants { + + public static final String BUNDLE_NAME_DOTCMS_TIKA = "com.dotcms.tika"; + +} \ No newline at end of file diff --git a/dotCMS/src/main/java/com/dotcms/tika/TikaProxyService.java b/dotCMS/src/main/java/com/dotcms/tika/TikaProxyService.java new file mode 100644 index 000000000000..c68a03f65f23 --- /dev/null +++ b/dotCMS/src/main/java/com/dotcms/tika/TikaProxyService.java @@ -0,0 +1,271 @@ +package com.dotcms.tika; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.Serializable; +import java.net.URL; +import java.nio.file.Path; + +/** + * Public interface that should be use to expose {@link org.apache.tika.Tika} services through OSGI + * + * @author Jonathan Gamba + * 1/16/18 + */ +public interface TikaProxyService extends Serializable { + + /** + * Get the value associated to a metadata name. If many values are assiociated + * to the specified name, then the first one is returned. + * + * @param name of the metadata. + * @return the value associated to the specified metadata name. + */ + public String metadataGetName(String name); + + /** + * Returns an array of the names contained in the metadata. + * + * @return Metadata names + */ + public String[] metadataNames(); + + /** + * Detects the media type of the given document. The type detection is + * based on the content of the given document stream and the name of the + * document. + *

+ * If the document stream supports the + * {@link InputStream#markSupported() mark feature}, then the stream is + * marked and reset to the original position before this method returns. + * Only a limited number of bytes are read from the stream. + *

+ * The given document stream is not closed by this method. + * + * @param stream the document stream + * @param name document name + * @return detected media type + * @throws IOException if the stream can not be read + * @since Apache Tika 0.9 + */ + public String detect(InputStream stream, String name) throws IOException; + + /** + * Detects the media type of the given document. The type detection is + * based on the content of the given document stream and any given + * document metadata. The document stream can be null, + * in which case only the given document metadata is used for type + * detection. + *

+ * If the document stream supports the + * {@link InputStream#markSupported() mark feature}, then the stream is + * marked and reset to the original position before this method returns. + * Only a limited number of bytes are read from the stream. + *

+ * The given document stream is not closed by this method. + *

+ * Unlike in the {@link #parse(InputStream, Metadata)} method, the + * given document metadata is not modified by this method. + * + * @param stream the document stream, or null + * @return detected media type + * @throws IOException if the stream can not be read + */ + public String detect(InputStream stream) throws IOException; + + /** + * Detects the media type of the given document. The type detection is + * based on the first few bytes of a document and the document name. + *

+ * For best results at least a few kilobytes of the document data + * are needed. See also the other detect() methods for better + * alternatives when you have more than just the document prefix + * available for type detection. + * + * @param prefix first few bytes of the document + * @param name document name + * @return detected media type + * @since Apache Tika 0.9 + */ + public String detect(byte[] prefix, String name); + + /** + * Detects the media type of the given document. The type detection is + * based on the first few bytes of a document. + *

+ * For best results at least a few kilobytes of the document data + * are needed. See also the other detect() methods for better + * alternatives when you have more than just the document prefix + * available for type detection. + * + * @param prefix first few bytes of the document + * @return detected media type + * @since Apache Tika 0.9 + */ + public String detect(byte[] prefix); + + /** + * Detects the media type of the given file. The type detection is + * based on the document content and a potential known file extension. + *

+ * Use the {@link #detect(String)} method when you want to detect the + * type of the document without actually accessing the file. + * + * @param file the file + * @return detected media type + * @throws IOException if the file can not be read + * @see #detect(Path) + */ + public String detect(File file) throws IOException; + + /** + * Detects the media type of the resource at the given URL. The type + * detection is based on the document content and a potential known + * file extension included in the URL. + *

+ * Use the {@link #detect(String)} method when you want to detect the + * type of the document without actually accessing the URL. + * + * @param url the URL of the resource + * @return detected media type + * @throws IOException if the resource can not be read + */ + public String detect(URL url) throws IOException; + + /** + * Detects the media type of a document with the given file name. + * The type detection is based on known file name extensions. + *

+ * The given name can also be a URL or a full file path. In such cases + * only the file name part of the string is used for type detection. + * + * @param name the file name of the document + * @return detected media type + */ + public String detect(String name); + + /** + * Parses the given document and returns the extracted text content. + * Input metadata like a file name or a content type hint can be passed + * in the given metadata instance. Metadata information extracted from + * the document is returned in that same metadata instance. + *

+ * The returned reader will be responsible for closing the given stream. + * The stream and any associated resources will be closed at or before + * the time when the {@link Reader#close()} method is called. + * + * @param stream the document to be parsed + * @return extracted text content + * @throws IOException if the document can not be read or parsed + */ + public Reader parse(InputStream stream) throws IOException; + + /** + * Parses the given file and returns the extracted text content. + *

+ * Metadata information extracted from the document is returned in + * the supplied metadata instance. + * + * @param file the file to be parsed + * @return extracted text content + * @throws IOException if the file can not be read or parsed + * @see #parse(Path) + */ + public Reader parse(File file) throws IOException; + + /** + * Parses the resource at the given URL and returns the extracted + * text content. + * + * @param url the URL of the resource to be parsed + * @return extracted text content + * @throws IOException if the resource can not be read or parsed + */ + public Reader parse(URL url) throws IOException; + + /** + * Parses the given document and returns the extracted text content. + * The given input stream is closed by this method. + *

+ * To avoid unpredictable excess memory use, the returned string contains + * only up to {@link #getMaxStringLength()} first characters extracted + * from the input document. Use the {@link #setMaxStringLength(int)} + * method to adjust this limitation. + *

+ * NOTE: Unlike most other Tika methods that take an + * {@link InputStream}, this method will close the given stream for + * you as a convenience. With other methods you are still responsible + * for closing the stream or a wrapper instance returned by Tika. + * + * @param stream the document to be parsed + * @return extracted text content + * @throws IOException if the document can not be read + */ + public String parseToString(InputStream stream) throws Exception; + + /** + * Parses the given file and returns the extracted text content. + *

+ * To avoid unpredictable excess memory use, the returned string contains + * only up to {@link #getMaxStringLength()} first characters extracted + * from the input document. Use the {@link #setMaxStringLength(int)} + * method to adjust this limitation. + * + * @param file the file to be parsed + * @return extracted text content + * @throws IOException if the file can not be read + * @see #parseToString(Path) + */ + public String parseToString(File file) throws Exception; + + /** + * Parses the resource at the given URL and returns the extracted + * text content. + *

+ * To avoid unpredictable excess memory use, the returned string contains + * only up to {@link #getMaxStringLength()} first characters extracted + * from the input document. Use the {@link #setMaxStringLength(int)} + * method to adjust this limitation. + * + * @param url the URL of the resource to be parsed + * @return extracted text content + * @throws IOException if the resource can not be read + */ + public String parseToString(URL url) throws Exception; + + /** + * Returns the maximum length of strings returned by the + * parseToString methods. + * + * @return maximum string length, or -1 if the limit has been disabled + * @since Apache Tika 0.7 + */ + public int getMaxStringLength(); + + /** + * Sets the maximum length of strings returned by the parseToString + * methods. + * + * @param maxStringLength maximum string length, + * or -1 to disable this limit + * @since Apache Tika 0.7 + */ + public void setMaxStringLength(int maxStringLength); + + /** + * Creates a TikaInputStream from the file at the given path. + *

+ * Note that you must always explicitly close the returned stream to + * prevent leaking open file handles. + * + * @param binFile input file + * @return a TikaInputStream instance + * @throws IOException if an I/O error occurs + */ + public InputStream tikaInputStreamGet(File binFile) throws IOException; + + public String toString(); + +} \ No newline at end of file diff --git a/dotCMS/src/main/java/com/dotcms/tika/TikaServiceBuilder.java b/dotCMS/src/main/java/com/dotcms/tika/TikaServiceBuilder.java new file mode 100644 index 000000000000..6e294514306b --- /dev/null +++ b/dotCMS/src/main/java/com/dotcms/tika/TikaServiceBuilder.java @@ -0,0 +1,20 @@ +package com.dotcms.tika; + +import java.io.Serializable; + +/** + * Builder interface that should be implemented in order to create {@link TikaProxyService} instances + * + * @author Jonathan Gamba + * 1/16/18 + */ +public interface TikaServiceBuilder extends Serializable { + + /** + * Returns a new instance of a {@link TikaProxyService}, each time this method is called + * the new instance of {@link TikaProxyService} creates a new instance of + * {@link org.apache.tika.Tika} in order to use it inside de {@link TikaProxyService} + */ + public TikaProxyService createTikaService(); + +} \ No newline at end of file diff --git a/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java b/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java index 928a8a6ef731..a40b1e9f9923 100644 --- a/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java +++ b/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java @@ -1,17 +1,15 @@ package com.dotcms.tika; +import com.dotcms.osgi.OSGIConstants; import com.dotcms.repackage.org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import com.dotcms.repackage.org.apache.commons.io.IOUtils; import com.dotcms.repackage.org.apache.commons.io.input.ReaderInputStream; -import com.dotcms.repackage.org.apache.tika.Tika; -import com.dotcms.repackage.org.apache.tika.io.TikaInputStream; -import com.dotcms.repackage.org.apache.tika.metadata.Metadata; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portlets.fileassets.business.FileAssetAPI; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; +import com.dotmarketing.util.OSGIUtil; import com.dotmarketing.util.StringUtils; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; @@ -28,6 +26,28 @@ public class TikaUtils { + private TikaProxyService tikaService; + + public TikaUtils() { + + //Search for the TikaServiceBuilder service instance expose through OSGI + TikaServiceBuilder tikaServiceBuilder = OSGIUtil.getInstance() + .getService(TikaServiceBuilder.class, + OSGIConstants.BUNDLE_NAME_DOTCMS_TIKA); + if (null == tikaServiceBuilder) { + throw new IllegalStateException( + String.format("OSGI Service [%s] not found for bundle [%s]", + TikaServiceBuilder.class, + OSGIConstants.BUNDLE_NAME_DOTCMS_TIKA)); + } + + /* + Creating a new instance of the TikaProxyService in order to use the Tika services exposed in OSGI, + when the createTikaService method is called a new instance of Tika is also created + by the TikaProxyService implementation. + */ + this.tikaService = tikaServiceBuilder.createTikaService(); + } /** * Right now the method use the Tika facade directly for parse the document without any kind of restriction about the parser because the @@ -38,14 +58,14 @@ public class TikaUtils { * May 31, 2013 - 12:27:19 PM */ public Map getMetaDataMap(String inode, File binFile, String mimeType, boolean forceMemory) { - Map metaMap = new HashMap(); + + this.tikaService.setMaxStringLength(-1); + + Map metaMap = new HashMap<>(); // store content metadata on disk File contentM = APILocator.getFileAssetAPI().getContentMetadataFile(inode); - Tika t = new Tika(); - Metadata met = new Metadata(); - t.setMaxStringLength(-1); Reader fulltext = null; InputStream is = null; @@ -59,34 +79,19 @@ public Map getMetaDataMap(String inode, File binFile, String mim if (forceMemory) { // no worry about the limit and less time to process. - final String content = t.parseToString(Files.newInputStream(binFile.toPath()), met); - metaMap = new HashMap(); - for (int i = 0; i < met.names().length; i++) { - String name = met.names()[i]; - if (UtilMethods.isSet(name) && met.get(name) != null) { - // we will want to normalize our metadata for searching - String[] x = translateKey(name); - for (String y : x) { - metaMap.put(y, met.get(name)); - } - } - } + final String content = this.tikaService + .parseToString(Files.newInputStream(binFile.toPath())); + + //Creating the meta data map to use by our content + metaMap = buildMetaDataMap(); metaMap.put(FileAssetAPI.CONTENT_FIELD, content); } else { - is = TikaInputStream.get(binFile); - fulltext = t.parse(is, met); - metaMap = new HashMap(); - for (int i = 0; i < met.names().length; i++) { - String name = met.names()[i]; - if (UtilMethods.isSet(name) && met.get(name) != null) { - // we will want to normalize our metadata for searching - String[] x = translateKey(name); - for (String y : x) { - metaMap.put(y, met.get(name)); - } - } - } + is = this.tikaService.tikaInputStreamGet(binFile); + fulltext = this.tikaService.parse(is); + + //Creating the meta data map to use by our content + metaMap = buildMetaDataMap(); buf = new char[1024]; bytes = new byte[1024]; @@ -119,7 +124,7 @@ public Map getMetaDataMap(String inode, File binFile, String mim numOfChunks--; } while ((count = fulltext.read(buf)) > 0 && numOfChunks > 0); } catch (IOException ioExc) { - Logger.debug(this.getClass(), "Error Reading TikaParse Stream.", ioExc); + Logger.error(this.getClass(), "Error Reading TikaParse Stream.", ioExc); } finally { if (out != null) { try { @@ -142,11 +147,12 @@ public Map getMetaDataMap(String inode, File binFile, String mim } } } - } catch (IOException ioExc) { - Logger.debug(this.getClass(), "Error Reading TikaParse Stream.", ioExc); - } catch (Exception e) { + } catch (IOException ioExc) { + Logger.error(this.getClass(), "Error Reading TikaParse Stream.", ioExc); + } catch (Exception e) { Logger.error(this.getClass(), - "Could not parse file metadata for file : " + binFile.getAbsolutePath() + ". " + e.getMessage()); + "Could not parse file metadata for file : " + binFile.getAbsolutePath() + ". " + + e.getMessage()); } finally { if (null != fulltext) { IOUtils.closeQuietly(fulltext); @@ -158,9 +164,11 @@ public Map getMetaDataMap(String inode, File binFile, String mim metaMap.put(FileAssetAPI.SIZE_FIELD, String.valueOf(binFile.length())); } catch (Exception ex) { Logger.error(this.getClass(), - "Could not parse file metadata for file : " + binFile.getAbsolutePath() + ". " + ex.getMessage()); + "Could not parse file metadata for file : " + binFile.getAbsolutePath() + + ". " + ex.getMessage()); } } + User systemUser = null; try { systemUser = APILocator.getUserAPI().getSystemUser(); @@ -181,79 +189,72 @@ public Map getMetaDataMap(String inode, File binFile, String mim return metaMap; } - /** - * This method takes a file and uses tika to parse the metadata from it. It - * returns a Map of the metadata - * - * @param binFile - * @return - */ - public Map getMetaDataMap(String inode,File binFile, boolean forceMemory) { - return getMetaDataMap(inode,binFile, null, forceMemory); - } - -// /** -// * -// * @param binFile -// * @return -// */ -// private Parser getParser(File binFile) { -// String mimeType = new MimetypesFileTypeMap().getContentType(binFile); -// return getParser(binFile, mimeType); -// } - - -// private Parser getParser(File binFile, String mimeType) { -// String[] mimeTypes = Config.getStringArrayProperty("CONTENT_PARSERS_MIMETYPES"); -// String[] parsers = Config.getStringArrayProperty("CONTENT_PARSERS"); -// int index = Arrays.binarySearch(mimeTypes, mimeType); -// if (index > -1 && parsers.length > 0) { -// String parserClassName = parsers[index]; -// Class parserClass; -// try { -// parserClass = (Class) Class.forName(parserClassName); -// return parserClass.newInstance(); -// } catch (Exception e) { -// Logger.warn(this.getClass(), "A content parser for mime type " + mimeType -// + " was found but could not be instantiated, using default content parser."); -// } -// } -// return new AutoDetectParser(); -// } - - - - - /** - * normalize metadata from various filetypes this method will return an - * array of metadata keys that we can use to normalize the values in our - * fileAsset metadata For example, tiff:ImageLength = "height" for image - * files, so we return {"tiff:ImageLength", "height"} and both metadata are - * written to our metadata field - * - * @param key - * @return - */ - private String[] translateKey(String key) { - String[] x = getTranslationMap().get(key); - if (x == null) { - x = new String[] { StringUtils.camelCaseLower(key) }; - } - return x; - } - - private Map translateMeta = null; - - private Map getTranslationMap() { - if (translateMeta == null) { - synchronized ("translateMeta".intern()) { - if (translateMeta == null) { - translateMeta = new HashMap(); - translateMeta.put("tiff:ImageWidth", new String[] { "tiff:ImageWidth", "width" }); - translateMeta.put("tiff:ImageLength", new String[] { "tiff:ImageLength", "height" }); - } - } - } - return translateMeta; - } -} + /** + * Detects the media type of the given file. The type detection is + * based on the document content and a potential known file extension. + * + * @param file the file + * @return detected media type + * @throws IOException if the file can not be read + */ + public String detect(File file) throws IOException { + return this.tikaService.detect(file); + } + + private Map buildMetaDataMap() { + + Map metaMap = new HashMap<>(); + for (int i = 0; i < this.tikaService.metadataNames().length; i++) { + String name = this.tikaService.metadataNames()[i]; + if (UtilMethods.isSet(name) && this.tikaService.metadataGetName(name) != null) { + // we will want to normalize our metadata for searching + String[] x = translateKey(name); + for (String y : x) { + metaMap.put(y, this.tikaService.metadataGetName(name)); + } + } + } + + return metaMap; + } + + /** + * This method takes a file and uses tika to parse the metadata from it. It + * returns a Map of the metadata + */ + public Map getMetaDataMap(String inode, File binFile, boolean forceMemory) { + return getMetaDataMap(inode, binFile, null, forceMemory); + } + + /** + * normalize metadata from various filetypes this method will return an + * array of metadata keys that we can use to normalize the values in our + * fileAsset metadata For example, tiff:ImageLength = "height" for image + * files, so we return {"tiff:ImageLength", "height"} and both metadata are + * written to our metadata field + */ + private String[] translateKey(String key) { + String[] x = getTranslationMap().get(key); + if (x == null) { + x = new String[]{StringUtils.camelCaseLower(key)}; + } + return x; + } + + private Map translateMeta = null; + + private Map getTranslationMap() { + if (translateMeta == null) { + synchronized ("translateMeta".intern()) { + if (translateMeta == null) { + translateMeta = new HashMap(); + translateMeta.put("tiff:ImageWidth", new String[]{"tiff:ImageWidth", "width"}); + translateMeta + .put("tiff:ImageLength", new String[]{"tiff:ImageLength", "height"}); + } + } + } + return translateMeta; + } + +} \ No newline at end of file diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java index 5e210281904f..9d977284810a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java @@ -10,7 +10,6 @@ import com.dotcms.repackage.org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import com.dotcms.repackage.org.apache.commons.io.FileUtils; import com.dotcms.repackage.org.apache.commons.io.IOUtils; -import com.dotcms.repackage.org.apache.tika.Tika; import com.dotcms.tika.TikaUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -582,7 +581,7 @@ public String getContentMetadataAsString(File metadataFile) throws Exception { //Subtracting 1024 Bytes (buffer size) metadataLimitInBytes = metadataLimitInBytes - 1024; - String type=new Tika().detect(metadataFile); + String type = new TikaUtils().detect(metadataFile); InputStream input= Files.newInputStream(metadataFile.toPath()); diff --git a/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java b/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java index 4eae4bcb5090..3ddd30bb00aa 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java @@ -26,6 +26,7 @@ import org.apache.felix.main.AutoProcessor; import org.apache.felix.main.Main; import org.apache.velocity.tools.view.PrimitiveToolboxManager; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.framework.launch.Framework; @@ -528,4 +529,68 @@ public String parseBaseDirectoryFromConfig() { return baseDirectory; } + + /** + * Finds a bundle by bundle name + * + * @param bundleName Name of the bundle to search for + */ + public Bundle findBundle(final String bundleName) { + + Bundle foundBundle = null; + + //Get the list of existing bundles + Bundle[] bundles = OSGIUtil.getInstance().getBundleContext().getBundles(); + for (Bundle bundle : bundles) { + if (bundleName.equalsIgnoreCase(bundle.getSymbolicName())) { + foundBundle = bundle; + break; + } + } + + return foundBundle; + } + + /** + * Returns an instance of a given service registered through OSGI + * + * @param serviceClass Registered service class + * @param bundleName Bundle name of the Bundle where the service is registered + * @return Instance of the requested service + */ + public T getService(final Class serviceClass, final String bundleName) { + + Bundle foundBundle = findBundle(bundleName); + if (null == foundBundle) { + throw new IllegalStateException( + String.format("[%s] OSGI bundle NOT FOUND.", bundleName)); + } + + BundleContext bundleContext = foundBundle.getBundleContext(); + if (null == bundleContext) { + throw new IllegalStateException( + String.format("OSGI bundle context NOT FOUND for bundle [%s]", bundleName)); + } + + //Getting the requested OSGI service reference + ServiceReference serviceReference = bundleContext + .getServiceReference(serviceClass.getName()); + if (null == serviceReference) { + throw new IllegalStateException(String.format( + "[%s] Service Reference NOT FOUND.", + serviceClass.getName())); + } + + T osgiBundleService; + try { + //Service reference instance exposed through OSGI + osgiBundleService = (T) bundleContext.getService(serviceReference); + } catch (Exception e) { + throw new IllegalStateException( + String.format("Error reading [%s] Service.", serviceClass.getName()), e); + } + + return osgiBundleService; + } + } \ No newline at end of file From c4f2c7275fc22ce54752c5470a7171e91742c92e Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Tue, 23 Jan 2018 10:28:03 -0600 Subject: [PATCH 2/6] #13482 --- dotCMS/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/dotCMS/build.gradle b/dotCMS/build.gradle index 1f391ba8f645..2e387b5e432c 100644 --- a/dotCMS/build.gradle +++ b/dotCMS/build.gradle @@ -141,6 +141,7 @@ dependencies { } felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.24' felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25' + felix group: 'com.dotcms.tika', name: 'com.dotcms.tika', version: '0.1' /**** And now the libs we pull in from internal company sources - libs stored in ./plugins, ./bin, ./libs, the starter site, etc. ****/ compile fileTree("src/main/plugins/com.dotcms.config/build/jar").include('plugin-com.dotcms.config.jar') From 6f2f7cce510fdb4264006816935a919c081dbc3a Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Wed, 24 Jan 2018 14:03:03 -0600 Subject: [PATCH 3/6] Removing tika jar dotCMS/core#13482 --- dotCMS/dependencies.gradle | 43 +++++++++++++++--- .../listeners/TestXmlRingingListener.java | 10 ++--- .../PublishingEndPointFactoryImplTest.java | 11 ++--- .../com/ettrema/httpclient/LockMethod.java | 8 ++-- .../ettrema/httpclient/PropFindMethod.java | 17 ++++--- .../com/ettrema/httpclient/ReportMethod.java | 12 ++--- .../com/ettrema/httpclient/RespUtils.java | 18 ++++---- .../com/dotcms/listeners/SessionMonitor.java | 17 +++---- .../dotcms/publisher/pusher/PushUtils.java | 16 ++++--- .../publisher/receiver/BundlePublisher.java | 4 +- .../rendering/velocity/viewtools/XmlTool.java | 22 ++++----- .../velocity/viewtools/XsltTool.java | 16 +++---- .../viewtools/cache/XmlToolCache.java | 7 ++- .../rest/api/v1/user/UpdateUserForm.java | 2 +- .../main/java/com/dotcms/tika/TikaUtils.java | 2 +- .../pagination/ContentTypesPaginator.java | 6 +-- .../com/dotcms/webdav/FsFileResource.java | 26 +++++------ .../jgroups/JGroupsCacheTransport.java | 13 ++++-- .../com/dotmarketing/config/ConfigLoader.java | 17 +++---- .../action/ImportContentletsAction.java | 2 +- .../fileassets/business/FileAssetAPIImpl.java | 2 +- .../com/dotmarketing/util/diff/DaisyDiff.java | 17 ++++--- .../dotmarketing/util/diff/HtmlCleaner.java | 9 ++-- .../com/dotmarketing/util/diff/XslFilter.java | 23 +++++----- .../helper/MergeCharacterEventsHandler.java | 8 ++-- .../util/diff/helper/NekoHtmlParser.java | 15 +++---- .../util/diff/helper/SaxBuffer.java | 23 +++++----- .../util/diff/html/HTMLDiffer.java | 7 ++- .../util/diff/html/HtmlSaxDiffOutput.java | 6 +-- .../ancestor/tagtostring/AnchorToString.java | 7 ++- .../ancestor/tagtostring/TagToString.java | 7 ++- .../util/diff/html/dom/BodyNode.java | 3 +- .../util/diff/html/dom/DomTreeBuilder.java | 6 +-- .../util/diff/html/dom/ImageNode.java | 4 +- .../util/diff/html/dom/TagNode.java | 9 ++-- .../diff/html/dom/helper/AttributesMap.java | 2 +- .../util/diff/output/DiffOutput.java | 2 +- .../dotmarketing/util/diff/output/Differ.java | 2 +- .../util/diff/tag/TagSaxDiffOutput.java | 6 +-- .../liferay/portal/ejb/PortletManager.java | 4 +- .../portal/ejb/PortletManagerImpl.java | 45 +++++++++---------- .../com/liferay/portal/events/InitAction.java | 15 +------ .../liferay/portal/servlet/MainServlet.java | 33 ++++++++------ .../liferay/portal/tools/EARXMLBuilder.java | 16 +++---- .../liferay/portal/tools/EJBXMLBuilder.java | 14 +++--- .../liferay/portal/tools/WebSiteBuilder.java | 8 ++-- .../liferay/portal/util/EntityResolver.java | 8 ++-- .../portlet/PortletPreferencesSerializer.java | 29 ++++++------ .../portlet/admin/model/AdminConfig.java | 3 +- .../main/java/com/liferay/util/FileUtil.java | 2 +- .../com/liferay/util/poi/XLSTextStripper.java | 8 ++-- .../liferay/util/xml/AttributeComparator.java | 3 +- .../liferay/util/xml/ElementComparator.java | 5 +-- .../java/com/liferay/util/xml/Serializer.java | 43 +++++++----------- .../util/xml/XMLElementComparator.java | 3 +- .../com/liferay/util/xml/XMLFormatter.java | 14 +++--- .../java/com/liferay/util/xml/XMLMerger.java | 8 ++-- .../com/liferay/util/xml/XMLMergerRunner.java | 20 ++++----- .../com/liferay/util/xml/XMLTypeDetector.java | 3 +- .../xml/descriptor/FacesXMLDescriptor.java | 3 +- .../xml/descriptor/PortletAppDescriptor.java | 3 +- .../xml/descriptor/SimpleXMLDescriptor.java | 5 +-- .../xml/descriptor/StrictXMLDescriptor.java | 12 +++-- .../descriptor/StrutsConfigDescriptor.java | 3 +- .../xml/descriptor/TilesDefsDescriptor.java | 3 +- .../util/xml/descriptor/WebXMLDescriptor.java | 3 +- .../util/xml/descriptor/XMLDescriptor.java | 4 +- .../apache/velocity/anakia/AnakiaElement.java | 14 +++--- .../velocity/anakia/AnakiaJDOMFactory.java | 14 +++--- .../apache/velocity/anakia/AnakiaTask.java | 10 ++--- .../org/apache/velocity/anakia/NodeList.java | 21 +++++---- .../apache/velocity/anakia/OutputWrapper.java | 7 ++- .../apache/velocity/anakia/TreeWalker.java | 3 +- .../apache/velocity/anakia/XPathCache.java | 2 +- .../org/apache/velocity/anakia/XPathTool.java | 9 ++-- .../velocity/tools/view/ToolboxRuleSet.java | 10 ++--- .../tools/view/XMLToolboxManager.java | 5 +-- .../view/servlet/ServletToolboxManager.java | 19 ++++---- .../view/servlet/ServletToolboxRuleSet.java | 6 +-- 79 files changed, 408 insertions(+), 459 deletions(-) diff --git a/dotCMS/dependencies.gradle b/dotCMS/dependencies.gradle index 7daaba402e89..a5d799f45144 100644 --- a/dotCMS/dependencies.gradle +++ b/dotCMS/dependencies.gradle @@ -27,7 +27,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.cactus.integration.ant', version:'1.8.0_2' compile group: 'com.dotcms.lib', name: 'dot.cargo-ant', version:'0.9_2' compile group: 'com.dotcms.lib', name: 'dot.cargo-core-uberjar', version:'0.9_2' - compile group: 'com.dotcms.lib', name: 'dot.castor', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.cglib-nodep', version:'2.2_2' compile group: 'com.dotcms.lib', name: 'dot.com.dotmarketing.jhlabs.images.filters', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.commons-beanutils', version:'1.6.1_2' @@ -35,7 +34,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.commons-collections', version:'3.2_2' compile group: 'com.dotcms.lib', name: 'dot.commons-configuration', version:'1.0_2' compile group: 'com.dotcms.lib', name: 'dot.commons-dbcp', version:'1.3_2' - compile group: 'com.dotcms.lib', name: 'dot.commons-digester', version:'1.7_2' compile group: 'com.dotcms.lib', name: 'dot.commons-fileupload', version:'1.2_2' compile group: 'com.dotcms.lib', name: 'dot.commons-httpclient', version:'3.1_2' compile group: 'com.dotcms.lib', name: 'dot.commons-io', version:'2.0.1_2' @@ -107,7 +105,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.jersey-entity-filtering', version:'2.22.1_1' compile group: 'com.dotcms.lib', name: 'dot.jettison', version:'1.1_2' compile group: 'com.dotcms.lib', name: 'dot.jfreechart', version:'1.0.13_2' - compile group: 'com.dotcms.lib', name: 'dot.jgroups', version:'3.6.1.Final_2' compile group: 'com.dotcms.lib', name: 'dot.jid3lib', version:'0.5.4_2' compile group: 'com.dotcms.lib', name: 'dot.JLinkPointTxn', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.json-jspellchecker-dep', version:'ukv_2' @@ -161,7 +158,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.stax2-api', version:'3.1.1_2' compile group: 'com.dotcms.lib', name: 'dot.struts', version:'1.2.4_2' compile group: 'com.dotcms.lib', name: 'dot.stxx', version:'1.3_2' - compile group: 'com.dotcms.lib', name: 'dot.tagsoup', version:'1.2_2' compile group: 'com.dotcms.lib', name: 'dot.Tidy', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.trove', version:'1.0.2_2' compile group: 'com.dotcms.lib', name: 'dot.twitter4j-core', version:'3.0.3_2' @@ -169,7 +165,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.util-taglib', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.Verisign', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.wbmp', version:'ukv_2' - compile group: 'com.dotcms.lib', name: 'dot.werken-xpath', version:'0.9.4_2' compile group: 'com.dotcms.lib', name: 'dot.woodstox-core-lgpl', version:'4.2.0_2' compile group: 'com.dotcms.lib', name: 'dot.xalan', version:'2.7.0_2' compile group: 'com.dotcms.lib', name: 'dot.xmlpull', version:'1.1.3.1_2' @@ -177,11 +172,45 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.xstream', version:'1.4.8_2' compile group: 'com.dotcms.lib', name: 'dot.slf4j-api', version:'1.7.12_2' compile group: 'com.dotcms.lib', name: 'dot.slf4j-jcl', version:'1.7.12_2' - compile group: 'com.dotcms.lib', name: 'dot.tika-app', version:'1.3_3' + compile (group: 'xerces', name: 'xercesImpl', version: '2.11.0'){ + transitive = false + } + compile (group: 'org.apache.commons', name: 'commons-compress', version: '1.15'){ + transitive = false + } + compile (group: 'commons-digester', name: 'commons-digester', version: '2.1'){ + transitive = false + } + compile (group: 'org.jdom', name: 'jdom', version: '1.1.3'){ + transitive = false + } + compile (group: 'dom4j', name: 'dom4j', version: '1.6.1'){ + transitive = false + } + compile (group: 'org.apache.poi', name: 'poi', version: '3.17'){ + transitive = false + } + compile (group: 'com.googlecode.juniversalchardet', name: 'juniversalchardet', version: '1.0.3'){ + transitive = false + } + compile (group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'){ + transitive = false + } + compile (group: 'org.codehaus.castor', name: 'castor-core', version: '1.4.1'){ + transitive = false + } + compile (group: 'org.codehaus.castor', name: 'castor-xml', version: '1.4.1'){ + transitive = false + } + compile (group: 'werken-xpath', name: 'werken-xpath', version: '0.9.4'){ + transitive = false + } + compile (group: 'org.jgroups', name: 'jgroups', version: '3.6.1.Final'){ + transitive = false + } compile group: 'redis.clients', name: 'jedis', version:'2.7.3' compile group: 'org.apache.commons', name: 'commons-pool2', version:'2.0' compile group: 'com.dotcms.lib', name: 'dot.maxmind-db', version:'1.0.0_2' - compile group: 'org.openjdk.jmh', name: 'jmh-core', version:'0.1' compile group: 'com.dotcms.lib', name: 'dot.geoip2', version:'2.1.0_2' compile group: 'com.dotcms.lib', name: 'dot.aopalliance-repackaged', version:'2.4.0-b10_2' diff --git a/dotCMS/src/functional-test/java/com/dotmarketing/listeners/TestXmlRingingListener.java b/dotCMS/src/functional-test/java/com/dotmarketing/listeners/TestXmlRingingListener.java index 985019837544..7d26d28c5611 100644 --- a/dotCMS/src/functional-test/java/com/dotmarketing/listeners/TestXmlRingingListener.java +++ b/dotCMS/src/functional-test/java/com/dotmarketing/listeners/TestXmlRingingListener.java @@ -1,10 +1,5 @@ package com.dotmarketing.listeners; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentHelper; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.OutputFormat; -import com.dotcms.repackage.org.dom4j.io.XMLWriter; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileWriter; @@ -20,6 +15,11 @@ import java.util.Date; import java.util.regex.Pattern; import javax.servlet.http.HttpServletResponse; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; import org.junit.runner.Description; import org.junit.runner.Result; import org.junit.runner.notification.Failure; diff --git a/dotCMS/src/integration-test/java/com/dotcms/publisher/endpoint/business/PublishingEndPointFactoryImplTest.java b/dotCMS/src/integration-test/java/com/dotcms/publisher/endpoint/business/PublishingEndPointFactoryImplTest.java index 778309388cfb..09c7695b503c 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/publisher/endpoint/business/PublishingEndPointFactoryImplTest.java +++ b/dotCMS/src/integration-test/java/com/dotcms/publisher/endpoint/business/PublishingEndPointFactoryImplTest.java @@ -1,14 +1,11 @@ package com.dotcms.publisher.endpoint.business; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import com.dotcms.util.IntegrationTestInitService; - -import static com.dotcms.repackage.org.jgroups.util.Util.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.BeforeClass; +import org.junit.Test; public class PublishingEndPointFactoryImplTest { diff --git a/dotCMS/src/integration-test/java/com/ettrema/httpclient/LockMethod.java b/dotCMS/src/integration-test/java/com/ettrema/httpclient/LockMethod.java index e094706b1be3..7ffb81619eab 100644 --- a/dotCMS/src/integration-test/java/com/ettrema/httpclient/LockMethod.java +++ b/dotCMS/src/integration-test/java/com/ettrema/httpclient/LockMethod.java @@ -1,12 +1,12 @@ package com.ettrema.httpclient; +import com.dotcms.repackage.org.apache.commons.httpclient.methods.EntityEnclosingMethod; import java.io.IOException; import java.io.InputStream; import java.util.List; -import com.dotcms.repackage.org.apache.commons.httpclient.methods.EntityEnclosingMethod; -import com.dotcms.repackage.org.jdom.Document; -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.JDOMException; +import org.jdom.Document; +import org.jdom.Element; +import org.jdom.JDOMException; /** * diff --git a/dotCMS/src/integration-test/java/com/ettrema/httpclient/PropFindMethod.java b/dotCMS/src/integration-test/java/com/ettrema/httpclient/PropFindMethod.java index 7ffd5ef8884c..ae39691aa072 100644 --- a/dotCMS/src/integration-test/java/com/ettrema/httpclient/PropFindMethod.java +++ b/dotCMS/src/integration-test/java/com/ettrema/httpclient/PropFindMethod.java @@ -1,18 +1,17 @@ package com.ettrema.httpclient; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; import com.dotcms.repackage.org.apache.commons.httpclient.Header; import com.dotcms.repackage.org.apache.commons.httpclient.methods.EntityEnclosingMethod; -import com.dotcms.repackage.org.jdom.Document; -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.JDOMException; -import com.dotcms.repackage.org.jdom.Namespace; - import com.dotcms.repackage.org.slf4j.Logger; import com.dotcms.repackage.org.slf4j.LoggerFactory; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import org.jdom.Document; +import org.jdom.Element; +import org.jdom.JDOMException; +import org.jdom.Namespace; /** * diff --git a/dotCMS/src/integration-test/java/com/ettrema/httpclient/ReportMethod.java b/dotCMS/src/integration-test/java/com/ettrema/httpclient/ReportMethod.java index 7f4820473823..6df702dd2bab 100644 --- a/dotCMS/src/integration-test/java/com/ettrema/httpclient/ReportMethod.java +++ b/dotCMS/src/integration-test/java/com/ettrema/httpclient/ReportMethod.java @@ -1,16 +1,16 @@ package com.ettrema.httpclient; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; import com.dotcms.repackage.org.apache.commons.httpclient.methods.EntityEnclosingMethod; import com.dotcms.repackage.org.apache.commons.io.IOUtils; -import com.dotcms.repackage.org.jdom.Document; -import com.dotcms.repackage.org.jdom.JDOMException; import com.dotcms.repackage.org.slf4j.Logger; import com.dotcms.repackage.org.slf4j.LoggerFactory; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import org.jdom.Document; +import org.jdom.JDOMException; /** * diff --git a/dotCMS/src/integration-test/java/com/ettrema/httpclient/RespUtils.java b/dotCMS/src/integration-test/java/com/ettrema/httpclient/RespUtils.java index b09da623fdf9..9239f62768f3 100644 --- a/dotCMS/src/integration-test/java/com/ettrema/httpclient/RespUtils.java +++ b/dotCMS/src/integration-test/java/com/ettrema/httpclient/RespUtils.java @@ -1,5 +1,8 @@ package com.ettrema.httpclient; +import com.dotcms.repackage.org.apache.commons.io.IOUtils; +import com.dotcms.repackage.org.slf4j.Logger; +import com.dotcms.repackage.org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,14 +10,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.dotcms.repackage.org.apache.commons.io.IOUtils; -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.JDOMException; -import com.dotcms.repackage.org.jdom.Namespace; -import com.dotcms.repackage.org.jdom.filter.ElementFilter; -import com.dotcms.repackage.org.jdom.input.SAXBuilder; -import com.dotcms.repackage.org.slf4j.Logger; -import com.dotcms.repackage.org.slf4j.LoggerFactory; +import org.jdom.Element; +import org.jdom.JDOMException; +import org.jdom.Namespace; +import org.jdom.filter.ElementFilter; +import org.jdom.input.SAXBuilder; @@ -82,7 +82,7 @@ public static List getElements(Element root, String name) { return list; } - public static com.dotcms.repackage.org.jdom.Document getJDomDocument(InputStream in) throws JDOMException { + public static org.jdom.Document getJDomDocument(InputStream in) throws JDOMException { ByteArrayOutputStream bout = new ByteArrayOutputStream(); try { IOUtils.copy(in, bout); diff --git a/dotCMS/src/main/java/com/dotcms/listeners/SessionMonitor.java b/dotCMS/src/main/java/com/dotcms/listeners/SessionMonitor.java index 4af66b0ec935..372165fbbbdb 100644 --- a/dotCMS/src/main/java/com/dotcms/listeners/SessionMonitor.java +++ b/dotCMS/src/main/java/com/dotcms/listeners/SessionMonitor.java @@ -1,8 +1,16 @@ package com.dotcms.listeners; +import com.dotcms.api.system.event.Payload; +import com.dotcms.api.system.event.SystemEvent; +import com.dotcms.api.system.event.SystemEventType; +import com.dotcms.api.system.event.SystemEventsAPI; +import com.dotcms.api.system.event.Visibility; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.exception.DotDataException; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.WebKeys; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.servlet.ServletRequestEvent; import javax.servlet.ServletRequestListener; import javax.servlet.http.HttpServletRequest; @@ -12,13 +20,6 @@ import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; -import com.dotcms.api.system.event.*; -import com.dotcms.repackage.org.exolab.castor.types.Date; -import com.dotmarketing.business.APILocator; -import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.WebKeys; - /** * Listener that keeps track of logged in users by monitoring for USER_ID * session attribute addition. diff --git a/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushUtils.java b/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushUtils.java index 26fbc9617254..0cd428b9aab4 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushUtils.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushUtils.java @@ -1,15 +1,17 @@ package com.dotcms.publisher.pusher; -import java.io.*; +import com.dotcms.repackage.org.apache.commons.io.IOUtils; +import com.dotmarketing.util.Logger; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; import java.nio.file.Files; import java.util.Collection; import java.util.zip.GZIPOutputStream; - -import com.dotcms.repackage.org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import com.dotcms.repackage.org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; -import com.dotcms.repackage.org.apache.commons.io.IOUtils; - -import com.dotmarketing.util.Logger; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; public class PushUtils { diff --git a/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java b/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java index ad6e2b8b8677..b3b2d74a5374 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java @@ -34,8 +34,6 @@ import com.dotcms.publishing.PublishStatus; import com.dotcms.publishing.Publisher; import com.dotcms.publishing.PublisherConfig; -import com.dotcms.repackage.org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import com.dotcms.repackage.org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import com.dotcms.repackage.org.apache.commons.io.FileUtils; import com.dotcms.repackage.org.apache.commons.lang.exception.ExceptionUtils; import com.dotcms.rest.BundlePublisherResource; @@ -61,6 +59,8 @@ import java.util.List; import java.util.Map; import java.util.zip.GZIPInputStream; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.tools.tar.TarBuffer; /** diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XmlTool.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XmlTool.java index 9c39b7db3c7e..14f278d15a88 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XmlTool.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XmlTool.java @@ -19,6 +19,9 @@ * under the License. */ +import com.dotcms.rendering.velocity.viewtools.bean.XmlToolDoc; +import com.dotcms.rendering.velocity.viewtools.cache.XmlToolCache; +import com.dotcms.rendering.velocity.viewtools.util.ConversionUtils; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -27,21 +30,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.apache.velocity.tools.generic.ValueParser; import org.apache.velocity.tools.view.tools.ViewTool; - -import com.dotcms.rendering.velocity.viewtools.bean.XmlToolDoc; -import com.dotcms.rendering.velocity.viewtools.cache.XmlToolCache; -import com.dotcms.rendering.velocity.viewtools.util.ConversionUtils; -import com.dotcms.repackage.org.dom4j.Attribute; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentHelper; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.Node; -import com.dotcms.repackage.org.dom4j.io.SAXReader; - -import com.dotmarketing.util.Logger; +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.Node; +import org.dom4j.io.SAXReader; /** diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XsltTool.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XsltTool.java index d7e8f8f0dc33..55ab06ce81ea 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XsltTool.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/XsltTool.java @@ -1,11 +1,7 @@ package com.dotcms.rendering.velocity.viewtools; -import com.dotcms.repackage.javax.xml.transform.Source; -import com.dotcms.repackage.javax.xml.transform.Transformer; -import com.dotcms.repackage.javax.xml.transform.TransformerConfigurationException; -import com.dotcms.repackage.javax.xml.transform.TransformerFactory; -import com.dotcms.repackage.javax.xml.transform.stream.StreamResult; -import com.dotcms.repackage.javax.xml.transform.stream.StreamSource; +import com.dotcms.rendering.velocity.viewtools.bean.XSLTranformationDoc; +import com.dotcms.rendering.velocity.viewtools.cache.XSLTransformationCache; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; @@ -21,8 +17,6 @@ import com.dotmarketing.util.Config; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; -import com.dotcms.rendering.velocity.viewtools.bean.XSLTranformationDoc; -import com.dotcms.rendering.velocity.viewtools.cache.XSLTransformationCache; import com.liferay.portal.PortalException; import com.liferay.portal.SystemException; import com.liferay.portal.model.User; @@ -31,6 +25,12 @@ import java.nio.file.Files; import java.util.Date; import javax.servlet.http.HttpServletRequest; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapterImpl; import org.apache.velocity.tools.view.context.ViewContext; diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/cache/XmlToolCache.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/cache/XmlToolCache.java index 1835b0d2727c..5400f021c525 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/cache/XmlToolCache.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/cache/XmlToolCache.java @@ -1,14 +1,13 @@ package com.dotcms.rendering.velocity.viewtools.cache; -import java.util.Date; import com.dotcms.rendering.velocity.viewtools.bean.XmlToolDoc; -import com.dotcms.repackage.org.bouncycastle.crypto.digests.SHA1Digest; -import com.dotcms.repackage.org.bouncycastle.util.encoders.Base64; - import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.DotCacheAdministrator; import com.dotmarketing.business.DotCacheException; import com.dotmarketing.util.Logger; +import java.util.Date; +import org.bouncycastle.crypto.digests.SHA1Digest; +import org.bouncycastle.util.encoders.Base64; diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UpdateUserForm.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UpdateUserForm.java index 81f1ed512576..a4deb2084904 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UpdateUserForm.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UpdateUserForm.java @@ -1,8 +1,8 @@ package com.dotcms.rest.api.v1.user; -import com.dotcms.repackage.com.drew.lang.annotations.NotNull; import com.dotcms.repackage.com.fasterxml.jackson.annotation.JsonProperty; import com.dotcms.repackage.com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.dotcms.repackage.javax.validation.constraints.NotNull; import com.dotcms.repackage.org.hibernate.validator.constraints.NotBlank; import com.dotcms.rest.api.Validated; diff --git a/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java b/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java index a40b1e9f9923..8f69f99a23e1 100644 --- a/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java +++ b/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java @@ -1,7 +1,6 @@ package com.dotcms.tika; import com.dotcms.osgi.OSGIConstants; -import com.dotcms.repackage.org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import com.dotcms.repackage.org.apache.commons.io.IOUtils; import com.dotcms.repackage.org.apache.commons.io.input.ReaderInputStream; import com.dotmarketing.business.APILocator; @@ -23,6 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.zip.GZIPOutputStream; +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; public class TikaUtils { diff --git a/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java b/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java index a01b796a6cb8..47cd524ce707 100644 --- a/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java +++ b/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java @@ -5,22 +5,18 @@ import com.dotcms.contenttype.transform.contenttype.JsonContentTypeTransformer; import com.dotcms.contenttype.transform.contenttype.StructureTransformer; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.poi.openxml4j.opc.ContentTypes; +import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotRuntimeException; -import com.dotmarketing.portlets.contentlet.business.HostAPI; import com.dotmarketing.portlets.structure.business.StructureAPI; import com.dotmarketing.portlets.structure.model.Structure; import com.dotmarketing.util.PaginatedArrayList; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; /** * Handle {@link ContentType} pagination diff --git a/dotCMS/src/main/java/com/dotcms/webdav/FsFileResource.java b/dotCMS/src/main/java/com/dotcms/webdav/FsFileResource.java index 7bd8636120a3..e2be61292d9a 100644 --- a/dotCMS/src/main/java/com/dotcms/webdav/FsFileResource.java +++ b/dotCMS/src/main/java/com/dotcms/webdav/FsFileResource.java @@ -34,23 +34,21 @@ import com.dotcms.repackage.com.bradmcevoy.http.webdav.PropPatchHandler.Fields; import com.dotcms.repackage.com.bradmcevoy.io.ReadingException; import com.dotcms.repackage.com.bradmcevoy.io.WritingException; -import com.dotcms.webdav.FileContentService; - - -import java.io.*; +import com.dotmarketing.util.Logger; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * */ public class FsFileResource extends FsResource implements CopyableResource, DeletableResource, GetableResource, MoveableResource, PropFindableResource, PropPatchableResource { - private static final Logger log = LoggerFactory.getLogger(FsFileResource.class); - private final FileContentService contentService; /** @@ -72,11 +70,7 @@ public Long getContentLength() { @Override public String getContentType(String preferredList) { String mime = ContentTypeUtils.findContentTypes(this.file); - String s = ContentTypeUtils.findAcceptableContentType(mime, preferredList); - if (log.isTraceEnabled()) { - log.trace("getContentType: preferred: {} mime: {} selected: {}", new Object[]{preferredList, mime, s}); - } - return s; + return ContentTypeUtils.findAcceptableContentType(mime, preferredList); } @Override @@ -88,10 +82,12 @@ public String checkRedirect(Request arg0) { public void sendContent(OutputStream out, Range range, Map params, String contentType) throws IOException, NotFoundException { try (InputStream in = contentService.getFileContent(file)){ if (range != null) { - log.debug("sendContent: ranged content: " + file.getAbsolutePath()); + Logger.debug(this.getClass(), + "sendContent: ranged content: " + file.getAbsolutePath()); PartialEntity.writeRange(in, range, out); } else { - log.debug("sendContent: send whole file " + file.getAbsolutePath()); + Logger.debug(this.getClass(), + "sendContent: send whole file " + file.getAbsolutePath()); IOUtils.copy(in, out); } out.flush(); diff --git a/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java b/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java index bb9dbbb3486d..332fdacb1b8a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java @@ -4,8 +4,9 @@ import com.dotcms.cluster.business.ServerAPI; import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.jgroups.*; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.CacheLocator; +import com.dotmarketing.business.ChainableCacheAdministratorImpl; import com.dotmarketing.business.cache.transport.CacheTransport; import com.dotmarketing.business.cache.transport.CacheTransportException; import com.dotmarketing.exception.DotRuntimeException; @@ -14,10 +15,16 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.struts.MultiMessageResources; - import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.jgroups.Address; +import org.jgroups.Event; +import org.jgroups.JChannel; +import org.jgroups.Message; +import org.jgroups.PhysicalAddress; +import org.jgroups.ReceiverAdapter; +import org.jgroups.View; /** * @author Jonathan Gamba diff --git a/dotCMS/src/main/java/com/dotmarketing/config/ConfigLoader.java b/dotCMS/src/main/java/com/dotmarketing/config/ConfigLoader.java index 0dabcd838b7a..7170d21bec67 100644 --- a/dotCMS/src/main/java/com/dotmarketing/config/ConfigLoader.java +++ b/dotCMS/src/main/java/com/dotmarketing/config/ConfigLoader.java @@ -1,17 +1,14 @@ package com.dotmarketing.config; +import com.dotmarketing.util.Logger; import java.io.IOException; import java.io.InputStream; - -import com.dotcms.repackage.javax.xml.parsers.ParserConfigurationException; -import com.dotcms.repackage.javax.xml.parsers.SAXParser; -import com.dotcms.repackage.javax.xml.parsers.SAXParserFactory; - -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.helpers.DefaultHandler; - -import com.dotmarketing.util.Logger; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; /** * Loads up either clickstream.xml or clickstream-default.xml and diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java index a04aafdf61fb..debb936d0649 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java @@ -6,7 +6,6 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.org.apache.struts.action.ActionForm; import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.mozilla.universalchardet.UniversalDetector; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.cache.FieldsCache; import com.dotmarketing.db.DbConnectionFactory; @@ -43,6 +42,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.mozilla.universalchardet.UniversalDetector; /** * This action class import content from csv/text files. The csv file should diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java index 9d977284810a..f107bdde34c6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java @@ -7,7 +7,6 @@ import com.dotcms.api.system.event.verifier.ExcludeOwnerVerifierBean; import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; -import com.dotcms.repackage.org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import com.dotcms.repackage.org.apache.commons.io.FileUtils; import com.dotcms.repackage.org.apache.commons.io.IOUtils; import com.dotcms.tika.TikaUtils; @@ -46,6 +45,7 @@ import java.util.List; import java.util.Map; import java.util.zip.GZIPInputStream; +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; /** * This class is a bridge impl that will support the older diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/DaisyDiff.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/DaisyDiff.java index d81aaa8a9766..2bdc701a1f14 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/DaisyDiff.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/DaisyDiff.java @@ -15,10 +15,6 @@ */ package com.dotmarketing.util.diff; -import java.io.BufferedReader; -import java.io.IOException; -import java.util.Locale; - import com.dotmarketing.util.diff.html.HTMLDiffer; import com.dotmarketing.util.diff.html.HtmlSaxDiffOutput; import com.dotmarketing.util.diff.html.TextNodeComparator; @@ -26,11 +22,14 @@ import com.dotmarketing.util.diff.tag.TagComparator; import com.dotmarketing.util.diff.tag.TagDiffer; import com.dotmarketing.util.diff.tag.TagSaxDiffOutput; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.InputSource; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.XMLReader; -import com.dotcms.repackage.org.xml.sax.helpers.XMLReaderFactory; +import java.io.BufferedReader; +import java.io.IOException; +import java.util.Locale; +import org.xml.sax.ContentHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; public class DaisyDiff { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/HtmlCleaner.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/HtmlCleaner.java index 90969d83b977..34daa363bd9f 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/HtmlCleaner.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/HtmlCleaner.java @@ -16,12 +16,11 @@ package com.dotmarketing.util.diff; -import java.io.IOException; - import com.dotmarketing.util.diff.helper.NekoHtmlParser; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.InputSource; -import com.dotcms.repackage.org.xml.sax.SAXException; +import java.io.IOException; +import org.xml.sax.ContentHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; public class HtmlCleaner { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/XslFilter.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/XslFilter.java index 4a47b1f67e05..8b5676f99ee5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/XslFilter.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/XslFilter.java @@ -15,20 +15,17 @@ */ package com.dotmarketing.util.diff; -import java.io.IOException; - -import com.dotcms.repackage.javax.xml.transform.Templates; -import com.dotcms.repackage.javax.xml.transform.TransformerConfigurationException; -import com.dotcms.repackage.javax.xml.transform.TransformerFactory; -import com.dotcms.repackage.javax.xml.transform.TransformerFactoryConfigurationError; -import com.dotcms.repackage.javax.xml.transform.sax.SAXResult; -import com.dotcms.repackage.javax.xml.transform.sax.SAXTransformerFactory; -import com.dotcms.repackage.javax.xml.transform.sax.TransformerHandler; -import com.dotcms.repackage.javax.xml.transform.stream.StreamSource; - -import com.dotcms.repackage.org.xml.sax.ContentHandler; - import com.dotmarketing.util.Logger; +import java.io.IOException; +import javax.xml.transform.Templates; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.TransformerFactoryConfigurationError; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import javax.xml.transform.stream.StreamSource; +import org.xml.sax.ContentHandler; public class XslFilter { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/MergeCharacterEventsHandler.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/MergeCharacterEventsHandler.java index 0a1e7189087e..9b5c88d2352e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/MergeCharacterEventsHandler.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/MergeCharacterEventsHandler.java @@ -15,10 +15,10 @@ */ package com.dotmarketing.util.diff.helper; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.Locator; -import com.dotcms.repackage.org.xml.sax.Attributes; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class MergeCharacterEventsHandler implements ContentHandler { private ContentHandler consumer; diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/NekoHtmlParser.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/NekoHtmlParser.java index f120210f9386..81ace269e166 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/NekoHtmlParser.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/NekoHtmlParser.java @@ -15,15 +15,14 @@ */ package com.dotmarketing.util.diff.helper; +import com.sun.org.apache.xerces.internal.parsers.SAXParser; import java.io.IOException; - -import com.dotcms.repackage.org.cyberneko.html.parsers.SAXParser; -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.InputSource; -import com.dotcms.repackage.org.xml.sax.Locator; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; /** * Parses HTML files using the Neko HTML parser. Puts all elements and attribute diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/SaxBuffer.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/SaxBuffer.java index 51f1a964435c..15cf1cdb15a2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/SaxBuffer.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/helper/SaxBuffer.java @@ -15,19 +15,18 @@ */ package com.dotmarketing.util.diff.helper; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.Locator; -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.ext.LexicalHandler; - -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Collections; -import java.io.Serializable; import java.io.IOException; +import java.io.Serializable; import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.ext.LexicalHandler; /** * A class that can record SAX events and replay them later. @@ -381,7 +380,7 @@ public StartElement(String namespaceURI, String localName, this.namespaceURI = namespaceURI; this.localName = localName; this.qName = qName; - this.attrs = new com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl(attrs); + this.attrs = new org.xml.sax.helpers.AttributesImpl(attrs); } public void send(ContentHandler contentHandler) throws SAXException { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HTMLDiffer.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HTMLDiffer.java index 86bf15df8c36..3dff03f26879 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HTMLDiffer.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HTMLDiffer.java @@ -15,15 +15,14 @@ */ package com.dotmarketing.util.diff.html; -import java.util.LinkedList; -import java.util.List; - import com.dotcms.repackage.org.eclipse.compare.internal.LCSSettings; import com.dotcms.repackage.org.eclipse.compare.rangedifferencer.RangeDifference; import com.dotcms.repackage.org.eclipse.compare.rangedifferencer.RangeDifferencer; import com.dotmarketing.util.diff.output.DiffOutput; import com.dotmarketing.util.diff.output.Differ; -import com.dotcms.repackage.org.xml.sax.SAXException; +import java.util.LinkedList; +import java.util.List; +import org.xml.sax.SAXException; /** * Takes two {@link TextNodeComparator} instances, computes the difference diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HtmlSaxDiffOutput.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HtmlSaxDiffOutput.java index 15dbb7ca21b1..a88766738f1c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HtmlSaxDiffOutput.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/HtmlSaxDiffOutput.java @@ -15,9 +15,6 @@ */ package com.dotmarketing.util.diff.html; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.diff.html.dom.ImageNode; import com.dotmarketing.util.diff.html.dom.Node; @@ -26,6 +23,9 @@ import com.dotmarketing.util.diff.html.modification.Modification; import com.dotmarketing.util.diff.html.modification.ModificationType; import com.dotmarketing.util.diff.output.DiffOutput; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; /** * Takes a branch root and creates an HTML file for it. diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/AnchorToString.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/AnchorToString.java index edf8ec073c73..fb1ece6e02e7 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/AnchorToString.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/AnchorToString.java @@ -15,13 +15,12 @@ */ package com.dotmarketing.util.diff.html.ancestor.tagtostring; -import java.util.ResourceBundle; - import com.dotmarketing.util.diff.html.ancestor.ChangeText; import com.dotmarketing.util.diff.html.ancestor.TagChangeSematic; import com.dotmarketing.util.diff.html.dom.TagNode; -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; +import java.util.ResourceBundle; +import org.xml.sax.Attributes; +import org.xml.sax.helpers.AttributesImpl; public class AnchorToString extends TagToString { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/TagToString.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/TagToString.java index 9884837d08f2..7c79702e8d86 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/TagToString.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/ancestor/tagtostring/TagToString.java @@ -15,15 +15,14 @@ */ package com.dotmarketing.util.diff.html.ancestor.tagtostring; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - import com.dotmarketing.util.diff.html.ancestor.ChangeText; import com.dotmarketing.util.diff.html.ancestor.TagChangeSematic; import com.dotmarketing.util.diff.html.dom.TagNode; import com.dotmarketing.util.diff.html.modification.HtmlLayoutChange; import com.dotmarketing.util.diff.html.modification.HtmlLayoutChange.Type; -import com.dotcms.repackage.org.xml.sax.Attributes; +import java.util.MissingResourceException; +import java.util.ResourceBundle; +import org.xml.sax.Attributes; public class TagToString { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/BodyNode.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/BodyNode.java index 2d11e5be226b..64054033002e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/BodyNode.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/BodyNode.java @@ -17,8 +17,7 @@ import java.util.ArrayList; import java.util.List; - -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.helpers.AttributesImpl; /** * Represents the root of a HTML document. diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/DomTreeBuilder.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/DomTreeBuilder.java index 2878914aead7..b6e53caf0f51 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/DomTreeBuilder.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/DomTreeBuilder.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; public class DomTreeBuilder extends DefaultHandler implements DomTree { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/ImageNode.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/ImageNode.java index ca3cbb0584e7..cf51e97f2b12 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/ImageNode.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/ImageNode.java @@ -15,8 +15,8 @@ */ package com.dotmarketing.util.diff.html.dom; -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.Attributes; +import org.xml.sax.helpers.AttributesImpl; /** * Represents an image in HTML. Even though images do not contain any text they diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/TagNode.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/TagNode.java index d23c82dc2e57..2682998757f2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/TagNode.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/TagNode.java @@ -15,16 +15,15 @@ */ package com.dotmarketing.util.diff.html.dom; +import com.dotmarketing.util.diff.html.ancestor.TextOnlyComparator; +import com.dotmarketing.util.diff.html.dom.helper.AttributesMap; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; - -import com.dotmarketing.util.diff.html.ancestor.TextOnlyComparator; -import com.dotmarketing.util.diff.html.dom.helper.AttributesMap; -import com.dotcms.repackage.org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.Attributes; +import org.xml.sax.helpers.AttributesImpl; /** * Node that can contain other nodes. Represents an HTML tag. diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/helper/AttributesMap.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/helper/AttributesMap.java index 921833fb71fd..8c95e3de130c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/helper/AttributesMap.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/html/dom/helper/AttributesMap.java @@ -2,8 +2,8 @@ import java.util.Arrays; import java.util.HashMap; +import org.xml.sax.Attributes; -import com.dotcms.repackage.org.xml.sax.Attributes; /** * Map is used to store DOM tag attribute names and values. * This map pays no attention to sequence of attributes. diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/output/DiffOutput.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/output/DiffOutput.java index c79c99aea7be..f54da11db1db 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/output/DiffOutput.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/output/DiffOutput.java @@ -17,7 +17,7 @@ import com.dotmarketing.util.diff.html.HtmlSaxDiffOutput; import com.dotmarketing.util.diff.html.dom.TagNode; -import com.dotcms.repackage.org.xml.sax.SAXException; +import org.xml.sax.SAXException; /** * Interface for classes that need to process the result from the tree-like diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/output/Differ.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/output/Differ.java index f49d711b6d36..5b08d1d3f970 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/output/Differ.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/output/Differ.java @@ -16,7 +16,7 @@ package com.dotmarketing.util.diff.output; import com.dotmarketing.util.diff.html.TextNodeComparator; -import com.dotcms.repackage.org.xml.sax.SAXException; +import org.xml.sax.SAXException; /** * Interface for classes that are interested in the tree-like result structure diff --git a/dotCMS/src/main/java/com/dotmarketing/util/diff/tag/TagSaxDiffOutput.java b/dotCMS/src/main/java/com/dotmarketing/util/diff/tag/TagSaxDiffOutput.java index 678789fcf976..a54f202b1813 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/diff/tag/TagSaxDiffOutput.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/diff/tag/TagSaxDiffOutput.java @@ -16,9 +16,9 @@ package com.dotmarketing.util.diff.tag; import com.dotmarketing.util.diff.output.TextDiffOutput; -import com.dotcms.repackage.org.xml.sax.ContentHandler; -import com.dotcms.repackage.org.xml.sax.SAXException; -import com.dotcms.repackage.org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; /** * Outputs the diff result as HTML elements to a SAX ContentHandler. The diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManager.java b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManager.java index 96e87dcb3ac2..87c4785a61c6 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManager.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManager.java @@ -35,12 +35,12 @@ */ public interface PortletManager { public java.util.Map getEARDisplay(java.lang.String xml) - throws com.dotcms.repackage.org.dom4j.DocumentException, java.io.IOException, + throws org.dom4j.DocumentException, java.io.IOException, java.rmi.RemoteException; public java.util.Map getWARDisplay(java.lang.String servletContextName, java.lang.String xml) - throws com.dotcms.repackage.org.dom4j.DocumentException, java.io.IOException, + throws org.dom4j.DocumentException, java.io.IOException, java.rmi.RemoteException; public com.liferay.portal.model.Portlet getPortletById( diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManagerImpl.java b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManagerImpl.java index 840dbc8bb475..8308a584cf36 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManagerImpl.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletManagerImpl.java @@ -22,31 +22,7 @@ package com.liferay.portal.ejb; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - import com.dotcms.repackage.javax.portlet.PreferencesValidator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.OutputFormat; -import com.dotcms.repackage.org.dom4j.io.SAXReader; -import com.dotcms.repackage.org.dom4j.io.XMLWriter; - import com.dotmarketing.util.Logger; import com.liferay.portal.NoSuchPortletException; import com.liferay.portal.PortalException; @@ -66,6 +42,27 @@ import com.liferay.util.ListUtil; import com.liferay.util.SimpleCachePool; import com.liferay.util.Validator; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/events/InitAction.java b/dotCMS/src/main/java/com/liferay/portal/events/InitAction.java index 70957de195f4..99b7eda2f6c3 100644 --- a/dotCMS/src/main/java/com/liferay/portal/events/InitAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/events/InitAction.java @@ -22,24 +22,11 @@ package com.liferay.portal.events; -import com.dotcms.repackage.org.apache.logging.log4j.Level; -import com.dotcms.repackage.org.apache.logging.log4j.LogManager; -import com.dotcms.repackage.org.apache.logging.log4j.core.Appender; -import com.dotcms.repackage.org.apache.logging.log4j.core.Logger; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.SAXReader; -import com.dotmarketing.loggers.Log4jUtil; import com.liferay.portal.struts.ActionException; import com.liferay.portal.struts.SimpleAction; -import com.liferay.portal.util.PropsUtil; -import com.liferay.util.GetterUtil; -import com.liferay.util.ServerDetector; import com.liferay.util.SystemProperties; import com.liferay.util.Validator; - -import java.net.URL; -import java.util.*; +import java.util.Locale; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java b/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java index c926d9acdecd..8826e6c406f9 100644 --- a/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java +++ b/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java @@ -27,10 +27,6 @@ import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.repackage.org.apache.struts.action.ActionServlet; import com.dotcms.repackage.org.apache.struts.tiles.TilesUtilImpl; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.SAXReader; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.exception.DotDataException; @@ -51,16 +47,25 @@ import com.liferay.portal.struts.MultiMessageResources; import com.liferay.portal.struts.PortletRequestProcessor; import com.liferay.portal.struts.StrutsUtil; -import com.liferay.portal.util.*; +import com.liferay.portal.util.ContentUtil; +import com.liferay.portal.util.PortalInstances; +import com.liferay.portal.util.PortalUtil; +import com.liferay.portal.util.PropsUtil; +import com.liferay.portal.util.ShutdownUtil; +import com.liferay.portal.util.WebAppPool; +import com.liferay.portal.util.WebKeys; import com.liferay.util.GetterUtil; import com.liferay.util.Http; import com.liferay.util.ParamUtil; import com.liferay.util.StringUtil; import com.liferay.util.servlet.EncryptedServletRequest; import com.liferay.util.servlet.UploadServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -68,12 +73,12 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.jsp.PageContext; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/tools/EARXMLBuilder.java b/dotCMS/src/main/java/com/liferay/portal/tools/EARXMLBuilder.java index 575ed7043fcc..8732d147f1dd 100644 --- a/dotCMS/src/main/java/com/liferay/portal/tools/EARXMLBuilder.java +++ b/dotCMS/src/main/java/com/liferay/portal/tools/EARXMLBuilder.java @@ -22,18 +22,16 @@ package com.liferay.portal.tools; -import java.io.File; -import java.io.IOException; -import java.util.Iterator; - -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.SAXReader; - import com.dotmarketing.util.Logger; import com.liferay.portal.util.EntityResolver; import com.liferay.util.FileUtil; +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/tools/EJBXMLBuilder.java b/dotCMS/src/main/java/com/liferay/portal/tools/EJBXMLBuilder.java index af64e6899fe8..959b31761d10 100644 --- a/dotCMS/src/main/java/com/liferay/portal/tools/EJBXMLBuilder.java +++ b/dotCMS/src/main/java/com/liferay/portal/tools/EJBXMLBuilder.java @@ -22,18 +22,16 @@ package com.liferay.portal.tools; +import com.dotmarketing.util.Logger; +import com.liferay.portal.util.EntityResolver; +import com.liferay.util.FileUtil; import java.io.File; import java.util.HashMap; import java.util.Iterator; import java.util.Map; - -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.SAXReader; - -import com.dotmarketing.util.Logger; -import com.liferay.portal.util.EntityResolver; -import com.liferay.util.FileUtil; +import org.dom4j.Document; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/tools/WebSiteBuilder.java b/dotCMS/src/main/java/com/liferay/portal/tools/WebSiteBuilder.java index d2035dcb91a1..8cd324ea5ce3 100644 --- a/dotCMS/src/main/java/com/liferay/portal/tools/WebSiteBuilder.java +++ b/dotCMS/src/main/java/com/liferay/portal/tools/WebSiteBuilder.java @@ -22,10 +22,6 @@ package com.liferay.portal.tools; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.SAXReader; import com.dotmarketing.util.Logger; import com.liferay.util.FileUtil; import com.liferay.util.GetterUtil; @@ -40,6 +36,10 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/util/EntityResolver.java b/dotCMS/src/main/java/com/liferay/portal/util/EntityResolver.java index 2fe845a9fec7..dba2cc50dc54 100644 --- a/dotCMS/src/main/java/com/liferay/portal/util/EntityResolver.java +++ b/dotCMS/src/main/java/com/liferay/portal/util/EntityResolver.java @@ -22,11 +22,9 @@ package com.liferay.portal.util; -import java.io.InputStream; - -import com.dotcms.repackage.org.xml.sax.InputSource; - import com.liferay.util.KeyValuePair; +import java.io.InputStream; +import org.xml.sax.InputSource; /** * View Source @@ -35,7 +33,7 @@ * @version $Revision: 1.7 $ * */ -public class EntityResolver implements com.dotcms.repackage.org.xml.sax.EntityResolver { +public class EntityResolver implements org.xml.sax.EntityResolver { public static KeyValuePair[] IDS = { new KeyValuePair( diff --git a/dotCMS/src/main/java/com/liferay/portlet/PortletPreferencesSerializer.java b/dotCMS/src/main/java/com/liferay/portlet/PortletPreferencesSerializer.java index 2ad1979dbfa0..4c13564b564b 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/PortletPreferencesSerializer.java +++ b/dotCMS/src/main/java/com/liferay/portlet/PortletPreferencesSerializer.java @@ -22,6 +22,12 @@ package com.liferay.portlet; +import com.dotcms.repackage.javax.portlet.PortletPreferences; +import com.liferay.portal.PortalException; +import com.liferay.portal.SystemException; +import com.liferay.portal.ejb.PortletPreferencesPK; +import com.liferay.util.GetterUtil; +import com.liferay.util.Validator; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; @@ -29,22 +35,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - -import com.dotcms.repackage.javax.portlet.PortletPreferences; - -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.DocumentFactory; -import com.dotcms.repackage.org.dom4j.Element; -import com.dotcms.repackage.org.dom4j.io.OutputFormat; -import com.dotcms.repackage.org.dom4j.io.SAXReader; -import com.dotcms.repackage.org.dom4j.io.XMLWriter; - -import com.liferay.portal.PortalException; -import com.liferay.portal.SystemException; -import com.liferay.portal.ejb.PortletPreferencesPK; -import com.liferay.util.GetterUtil; -import com.liferay.util.Validator; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentFactory; +import org.dom4j.Element; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/model/AdminConfig.java b/dotCMS/src/main/java/com/liferay/portlet/admin/model/AdminConfig.java index 519451bc9d6a..3851e25dbfe0 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/model/AdminConfig.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/model/AdminConfig.java @@ -22,11 +22,10 @@ package com.liferay.portlet.admin.model; -import com.dotcms.repackage.org.exolab.castor.xml.CastorException; - import com.dotmarketing.util.Logger; import com.liferay.portal.SystemException; import com.liferay.util.xml.Serializer; +import org.exolab.castor.xml.CastorException; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/FileUtil.java b/dotCMS/src/main/java/com/liferay/util/FileUtil.java index db9a15862b79..3e620bfa3e67 100644 --- a/dotCMS/src/main/java/com/liferay/util/FileUtil.java +++ b/dotCMS/src/main/java/com/liferay/util/FileUtil.java @@ -22,7 +22,6 @@ package com.liferay.util; -import com.dotcms.repackage.org.apache.commons.codec.digest.DigestUtils; import com.dotcms.repackage.org.apache.commons.io.FileUtils; import com.dotcms.repackage.org.apache.commons.io.filefilter.TrueFileFilter; import com.dotmarketing.business.DotStateException; @@ -55,6 +54,7 @@ import java.util.List; import java.util.Properties; import javax.servlet.ServletContext; +import org.apache.commons.codec.digest.DigestUtils; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/poi/XLSTextStripper.java b/dotCMS/src/main/java/com/liferay/util/poi/XLSTextStripper.java index 4d55854acc8d..b34438a696b7 100644 --- a/dotCMS/src/main/java/com/liferay/util/poi/XLSTextStripper.java +++ b/dotCMS/src/main/java/com/liferay/util/poi/XLSTextStripper.java @@ -22,13 +22,13 @@ package com.liferay.util.poi; -import com.dotcms.repackage.org.apache.poi.hssf.usermodel.HSSFCell; -import com.dotcms.repackage.org.apache.poi.hssf.usermodel.HSSFRow; -import com.dotcms.repackage.org.apache.poi.hssf.usermodel.HSSFSheet; -import com.dotcms.repackage.org.apache.poi.hssf.usermodel.HSSFWorkbook; import com.dotmarketing.util.Logger; import java.io.InputStream; import java.util.Iterator; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/AttributeComparator.java b/dotCMS/src/main/java/com/liferay/util/xml/AttributeComparator.java index 4947484572a1..0882d0be0c03 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/AttributeComparator.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/AttributeComparator.java @@ -23,8 +23,7 @@ package com.liferay.util.xml; import java.util.Comparator; - -import com.dotcms.repackage.org.dom4j.Attribute; +import org.dom4j.Attribute; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/ElementComparator.java b/dotCMS/src/main/java/com/liferay/util/xml/ElementComparator.java index 77e7f9070f50..68497e361d76 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/ElementComparator.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/ElementComparator.java @@ -24,9 +24,8 @@ import java.util.Comparator; import java.util.List; - -import com.dotcms.repackage.org.dom4j.Attribute; -import com.dotcms.repackage.org.dom4j.Element; +import org.dom4j.Attribute; +import org.dom4j.Element; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/Serializer.java b/dotCMS/src/main/java/com/liferay/util/xml/Serializer.java index 11c90decbe10..400d45af8547 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/Serializer.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/Serializer.java @@ -22,21 +22,19 @@ package com.liferay.util.xml; +import com.dotmarketing.util.Logger; +import com.liferay.util.ListUtil; +import com.liferay.util.lang.ArrayWrapper; import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.util.List; - -import com.dotcms.repackage.org.exolab.castor.xml.CastorException; -import com.dotcms.repackage.org.exolab.castor.xml.MarshalException; -import com.dotcms.repackage.org.exolab.castor.xml.Marshaller; -import com.dotcms.repackage.org.exolab.castor.xml.Unmarshaller; -import com.dotcms.repackage.org.exolab.castor.xml.ValidationException; - -import com.dotmarketing.util.Logger; -import com.liferay.util.ListUtil; -import com.liferay.util.lang.ArrayWrapper; +import org.exolab.castor.xml.CastorException; +import org.exolab.castor.xml.MarshalException; +import org.exolab.castor.xml.Marshaller; +import org.exolab.castor.xml.Unmarshaller; +import org.exolab.castor.xml.ValidationException; /** * View Source @@ -53,13 +51,11 @@ public static Object[] readArray(String xml) throws CastorException { ArrayWrapper aw; try { aw = (ArrayWrapper)Unmarshaller.unmarshal(ArrayWrapper.class, reader); - } catch (MarshalException e) { - Logger.error(Serializer.class, e.getMessage(), e); - throw new CastorException(e.getMessage()); - } catch (ValidationException e) { + } catch (MarshalException | ValidationException e) { Logger.error(Serializer.class, e.getMessage(), e); throw new CastorException(e.getMessage()); } + return aw.getArray(); } @@ -70,10 +66,7 @@ public static String writeArray(Object[] array) throws CastorException { Writer writer = new StringWriter(); try { Marshaller.marshal(aw, writer); - } catch (MarshalException e) { - Logger.error(Serializer.class, e.getMessage(), e); - throw new CastorException(e.getMessage()); - } catch (ValidationException e) { + } catch (MarshalException | ValidationException e) { Logger.error(Serializer.class, e.getMessage(), e); throw new CastorException(e.getMessage()); } @@ -98,13 +91,10 @@ public static Object readObject(Class c, String xml) Reader reader = new StringReader(xml); - Object obj = null; + Object obj; try { - obj = (Object)Unmarshaller.unmarshal(c, reader); - } catch (MarshalException e) { - Logger.error(Serializer.class, e.getMessage(), e); - throw new CastorException(e.getMessage()); - } catch (ValidationException e) { + obj = Unmarshaller.unmarshal(c, reader); + } catch (MarshalException | ValidationException e) { Logger.error(Serializer.class, e.getMessage(), e); throw new CastorException(e.getMessage()); } @@ -117,10 +107,7 @@ public static String writeObject(Object obj) throws CastorException { try { Marshaller.marshal(obj, writer); - } catch (MarshalException e) { - Logger.error(Serializer.class, e.getMessage(), e); - throw new CastorException(e.getMessage()); - } catch (ValidationException e) { + } catch (MarshalException | ValidationException e) { Logger.error(Serializer.class, e.getMessage(), e); throw new CastorException(e.getMessage()); } diff --git a/dotCMS/src/main/java/com/liferay/util/xml/XMLElementComparator.java b/dotCMS/src/main/java/com/liferay/util/xml/XMLElementComparator.java index 3db8b701dd35..644cd406579c 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/XMLElementComparator.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/XMLElementComparator.java @@ -22,9 +22,8 @@ package com.liferay.util.xml; -import com.dotcms.repackage.org.dom4j.Element; - import com.liferay.util.xml.descriptor.XMLDescriptor; +import org.dom4j.Element; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/XMLFormatter.java b/dotCMS/src/main/java/com/liferay/util/xml/XMLFormatter.java index 3ec23926afcc..b28e2249ab0e 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/XMLFormatter.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/XMLFormatter.java @@ -22,17 +22,15 @@ package com.liferay.util.xml; +import com.liferay.util.StringUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; - -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.io.OutputFormat; -import com.dotcms.repackage.org.dom4j.io.SAXReader; -import com.dotcms.repackage.org.dom4j.io.XMLWriter; - -import com.liferay.util.StringUtil; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/XMLMerger.java b/dotCMS/src/main/java/com/liferay/util/xml/XMLMerger.java index 30f5fc22f009..624352147147 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/XMLMerger.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/XMLMerger.java @@ -22,16 +22,14 @@ package com.liferay.util.xml; +import com.liferay.util.xml.descriptor.XMLDescriptor; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Vector; - -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.Element; - -import com.liferay.util.xml.descriptor.XMLDescriptor; +import org.dom4j.Document; +import org.dom4j.Element; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/XMLMergerRunner.java b/dotCMS/src/main/java/com/liferay/util/xml/XMLMergerRunner.java index 11cc3c56ffe7..7c253c097ffa 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/XMLMergerRunner.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/XMLMergerRunner.java @@ -22,21 +22,19 @@ package com.liferay.util.xml; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; - -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.DocumentException; -import com.dotcms.repackage.org.dom4j.io.OutputFormat; -import com.dotcms.repackage.org.dom4j.io.SAXReader; -import com.dotcms.repackage.org.dom4j.io.XMLWriter; - import com.liferay.util.FileUtil; import com.liferay.util.StringUtil; import com.liferay.util.Validator; import com.liferay.util.xml.descriptor.XMLDescriptor; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/XMLTypeDetector.java b/dotCMS/src/main/java/com/liferay/util/xml/XMLTypeDetector.java index e607aff4a3d7..f571a0b2832e 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/XMLTypeDetector.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/XMLTypeDetector.java @@ -22,14 +22,13 @@ package com.liferay.util.xml; -import com.dotcms.repackage.org.dom4j.Document; - import com.liferay.util.xml.descriptor.PortletAppDescriptor; import com.liferay.util.xml.descriptor.StrictXMLDescriptor; import com.liferay.util.xml.descriptor.StrutsConfigDescriptor; import com.liferay.util.xml.descriptor.TilesDefsDescriptor; import com.liferay.util.xml.descriptor.WebXMLDescriptor; import com.liferay.util.xml.descriptor.XMLDescriptor; +import org.dom4j.Document; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/FacesXMLDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/FacesXMLDescriptor.java index 2afe546fbd27..2dd33d281322 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/FacesXMLDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/FacesXMLDescriptor.java @@ -22,9 +22,8 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; - import com.liferay.util.xml.ElementIdentifier; +import org.dom4j.Document; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/PortletAppDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/PortletAppDescriptor.java index 923dbcffe01c..6070cadd9c1d 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/PortletAppDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/PortletAppDescriptor.java @@ -22,9 +22,8 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; - import com.liferay.util.xml.ElementIdentifier; +import org.dom4j.Document; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/SimpleXMLDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/SimpleXMLDescriptor.java index 519d95b7b1ed..e83c069e5055 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/SimpleXMLDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/SimpleXMLDescriptor.java @@ -22,11 +22,10 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.Element; - import com.liferay.util.xml.ElementComparator; import com.liferay.util.xml.ElementIdentifier; +import org.dom4j.Document; +import org.dom4j.Element; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrictXMLDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrictXMLDescriptor.java index 86402d76f9d7..abd5870836e3 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrictXMLDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrictXMLDescriptor.java @@ -22,15 +22,13 @@ package com.liferay.util.xml.descriptor; -import java.util.Comparator; -import java.util.List; - -import com.dotcms.repackage.org.dom4j.Attribute; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.Element; - import com.liferay.util.xml.AttributeComparator; import com.liferay.util.xml.ElementComparator; +import java.util.Comparator; +import java.util.List; +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.Element; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrutsConfigDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrutsConfigDescriptor.java index ab4b3eb89daf..3a156ec7ed4b 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrutsConfigDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/StrutsConfigDescriptor.java @@ -22,9 +22,8 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; - import com.liferay.util.xml.ElementIdentifier; +import org.dom4j.Document; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/TilesDefsDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/TilesDefsDescriptor.java index b4d4ff936ce2..d027b522f8cb 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/TilesDefsDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/TilesDefsDescriptor.java @@ -22,9 +22,8 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; - import com.liferay.util.xml.ElementIdentifier; +import org.dom4j.Document; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/WebXMLDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/WebXMLDescriptor.java index 6eb139b1dbe2..2c00c8b57b02 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/WebXMLDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/WebXMLDescriptor.java @@ -22,9 +22,8 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; - import com.liferay.util.xml.ElementIdentifier; +import org.dom4j.Document; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/XMLDescriptor.java b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/XMLDescriptor.java index a13c89edc0d9..0362fe00537b 100644 --- a/dotCMS/src/main/java/com/liferay/util/xml/descriptor/XMLDescriptor.java +++ b/dotCMS/src/main/java/com/liferay/util/xml/descriptor/XMLDescriptor.java @@ -22,8 +22,8 @@ package com.liferay.util.xml.descriptor; -import com.dotcms.repackage.org.dom4j.Document; -import com.dotcms.repackage.org.dom4j.Element; +import org.dom4j.Document; +import org.dom4j.Element; /** * View Source diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaElement.java b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaElement.java index 1e4e7a7182ba..00dcfa5ee34e 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaElement.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaElement.java @@ -19,10 +19,10 @@ * under the License. */ -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.Namespace; -import com.dotcms.repackage.org.jdom.output.XMLOutputter; import java.util.List; +import org.jdom.Element; +import org.jdom.Namespace; +import org.jdom.output.XMLOutputter; /** * A JDOM {@link Element} that is tailored for Anakia needs. It has @@ -158,10 +158,10 @@ public String toString() * * @return a List containing the mixed content of the * element: may contain String, - * {@link Element}, {@link com.dotcms.repackage.org.jdom.Comment}, - * {@link com.dotcms.repackage.org.jdom.ProcessingInstruction}, - * {@link com.dotcms.repackage.org.jdom.CDATA}, and - * {@link com.dotcms.repackage.org.jdom.EntityRef} objects. + * {@link Element}, {@link org.jdom.Comment}, + * {@link org.jdom.ProcessingInstruction}, + * {@link org.jdom.CDATA}, and + * {@link org.jdom.EntityRef} objects. */ public List getContent() { diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java index f258ef3992eb..0da965406e8a 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java @@ -19,9 +19,9 @@ * under the License. */ -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.Namespace; -import com.dotcms.repackage.org.jdom.DefaultJDOMFactory; +import org.jdom.DefaultJDOMFactory; +import org.jdom.Element; +import org.jdom.Namespace; /** * A customized JDOMFactory for Anakia that produces {@link AnakiaElement} @@ -40,7 +40,7 @@ public AnakiaJDOMFactory() } /** - * @see com.dotcms.repackage.org.jdom.DefaultJDOMFactory#element(java.lang.String, com.dotcms.repackage.org.jdom.Namespace) + * @see org.jdom.DefaultJDOMFactory#element(java.lang.String, org.jdom.Namespace) */ public Element element(String name, Namespace namespace) { @@ -48,7 +48,7 @@ public Element element(String name, Namespace namespace) } /** - * @see com.dotcms.repackage.org.jdom.DefaultJDOMFactory#element(java.lang.String) + * @see org.jdom.DefaultJDOMFactory#element(java.lang.String) */ public Element element(String name) { @@ -56,7 +56,7 @@ public Element element(String name) } /** - * @see com.dotcms.repackage.org.jdom.DefaultJDOMFactory#element(java.lang.String, java.lang.String) + * @see org.jdom.DefaultJDOMFactory#element(java.lang.String, java.lang.String) */ public Element element(String name, String uri) { @@ -64,7 +64,7 @@ public Element element(String name, String uri) } /** - * @see com.dotcms.repackage.org.jdom.DefaultJDOMFactory#element(java.lang.String, java.lang.String, java.lang.String) + * @see org.jdom.DefaultJDOMFactory#element(java.lang.String, java.lang.String, java.lang.String) */ public Element element(String name, String prefix, String uri) { diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java index 3a4991c4a083..5234ba6807f2 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java @@ -20,11 +20,6 @@ */ import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; -import com.dotcms.repackage.org.jdom.Document; -import com.dotcms.repackage.org.jdom.JDOMException; -import com.dotcms.repackage.org.jdom.input.SAXBuilder; -import com.dotcms.repackage.org.jdom.output.Format; -import com.dotcms.repackage.org.xml.sax.SAXParseException; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -44,6 +39,11 @@ import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.util.StringUtils; +import org.jdom.Document; +import org.jdom.JDOMException; +import org.jdom.input.SAXBuilder; +import org.jdom.output.Format; +import org.xml.sax.SAXParseException; /** * The purpose of this Ant Task is to allow you to use diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/NodeList.java b/dotCMS/src/main/java/org/apache/velocity/anakia/NodeList.java index 9f8bbac5658a..1e8a5b85498a 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/NodeList.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/NodeList.java @@ -27,17 +27,16 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; - -import com.dotcms.repackage.org.jdom.Attribute; -import com.dotcms.repackage.org.jdom.CDATA; -import com.dotcms.repackage.org.jdom.Comment; -import com.dotcms.repackage.org.jdom.DocType; -import com.dotcms.repackage.org.jdom.Document; -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.EntityRef; -import com.dotcms.repackage.org.jdom.ProcessingInstruction; -import com.dotcms.repackage.org.jdom.Text; -import com.dotcms.repackage.org.jdom.output.XMLOutputter; +import org.jdom.Attribute; +import org.jdom.CDATA; +import org.jdom.Comment; +import org.jdom.DocType; +import org.jdom.Document; +import org.jdom.Element; +import org.jdom.EntityRef; +import org.jdom.ProcessingInstruction; +import org.jdom.Text; +import org.jdom.output.XMLOutputter; /** * Provides a class for wrapping a list of JDOM objects primarily for use in template diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/OutputWrapper.java b/dotCMS/src/main/java/org/apache/velocity/anakia/OutputWrapper.java index 449fd22b5953..74e1d3022713 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/OutputWrapper.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/OutputWrapper.java @@ -21,10 +21,9 @@ import java.io.IOException; import java.io.StringWriter; - -import com.dotcms.repackage.org.jdom.Element; -import com.dotcms.repackage.org.jdom.output.XMLOutputter; -import com.dotcms.repackage.org.jdom.output.Format; +import org.jdom.Element; +import org.jdom.output.Format; +import org.jdom.output.XMLOutputter; /** * This class extends XMLOutputter in order to provide diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/TreeWalker.java b/dotCMS/src/main/java/org/apache/velocity/anakia/TreeWalker.java index 865966d8a25a..a5734b8bcc42 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/TreeWalker.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/TreeWalker.java @@ -22,8 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; - -import com.dotcms.repackage.org.jdom.Element; +import org.jdom.Element; /** * This class allows you to walk a tree of JDOM Element objects. diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/XPathCache.java b/dotCMS/src/main/java/org/apache/velocity/anakia/XPathCache.java index 04652bb6f7c6..cef43d9ad210 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/XPathCache.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/XPathCache.java @@ -19,7 +19,7 @@ * under the License. */ -import com.dotcms.repackage.com.werken.xpath.XPath; +import com.werken.xpath.XPath; import java.util.Map; import java.util.WeakHashMap; diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/XPathTool.java b/dotCMS/src/main/java/org/apache/velocity/anakia/XPathTool.java index b18921e70589..0cf84bd518a2 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/XPathTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/XPathTool.java @@ -20,9 +20,8 @@ */ import java.util.List; - -import com.dotcms.repackage.org.jdom.Document; -import com.dotcms.repackage.org.jdom.Element; +import org.jdom.Document; +import org.jdom.Element; /** * This class adds an entrypoint into XPath functionality, @@ -34,8 +33,8 @@ * The W3C XPath Specification (http://www.w3.org/TR/xpath) refers * to NodeSets repeatedly, but this implementation simply uses * java.util.List to hold all Nodes. A 'Node' is any object in - * a JDOM object tree, such as an com.dotcms.repackage.org.jdom.Element, com.dotcms.repackage.org.jdom.Document, - * or com.dotcms.repackage.org.jdom.Attribute. + * a JDOM object tree, such as an org.jdom.Element, org.jdom.Document, + * or org.jdom.Attribute. *

* To use it in Velocity, do this: *

diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java b/dotCMS/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java index cd992079621f..9e44ca4f7001 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java @@ -16,12 +16,10 @@ package org.apache.velocity.tools.view; -import com.dotcms.repackage.org.apache.commons.digester.Digester; -import com.dotcms.repackage.org.apache.commons.digester.Rule; -import com.dotcms.repackage.org.apache.commons.digester.RuleSetBase; -import org.apache.velocity.tools.view.DataInfo; -import org.apache.velocity.tools.view.ViewToolInfo; -import com.dotcms.repackage.org.xml.sax.Attributes; +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.Rule; +import org.apache.commons.digester.RuleSetBase; +import org.xml.sax.Attributes; /** *

The set of Digester rules required to parse a toolbox diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java b/dotCMS/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java index 3e1a75ab8c9b..7badd40ea304 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java @@ -24,9 +24,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.digester.Digester; -import com.dotcms.repackage.org.apache.commons.digester.RuleSet; +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.RuleSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.velocity.tools.view.context.ToolboxContext; diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java b/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java index cf1d59341b35..5196a1f2c39f 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java @@ -18,9 +18,19 @@ package org.apache.velocity.tools.view.servlet; -import com.dotcms.repackage.org.apache.commons.digester.RuleSet; import com.dotmarketing.osgi.HostActivator; import com.dotmarketing.util.WebKeys; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; +import org.apache.commons.digester.RuleSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.velocity.tools.view.PrimitiveToolboxManager; @@ -29,13 +39,6 @@ import org.apache.velocity.tools.view.context.ViewContext; import org.osgi.framework.BundleContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.*; - /** *

A toolbox manager for the servlet environment.

diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java b/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java index c01cd73bdc7c..fc19356382ae 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java @@ -16,11 +16,9 @@ package org.apache.velocity.tools.view.servlet; -import com.dotcms.repackage.org.apache.commons.digester.Digester; -import com.dotcms.repackage.org.apache.commons.digester.Rule; +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.Rule; import org.apache.velocity.tools.view.ToolboxRuleSet; -import org.apache.velocity.tools.view.servlet.ServletToolboxManager; -import org.apache.velocity.tools.view.servlet.ServletToolInfo; /** *

The set of Digester rules required to parse a toolbox From 83a907a58f72ef604be8409da0d79100daf2eda9 Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Thu, 25 Jan 2018 08:10:33 -0600 Subject: [PATCH 4/6] #13482 --- dotCMS/dependencies.gradle | 9 ++-- .../provider/guava/CachePerformanceTest.java | 51 +++++++++---------- .../publisher/business/PublisherQueueJob.java | 14 ++--- .../publisher/pusher/PushPublisher.java | 10 ++-- .../cache/provider/h22/H22CacheTest.java | 15 ++---- 5 files changed, 45 insertions(+), 54 deletions(-) diff --git a/dotCMS/dependencies.gradle b/dotCMS/dependencies.gradle index a5d799f45144..c7f715e65039 100644 --- a/dotCMS/dependencies.gradle +++ b/dotCMS/dependencies.gradle @@ -116,11 +116,10 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.jython', version:'2.2.1_2' compile group: 'com.dotcms.lib', name: 'dot.ldap', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.lesscss', version:'1.5.1-SNAPSHOT_3' - compile group: 'com.dotcms.lib', name: 'dot.log4j-1.2-api', version:'2.3_1' - compile group: 'com.dotcms.lib', name: 'dot.log4j-api', version:'2.3_1' - compile group: 'com.dotcms.lib', name: 'dot.log4j-core', version:'2.3_2' - compile group: 'com.dotcms.lib', name: 'dot.log4j-jcl', version:'2.3_1' - compile group: 'com.dotcms.lib', name: 'dot.log4j-web', version:'2.3_2' + compile group: 'com.dotcms.lib', name: 'dot.log4j-api', version:'2.3_2' + compile group: 'com.dotcms.lib', name: 'dot.log4j-core', version:'2.3_3' + compile group: 'com.dotcms.lib', name: 'dot.log4j-jcl', version:'2.3_2' + compile group: 'com.dotcms.lib', name: 'dot.log4j-web', version:'2.3_3' compile group: 'com.dotcms.lib', name: 'dot.lucene-analyzers-common', version:'4.10.4_1' compile group: 'com.dotcms.lib', name: 'dot.lucene-core', version:'4.10.4_1' compile group: 'com.dotcms.lib', name: 'dot.lucene-expressions', version:'4.10.4_1' diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java b/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java index 7724811d6f13..9c07877c08b9 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java @@ -2,26 +2,22 @@ import static org.hamcrest.MatcherAssert.assertThat; +import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; +import com.dotmarketing.business.cache.provider.CacheProvider; +import com.dotmarketing.business.cache.provider.CacheProviderStats; +import com.dotmarketing.business.cache.provider.CacheStats; +import com.dotmarketing.business.cache.provider.hazelcast.HazelcastCacheProviderEmbedded; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; +import com.hazelcast.nio.serialization.HazelcastSerializationException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - -import com.dotmarketing.business.cache.provider.CacheProviderStats; -import com.dotmarketing.business.cache.provider.CacheStats; -import com.dotmarketing.util.UtilMethods; import org.junit.Test; -import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; -import com.dotcms.repackage.org.apache.log4j.Logger; -import com.dotmarketing.business.cache.provider.CacheProvider; -import com.dotmarketing.business.cache.provider.hazelcast.HazelcastCacheProviderClient; -import com.dotmarketing.business.cache.provider.hazelcast.HazelcastCacheProviderEmbedded; -import com.hazelcast.nio.serialization.HazelcastSerializationException; - - public class CachePerformanceTest { final String[] GROUPNAMES = {"testGroup", "testGroup2", "myBigGroup"}; @@ -35,7 +31,6 @@ public class CachePerformanceTest { final int numberOfThreads = 20; final int numberOfGroups = 10; final int maxCharOfObjects = 50000; - private static final Logger LOGGER = Logger.getLogger("ROOT"); private final long startTime = System.currentTimeMillis(); // Class provider = GuavaCache.class; @@ -44,10 +39,6 @@ public class CachePerformanceTest { @Test public void testInit() throws Exception { - LOGGER.info("INFO TEST"); - LOGGER.debug("DEBUG TEST"); - LOGGER.error("ERROR TEST"); - CacheProvider cache =(CacheProvider) provider.newInstance(); cache.init(); @@ -102,23 +93,31 @@ public void testInit() throws Exception { // test causing an error and recovering - LOGGER.info("Total Memory Available : " + UtilMethods.prettyByteify( Runtime.getRuntime().maxMemory())); - LOGGER.info("Memory Allocated : " + UtilMethods.prettyByteify( Runtime.getRuntime().totalMemory())); - LOGGER.info("Filled Memory : " + UtilMethods.prettyByteify( Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory() )); - LOGGER.info("Free Memory : " + UtilMethods.prettyByteify( Runtime.getRuntime().freeMemory() )); + Logger.info(this.getClass(), "Total Memory Available : " + UtilMethods + .prettyByteify(Runtime.getRuntime().maxMemory())); + Logger.info(this.getClass(), + "Memory Allocated : " + UtilMethods.prettyByteify(Runtime.getRuntime().totalMemory())); + Logger.info(this.getClass(), "Filled Memory : " + UtilMethods + .prettyByteify(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())); + Logger.info(this.getClass(), + "Free Memory : " + UtilMethods.prettyByteify(Runtime.getRuntime().freeMemory())); testMultithreaded(cache, numberOfThreads, false, true, false); - LOGGER.info("Total Memory Available : " + UtilMethods.prettyByteify( Runtime.getRuntime().maxMemory())); - LOGGER.info("Memory Allocated : " + UtilMethods.prettyByteify( Runtime.getRuntime().totalMemory())); - LOGGER.info("Filled Memory : " + UtilMethods.prettyByteify( Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory() )); - LOGGER.info("Free Memory : " + UtilMethods.prettyByteify( Runtime.getRuntime().freeMemory() )); + Logger.info(this.getClass(), "Total Memory Available : " + UtilMethods + .prettyByteify(Runtime.getRuntime().maxMemory())); + Logger.info(this.getClass(), + "Memory Allocated : " + UtilMethods.prettyByteify(Runtime.getRuntime().totalMemory())); + Logger.info(this.getClass(), "Filled Memory : " + UtilMethods + .prettyByteify(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())); + Logger.info(this.getClass(), + "Free Memory : " + UtilMethods.prettyByteify(Runtime.getRuntime().freeMemory())); CacheProviderStats pStats = cache.getStats(); Set columns = pStats.getStatColumns(); for (CacheStats cs :pStats.getStats()) { for(String col : columns){ - LOGGER.info(col + " : " + cs.getStatValue(col)); + Logger.info(this.getClass(), col + " : " + cs.getStatValue(col)); } } diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java index 43282ef4c440..d31860770b9a 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java @@ -22,7 +22,7 @@ import com.dotcms.repackage.com.google.common.collect.Sets; import com.dotcms.repackage.javax.ws.rs.client.Client; import com.dotcms.repackage.javax.ws.rs.client.WebTarget; -import com.dotcms.repackage.org.apache.log4j.MDC; +import com.dotcms.repackage.org.apache.logging.log4j.ThreadContext; import com.dotcms.rest.RestClientBuilder; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.DbConnectionFactory; @@ -134,7 +134,7 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecution + ". Publish Date: " + publishDate); tempBundleId = (String) bundle.get("bundle_id"); - MDC.put(BUNDLE_ID, BUNDLE_ID + "=" + tempBundleId); + ThreadContext.put(BUNDLE_ID, BUNDLE_ID + "=" + tempBundleId); try { PushPublishLogger.log(this.getClass(), "Pre-publish work started."); @@ -195,7 +195,7 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecution pubAPI.deleteElementsFromPublishQueueTable(pconf.getId()); } } finally { - MDC.remove(BUNDLE_ID); + ThreadContext.remove(BUNDLE_ID); } } Logger.debug(PublisherQueueJob.class, "Finished PublishQueue Job"); @@ -230,7 +230,7 @@ private void updateAuditStatus() throws DotPublisherException, DotDataException List pendingBundleAudits = pubAuditAPI.getPendingPublishAuditStatus(); // For each bundle audit for ( PublishAuditStatus bundleAudit : pendingBundleAudits ) { - MDC.put(BUNDLE_ID, BUNDLE_ID + "=" + bundleAudit.getBundleId()); + ThreadContext.put(BUNDLE_ID, BUNDLE_ID + "=" + bundleAudit.getBundleId()); try { PublishAuditHistory localHistory = bundleAudit.getStatusPojo(); @@ -248,8 +248,8 @@ private void updateAuditStatus() throws DotPublisherException, DotDataException pubAPI.deleteElementsFromPublishQueueTable(bundleAudit.getBundleId()); } } finally { - MDC.remove(BUNDLE_ID); - MDC.remove(ENDPOINT_NAME); + ThreadContext.remove(BUNDLE_ID); + ThreadContext.remove(ENDPOINT_NAME); } } } @@ -267,7 +267,7 @@ private Map> collectEndpointInfoFromRemote(f PublishingEndPoint targetEndpoint = endpointAPI.findEndPointById(endpointID); if ( targetEndpoint != null && !targetEndpoint.isSending() ) { - MDC.put(ENDPOINT_NAME, ENDPOINT_NAME + "=" + targetEndpoint.getServerName()); + ThreadContext.put(ENDPOINT_NAME, ENDPOINT_NAME + "=" + targetEndpoint.getServerName()); // Don't poll status for static publishing if (!AWSS3Publisher.PROTOCOL_AWS_S3.equalsIgnoreCase(targetEndpoint.getProtocol()) && !StaticPublisher.PROTOCOL_STATIC.equalsIgnoreCase(targetEndpoint.getProtocol())) { diff --git a/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushPublisher.java b/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushPublisher.java index 00ad32a7d09d..0ac2320a3bf7 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushPublisher.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/pusher/PushPublisher.java @@ -46,7 +46,7 @@ import com.dotcms.repackage.javax.ws.rs.core.Response; import com.dotcms.repackage.org.apache.commons.httpclient.HttpStatus; import com.dotcms.repackage.org.apache.commons.io.FileUtils; -import com.dotcms.repackage.org.apache.log4j.MDC; +import com.dotcms.repackage.org.apache.logging.log4j.ThreadContext; import com.dotcms.repackage.org.glassfish.jersey.client.ClientProperties; import com.dotcms.rest.RestClientBuilder; import com.dotcms.system.event.local.business.LocalSystemEventsAPI; @@ -223,8 +223,8 @@ public PublisherConfig process ( final PublishStatus status ) throws DotPublishi Bundle b=APILocator.getBundleAPI().getBundleById(this.config.getId()); //For logging purpose - MDC.put(ENDPOINT_NAME, ENDPOINT_NAME + "=" + endpoint.getServerName()); - MDC.put(BUNDLE_ID, BUNDLE_ID + "=" + b.getName()); + ThreadContext.put(ENDPOINT_NAME, ENDPOINT_NAME + "=" + endpoint.getServerName()); + ThreadContext.put(BUNDLE_ID, BUNDLE_ID + "=" + b.getName()); PushPublishLogger.log(this.getClass(), "Status Update: Sending Bundle"); WebTarget webTarget = client.target(endpoint.toURL()+"/api/bundlePublisher/publish") .queryParam("AUTH_TOKEN", retriveKeyString(PublicEncryptionFactory.decryptString(endpoint.getAuthKey().toString()))) @@ -276,8 +276,8 @@ public PublisherConfig process ( final PublishStatus status ) throws DotPublishi PushPublishLogger.log(this.getClass(), "Status Update: Failed to send bundle. Exception: " + e.getMessage()); } finally { CloseUtils.closeQuietly(bundleStream); - MDC.remove(ENDPOINT_NAME); - MDC.remove(BUNDLE_ID); + ThreadContext.remove(ENDPOINT_NAME); + ThreadContext.remove(BUNDLE_ID); } if (isHistoryEmpty || failedEnvironment) { currentStatusHistory.addOrUpdateEndpoint(environment.getId(), endpoint.getId(), detail); diff --git a/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java b/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java index c8e887077352..d622483616e1 100644 --- a/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java +++ b/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java @@ -1,10 +1,9 @@ package com.dotmarketing.business.cache.provider.h22; +import static org.hamcrest.MatcherAssert.assertThat; + import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; -import com.dotcms.repackage.org.apache.log4j.Logger; import com.liferay.util.FileUtil; -import org.junit.Test; - import java.io.File; import java.sql.Connection; import java.sql.SQLException; @@ -15,8 +14,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; public class H22CacheTest { @@ -36,15 +34,10 @@ public class H22CacheTest { final int numberOfThreads = 40; final int numberOfGroups = 100; final int maxCharOfObjects = 100; - private static final Logger LOGGER = Logger.getLogger(H22CacheTest.class); - - @Test public void testInit() throws Exception { - LOGGER.info("INFO TEST"); - LOGGER.debug("DEBUG TEST"); - LOGGER.error("ERROR TEST"); + // File dir = Files.createTempDir(); File dir = new File("/tmp/h2cachetest"); dir.delete(); From 29d3eb4abd108a23c4504c07ecbffbc8a59c56cb Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Fri, 26 Jan 2018 13:50:19 -0600 Subject: [PATCH 5/6] dotCMS/core#13482 --- dotCMS/dependencies.gradle | 100 +++++++---- .../java/com/dotcms/IntegrationTestBase.java | 2 +- .../test/ContentTypeAPIImplTest.java | 2 +- .../contenttype/test/DeleteFieldJobTest.java | 15 +- .../business/NotificationAPITest.java | 16 +- .../util/IntegrationTestInitService.java | 10 +- .../dotcms/uuid/shorty/TestShortyIdApi.java | 18 +- .../provider/guava/CachePerformanceTest.java | 2 +- .../dotmarketing/db/HibernateUtilTest.java | 18 +- .../containers/business/ContainerAPITest.java | 2 +- .../business/ContentletAPITest.java | 5 +- .../quartz/job/DeleteFieldJobTest.java | 15 +- .../java/com/ettrema/httpclient/Resource.java | 6 +- .../java/com/liferay/util/LocaleUtilTest.java | 11 +- .../api/system/user/UserServiceFactory.java | 21 ++- ...onWebTokenAuthCredentialProcessorImpl.java | 5 +- .../AbstractHazelcastCacheTransport.java | 4 +- .../cluster/business/HazelcastUtil.java | 3 +- .../concurrent/DotConcurrentFactory.java | 21 ++- .../config/DotInitializationService.java | 13 +- .../business/ESContentFactoryImpl.java | 78 +++++---- .../business/ESContentletAPIHelper.java | 12 +- .../business/ESContentletAPIImpl.java | 6 +- .../elasticsearch/business/ESIndexHelper.java | 15 +- .../business/ESMappingAPIImpl.java | 43 +++-- .../content/elasticsearch/util/ESUtils.java | 2 +- .../business/ContentTypeFactoryImpl.java | 31 +++- .../contenttype/business/FieldAPIImpl.java | 7 +- .../business/FieldFactoryImpl.java | 28 +++- .../sql/FixTaskFixStructureTable.java | 10 +- .../dotcms/contenttype/model/field/Field.java | 24 +-- .../model/field/FieldVariable.java | 14 +- .../model/field/SelectableValuesField.java | 10 +- .../contenttype/model/type/ContentType.java | 25 ++- .../transform/field/DbFieldTransformer.java | 16 +- .../field/LegacyFieldTransformer.java | 13 +- ...ltFrontEndLoginRequiredWebInterceptor.java | 9 +- .../AbstractIntegrityChecker.java | 21 ++- .../RoleIntegrityChecker.java | 6 +- .../notifications/NotificationConverter.java | 9 +- .../business/NotificationAPIImpl.java | 19 ++- .../business/PublishAuditHistory.java | 9 +- .../publisher/business/PublisherAPIImpl.java | 34 ++-- .../publisher/receiver/BundlePublisher.java | 2 +- .../publisher/util/DependencyManager.java | 2 +- .../dotcms/publisher/util/DependencySet.java | 15 +- .../publisher/util/PushCategoryUtil.java | 4 +- .../com/dotcms/publishing/BundlerUtil.java | 7 +- .../publishing/DotPrettyPrintWriter.java | 7 +- .../java/com/dotcms/publishing/Publisher.java | 2 +- .../velocity/services/DotResourceLoader.java | 5 +- .../velocity/viewtools/ContentsWebAPI.java | 30 ++-- .../velocity/viewtools/MessagesTools.java | 4 +- .../velocity/viewtools/content/BinaryMap.java | 5 +- .../viewtools/content/CheckboxMap.java | 8 +- .../viewtools/content/ContentMap.java | 27 +-- .../viewtools/content/FileAssetMap.java | 5 +- .../viewtools/content/MultiSelectMap.java | 8 +- .../content/PaginatedContentList.java | 2 +- .../velocity/viewtools/content/RadioMap.java | 7 +- .../velocity/viewtools/content/SelectMap.java | 8 +- .../java/com/dotcms/rest/BundleResource.java | 2 +- .../java/com/dotcms/rest/ContentResource.java | 60 ++++--- .../com/dotcms/rest/EnvironmentResource.java | 2 +- .../java/com/dotcms/rest/OSGIResource.java | 6 +- .../java/com/dotcms/rest/TestResource.java | 4 +- .../java/com/dotcms/rest/WebResource.java | 11 +- .../dotcms/rest/annotation/HeaderFilter.java | 7 +- .../dotcms/rest/annotation/RequestFilter.java | 15 +- .../AuthenticationResource.java | 15 +- .../ResetPasswordTokenUtil.java | 4 +- .../api/v1/container/ContainerResource.java | 13 +- .../rest/api/v1/folder/FolderHelper.java | 4 - .../dotcms/rest/api/v1/menu/MenuResource.java | 14 +- .../dotcms/rest/api/v1/site/SiteHelper.java | 13 +- .../dotcms/rest/api/v1/site/SiteResource.java | 10 +- .../sites/ruleengine/rules/RuleTransform.java | 15 +- .../actions/RuleActionParameterTransform.java | 5 +- .../rules/actions/RuleActionTransform.java | 7 +- .../conditions/ConditionGroupTransform.java | 5 +- .../rules/conditions/ConditionTransform.java | 3 +- .../conditions/ParameterModelTransform.java | 2 +- .../rest/api/v1/system/i18n/I18NResource.java | 3 +- .../rest/api/v1/user/UserResourceHelper.java | 23 ++- .../dotcms/rest/validation/Preconditions.java | 2 +- .../main/java/com/dotcms/tika/TikaUtils.java | 51 ++++-- .../translate/GoogleTranslationService.java | 5 +- .../java/com/dotcms/util/AnnotationUtils.java | 9 +- .../util/ConfigurationInterpolator.java | 3 +- .../java/com/dotcms/util/ContentTypeUtil.java | 12 +- .../com/dotcms/util/DotPreconditions.java | 2 +- .../com/dotcms/util/HttpRequestDataUtil.java | 10 +- .../java/com/dotcms/util/LogTimeUtil.java | 3 +- .../java/com/dotcms/util/PaginationUtil.java | 18 +- ...mEnvironmentConfigurationInterpolator.java | 9 +- .../java/com/dotcms/util/UrlStrategyUtil.java | 5 +- .../pagination/ContentTypesPaginator.java | 2 +- .../dotcms/util/pagination/SitePaginator.java | 4 +- .../vanityurl/action/ViewVanityURLAction.java | 6 +- .../vanityurl/business/VanityUrlAPIImpl.java | 23 +-- .../vanityurl/model/CacheVanityKey.java | 3 +- .../model/SecondaryCacheVanityKey.java | 3 +- .../workflow/helper/WorkflowHelper.java | 7 +- .../com/dotcms/xmlsitemap/XMLSitemapJob.java | 16 +- .../com/dotmarketing/beans/MultiTree.java | 7 +- .../com/dotmarketing/beans/Permission.java | 10 +- .../dotmarketing/beans/PermissionAsset.java | 5 +- .../beans/PermissionReference.java | 7 +- .../java/com/dotmarketing/beans/Tree.java | 9 +- .../dotmarketing/business/BlockPageCache.java | 2 +- .../business/RoleFactoryImpl.java | 23 ++- .../dotmarketing/business/UserAPIImpl.java | 11 +- .../business/UserFactoryLiferayImpl.java | 2 - .../business/UserProxyFactoryImpl.java | 10 +- .../business/VersionableFactoryImpl.java | 11 +- .../business/cache/provider/h22/H22Cache.java | 28 ++-- .../cache/provider/redis/RedisProvider.java | 29 +++- .../jgroups/JGroupsCacheTransport.java | 4 +- .../business/query/QueryUtil.java | 22 +-- .../com/dotmarketing/cms/SecureAction.java | 2 +- .../cms/comment/action/CommentsAction.java | 36 ++-- .../cms/comment/struts/CommentsForm.java | 18 +- .../submit/action/SubmitContentAction.java | 32 ++-- .../action/CreateAccountAction.java | 27 ++- .../struts/CreateAccountForm.java | 19 +-- .../action/ForgotPasswordAction.java | 27 ++- .../struts/ForgotPasswordForm.java | 14 +- .../cms/login/action/LoginAction.java | 26 ++- .../cms/login/action/LogoutAction.java | 19 +-- .../cms/login/struts/LoginForm.java | 10 +- .../action/AccountActivationAction.java | 26 ++- .../cms/myaccount/action/AddressAction.java | 1 - .../cms/myaccount/action/MyAccountAction.java | 24 ++- .../myaccount/action/MyInterestsAction.java | 25 ++- .../cms/myaccount/struts/MyAccountForm.java | 11 +- .../webforms/action/SubmitWebFormAction.java | 35 ++-- .../dotmarketing/common/db/DotConnect.java | 38 +++-- .../com/dotmarketing/common/util/SQLUtil.java | 4 +- .../comparators/ContentComparator.java | 6 +- .../dotmarketing/db/DotSQLGeneratorTask.java | 29 ++-- .../com/dotmarketing/db/HibernateUtil.java | 34 ++-- .../db/LowercaseNamingStrategy.java | 2 +- .../com/dotmarketing/db/NoCacheProvider.java | 19 +-- .../dotmarketing/factories/EmailFactory.java | 2 +- .../dotmarketing/factories/InodeFactory.java | 12 +- .../factories/PermissionGenerator.java | 5 +- .../filters/CharsetEncodingFilter.java | 26 ++- .../filters/DotUrlRewriteFilter.java | 11 +- .../filters/ThreadNameFilter.java | 14 +- ...ask00001CheckAssetsMissingIdentifiers.java | 10 +- ...sk00003CheckContainersInconsistencies.java | 4 +- ...FixTask00006CheckLinksInconsistencies.java | 4 +- ...ask00007CheckTemplatesInconsistencies.java | 4 +- .../FixTask00008CheckTreeInconsistencies.java | 4 +- ...00009CheckContentletsInexistentInodes.java | 4 +- ...ask00011RenameHostInFieldVariableName.java | 4 +- .../tasks/FixTask00012UpdateAssetsHosts.java | 4 +- ...FixTask00020DeleteOrphanedIdentifiers.java | 4 +- .../FixTask00030DeleteOrphanedAssets.java | 4 +- ...xTask00050FixInodesWithoutContentlets.java | 4 +- .../tasks/FixTask00060FixAssetType.java | 4 +- ...k00080DeleteOrphanedContentTypeFields.java | 4 +- ...090RecreateMissingFoldersInParentPath.java | 4 +- ...FixTask00095DeleteOrphanRelationships.java | 31 ++-- .../business/ConsoleLogFactoryImpl.java | 3 +- .../logConsole/form/ConsoleLogForm.java | 2 +- .../logConsole/model/LogMapperRow.java | 3 +- .../com/dotmarketing/osgi/ActivatorUtil.java | 6 +- .../osgi/GenericBundleActivator.java | 14 +- .../plugin/model/PluginProperty.java | 5 +- .../portal/struts/DotPortletAction.java | 31 ++-- .../struts/DotPortletActionInterface.java | 4 +- .../browser/action/ViewBrowserAction.java | 15 +- .../calendar/action/EditEventAction.java | 25 ++- .../calendar/action/SendVCalendarDetail.java | 21 +-- .../calendar/action/ViewCalendarAction.java | 10 +- .../cms/action/CalendarReminderAction.java | 14 +- .../calendar/cms/struts/EventForm.java | 17 +- .../calendar/struts/CalendarReminderForm.java | 2 +- .../portlets/calendar/struts/EventForm.java | 9 +- .../categories/action/EditCategoryAction.java | 12 +- .../action/ViewCategoriesAction.java | 8 +- .../categories/action/ViewCategoryAction.java | 16 +- .../business/CategoryFactoryImpl.java | 4 +- .../portlets/categories/model/Category.java | 19 +-- .../categories/struts/CategoryForm.java | 20 +-- .../action/ViewCMSMaintenanceAction.java | 20 +-- .../ajax/CMSMaintenanceAjax.java | 14 +- .../struts/CmsMaintenanceForm.java | 6 +- .../util/CleanAssetsThread.java | 10 +- .../action/EditContainerAction.java | 26 ++- .../action/PublishContainersAction.java | 9 +- .../action/ViewContainersAction.java | 21 +-- .../portlets/containers/model/Container.java | 10 +- .../containers/struts/ContainerForm.java | 15 +- .../action/EditContentletAction.java | 62 ++++--- .../contentlet/action/ImportAuditUtil.java | 15 +- .../action/ImportContentletsAction.java | 4 +- .../action/ViewContentletAction.java | 16 +- .../contentlet/business/Contentlet.java | 29 ++-- .../contentlet/business/HostAPIImpl.java | 5 +- .../business/web/ContentletWebAPIImpl.java | 29 ++-- .../portlets/contentlet/model/Contentlet.java | 21 ++- .../contentlet/struts/ContentletForm.java | 28 ++-- .../struts/ImportContentletsForm.java | 7 +- .../dashboard/action/ViewDashboardAction.java | 33 ++-- .../dashboard/model/DashboardSummary.java | 5 +- .../portlets/dashboard/model/HostWrapper.java | 9 +- .../director/action/DirectorAction.java | 18 +- .../portlets/fileUpload/model/FileUpload.java | 10 +- .../action/UploadMultipleFilesAction.java | 10 +- .../portlets/files/struts/FileForm.java | 22 +-- .../folders/action/EditFolderAction.java | 17 +- .../folders/action/OrderMenuAction.java | 27 +-- .../folders/action/PublishFolderAction.java | 11 +- .../folders/business/FolderAPIImpl.java | 29 +++- .../folders/business/FolderFactoryImpl.java | 9 +- .../portlets/folders/model/Folder.java | 14 +- .../portlets/folders/struts/FolderForm.java | 10 +- .../portlets/folders/struts/HostForm.java | 3 +- .../form/action/ViewFormHandlerAction.java | 19 +-- .../hostadmin/action/ViewHostsAction.java | 9 +- .../bussiness/HostVariableFactoryImpl.java | 11 +- .../action/PreviewHTMLPageAction.java | 9 +- .../action/PublishHTMLPagesAction.java | 12 +- .../action/HTMLPageReportAction.java | 24 ++- .../action/ViewHTMLPageViewsAction.java | 9 +- .../action/EditLanguageAction.java | 12 +- .../action/EditLanguageKeysAction.java | 21 +-- .../action/ViewLanguageAction.java | 13 +- .../business/LanguageAPIImpl.java | 12 +- .../business/LanguageFactoryImpl.java | 13 +- .../languagesmanager/model/Language.java | 5 +- .../languagesmanager/struts/LanguageForm.java | 10 +- .../portlets/links/action/EditLinkAction.java | 18 +- .../links/action/PublishLinksAction.java | 9 +- .../links/action/ViewLinksAction.java | 12 +- .../portlets/links/struts/LinkForm.java | 12 +- .../report/action/EditReportAction.java | 15 +- .../report/action/RunReportAction.java | 49 +++--- .../report/action/ViewReportsAction.java | 23 ++- .../portlets/report/struts/ReportForm.java | 16 +- .../roleadmin/action/ViewRolesAction.java | 8 +- .../rules/actionlet/PersonaActionlet.java | 2 +- .../SetRequestAttributeActionlet.java | 2 +- .../actionlet/SetResponseHeaderActionlet.java | 2 +- .../SetSessionAttributeActionlet.java | 2 +- .../conditionlet/PersonaConditionlet.java | 26 +-- .../conditionlet/VisitedUrlConditionlet.java | 2 +- .../rules/parameter/ParameterDefinition.java | 2 +- .../parameter/comparison/Comparison.java | 6 +- .../parameter/display/DropdownInput.java | 2 - .../rules/parameter/type/DataType.java | 2 +- .../rules/parameter/type/NumericType.java | 2 +- .../StandardConstraintFunctions.java | 2 +- .../scheduler/action/EditSchedulerAction.java | 21 ++- .../action/ViewSchedulersAction.java | 18 +- .../scheduler/struts/SchedulerForm.java | 11 +- .../structure/action/EditFieldAction.java | 20 +-- .../action/EditRelationshipAction.java | 14 +- .../structure/action/EditStructureAction.java | 20 +-- .../action/ViewRelationshipsAction.java | 11 +- .../structure/action/ViewStructureAction.java | 17 +- .../portlets/structure/model/Field.java | 10 +- .../portlets/structure/model/Structure.java | 13 +- .../portlets/structure/struts/FieldForm.java | 21 +-- .../structure/struts/RelationshipForm.java | 14 +- .../structure/struts/StructureForm.java | 14 +- .../templates/action/EditTemplateAction.java | 24 ++- .../action/PublishTemplatesAction.java | 9 +- .../templates/action/ViewTemplatesAction.java | 15 +- .../business/TemplateFactoryImpl.java | 14 +- .../templates/model/TemplateWrapper.java | 6 +- .../templates/struts/TemplateForm.java | 15 +- .../action/EditUserAdditionalInfoAction.java | 6 +- .../user/action/EditUserCategoriesAction.java | 9 +- .../user/action/EditUserCommentAction.java | 13 +- .../user/action/EditUserPreferenceAction.java | 9 +- .../user/action/EditUserProxyAction.java | 11 +- .../user/action/ViewUserCommentsAction.java | 15 +- .../user/struts/UserAdditionalInfoForm.java | 3 +- .../user/struts/UserCategoriesForm.java | 2 +- .../user/struts/UserCommentsForm.java | 6 +- .../useradmin/action/ViewUsersAction.java | 8 +- .../action/ViewUserClicksAction.java | 19 +-- .../action/EditUserManagerAction.java | 30 ++-- .../UserManagerPropertiesFactory.java | 2 +- .../usermanager/struts/UserManagerForm.java | 15 +- .../struts/UserManagerListSearchForm.java | 17 +- .../action/GenerateWebFormsReportAction.java | 19 +-- .../webforms/action/ViewWebFormsAction.java | 8 +- .../struts/WorkflowMessageForm.java | 15 +- .../action/EditWorkflowTaskAction.java | 19 +-- .../action/ViewWorkflowTasksAction.java | 14 +- .../workflows/ajax/WfRoleStoreAjax.java | 12 +- .../portlets/workflows/ajax/WfSchemeAjax.java | 13 +- .../business/WorkflowFactoryImpl.java | 29 +++- .../workflows/model/WorkflowComment.java | 6 +- .../workflows/model/WorkflowHistory.java | 6 +- .../workflows/model/WorkflowTask.java | 6 +- .../workflows/struts/WorkflowCommentForm.java | 13 +- .../workflows/struts/WorkflowHistoryForm.java | 13 +- .../workflows/struts/WorkflowTaskForm.java | 13 +- .../servlets/BinaryExporterServlet.java | 37 ++++- .../dotmarketing/servlets/InitServlet.java | 51 +++--- .../servlets/JSONCategoriesServlet.java | 32 ++-- .../servlets/JSONTagsServlet.java | 29 ++-- .../startup/AbstractJDBCStartupTask.java | 19 +-- .../Task03540UpdateTagInodesReferences.java | 3 +- ...RemoveDeleteInactiveClusterServersJob.java | 5 +- .../Task04305UpdateWorkflowActionTable.java | 3 +- .../struts/PortalRequestProcessor.java | 2 +- .../java/com/dotmarketing/util/Config.java | 6 +- .../java/com/dotmarketing/util/DateUtil.java | 9 +- .../util/HibernateCollectionConverter.java | 8 +- .../util/HibernateMapConverter.java | 6 +- .../dotmarketing/util/ImportExportUtil.java | 10 +- .../dotmarketing/util/MaintenanceUtil.java | 24 ++- .../java/com/dotmarketing/util/MenuItem.java | 2 +- .../java/com/dotmarketing/util/OSGIUtil.java | 4 + .../java/com/dotmarketing/util/RegEX.java | 22 ++- .../com/dotmarketing/util/StringUtils.java | 17 +- .../com/dotmarketing/util/UUIDGenerator.java | 10 +- .../com/dotmarketing/util/UtilMethods.java | 13 +- .../java/com/dotmarketing/util/Validator.java | 14 +- .../java/com/dotmarketing/util/XMLUtils.java | 2 +- .../dotmarketing/util/json/JSONObject.java | 11 +- .../dotmarketing/webdav/DotWebdavHelper.java | 26 ++- .../com/liferay/portal/PortalException.java | 2 +- .../com/liferay/portal/SystemException.java | 2 +- .../portal/action/ChangePasswordAction.java | 18 +- .../liferay/portal/action/LayoutAction.java | 24 ++- .../liferay/portal/action/LoginAction.java | 23 ++- .../liferay/portal/action/LoginAsAction.java | 16 +- .../liferay/portal/action/LogoutAction.java | 13 +- .../liferay/portal/action/LogoutAsAction.java | 14 +- .../portal/ejb/AddressPersistence.java | 18 +- .../liferay/portal/ejb/BasePersistence.java | 7 +- .../portal/ejb/CompanyPersistence.java | 14 +- .../liferay/portal/ejb/ImageLocalUtil.java | 13 +- .../liferay/portal/ejb/ImagePersistence.java | 14 +- .../ejb/PasswordTrackerPersistence.java | 18 +- .../portal/ejb/PortletPersistence.java | 18 +- .../ejb/PortletPreferencesPersistence.java | 18 +- .../portal/ejb/ReleasePersistence.java | 14 +- .../liferay/portal/ejb/UserPersistence.java | 20 +-- .../ejb/UserTrackerPathPersistence.java | 18 +- .../portal/ejb/UserTrackerPersistence.java | 18 +- .../portal/events/LoginPostAction.java | 17 +- .../portal/events/ServicePreAction.java | 17 +- .../com/liferay/portal/form/LayoutForm.java | 6 +- .../liferay/portal/language/LanguageUtil.java | 8 +- .../liferay/portal/model/AddressModel.java | 10 +- .../com/liferay/portal/pwd/RegExpToolkit.java | 9 +- .../liferay/portal/servlet/MainServlet.java | 6 +- .../com/liferay/portal/struts/Handler.java | 9 +- .../struts/InitializableActionForm.java | 3 +- .../portal/struts/MultiMessageResources.java | 17 +- .../struts/MultiMessageResourcesFactory.java | 4 +- .../portal/struts/PortalRequestProcessor.java | 42 +++-- .../liferay/portal/struts/PortletAction.java | 16 +- .../portal/struts/PortletActionServlet.java | 10 +- .../struts/PortletRequestProcessor.java | 35 ++-- .../portal/struts/StrutsURLEncoder.java | 11 +- .../com/liferay/portal/struts/StxxPlugin.java | 7 +- .../portal/util/HibernateConfiguration.java | 8 +- .../portal/util/HibernateConfiguration2.java | 8 +- .../liferay/portal/util/HibernateUtil.java | 7 +- .../com/liferay/portal/util/PortalUtil.java | 41 +++-- .../portlet/PortletRequestDispatcherImpl.java | 19 +-- .../liferay/portlet/RenderRequestImpl.java | 27 ++- .../com/liferay/portlet/StrutsPortlet.java | 25 ++- .../admin/action/CustomEditPortletAction.java | 6 +- .../admin/action/DeleteUserAction.java | 11 +- .../admin/action/EditPortletAction.java | 13 +- .../admin/action/EditUserProfileAction.java | 8 +- .../admin/action/KillSessionAction.java | 18 +- .../admin/action/NotifyNewUsersAction.java | 10 +- .../portlet/admin/action/ServerAction.java | 7 +- .../admin/action/UpdateUserConfigAction.java | 10 +- .../admin/ejb/AdminConfigPersistence.java | 18 +- dotCMS/src/main/java/com/liferay/util/JS.java | 3 +- .../java/com/liferay/util/LocaleUtil.java | 10 +- .../com/liferay/util/PropertyComparator.java | 6 +- .../java/com/liferay/util/PwdGenerator.java | 2 +- .../src/main/java/com/liferay/util/Xss.java | 8 +- .../util/dao/hibernate/BooleanType.java | 7 +- .../dao/hibernate/DSConnectionProvider.java | 9 +- .../util/dao/hibernate/DoubleType.java | 7 +- .../util/dao/hibernate/DynamicDialect.java | 41 +++-- .../liferay/util/dao/hibernate/FloatType.java | 7 +- .../util/dao/hibernate/IntegerType.java | 7 +- .../liferay/util/dao/hibernate/LongType.java | 7 +- .../dao/hibernate/SessionConfiguration.java | 11 +- .../liferay/util/dao/hibernate/ShortType.java | 7 +- .../util/mail/MailEngineException.java | 2 +- .../apache/velocity/anakia/AnakiaTask.java | 2 +- .../org/apache/velocity/app/Velocity.java | 6 +- .../apache/velocity/app/VelocityEngine.java | 6 +- .../event/implement/EscapeHtmlReference.java | 2 +- .../implement/EscapeJavaScriptReference.java | 2 +- .../app/event/implement/EscapeReference.java | 7 +- .../event/implement/EscapeSqlReference.java | 2 +- .../event/implement/EscapeXmlReference.java | 2 +- .../org/apache/velocity/convert/WebMacro.java | 5 +- .../org/apache/velocity/runtime/Runtime.java | 16 +- .../velocity/runtime/RuntimeInstance.java | 10 +- .../velocity/runtime/RuntimeServices.java | 3 +- .../velocity/runtime/RuntimeSingleton.java | 3 +- .../velocity/runtime/VelocimacroFactory.java | 11 +- .../velocity/runtime/directive/Block.java | 6 +- .../runtime/directive/RuntimeMacro.java | 10 +- .../velocity/runtime/parser/Parser.java | 59 ++++++- .../runtime/parser/ParserTokenManager.java | 14 +- .../runtime/parser/node/ASTDirective.java | 8 +- .../runtime/parser/node/ASTMethod.java | 10 +- .../runtime/parser/node/ASTStringLiteral.java | 8 +- .../runtime/parser/node/NodeUtils.java | 2 +- .../runtime/parser/node/PropertyExecutor.java | 6 +- .../parser/node/SetPropertyExecutor.java | 8 +- .../runtime/resource/ResourceCacheImpl.java | 6 +- .../runtime/resource/ResourceManagerImpl.java | 12 +- .../loader/ClasspathResourceLoader.java | 8 +- .../loader/DataSourceResourceLoader.java | 9 +- .../resource/loader/FileResourceLoader.java | 6 +- .../resource/loader/JarResourceLoader.java | 17 +- .../resource/loader/ResourceLoader.java | 10 +- .../resource/loader/StringResourceLoader.java | 15 +- .../resource/loader/URLResourceLoader.java | 13 +- .../apache/velocity/texen/ant/TexenTask.java | 2 +- .../velocity/tools/generic/EscapeTool.java | 2 +- .../velocity/tools/generic/MathTool.java | 2 +- .../velocity/tools/generic/SortTool.java | 8 +- .../tools/struts/ActionMessagesTool.java | 7 +- .../velocity/tools/struts/ErrorsTool.java | 4 +- .../velocity/tools/struts/FormTool.java | 11 +- .../tools/struts/MessageResourcesTool.java | 4 +- .../velocity/tools/struts/MessageTool.java | 2 +- .../velocity/tools/struts/SecureLinkTool.java | 10 +- .../velocity/tools/struts/StrutsUtils.java | 29 ++-- .../velocity/tools/struts/TilesTool.java | 29 ++-- .../velocity/tools/struts/ValidatorTool.java | 32 ++-- .../velocity/tools/view/tools/LinkTool.java | 6 +- .../velocity/util/introspection/ClassMap.java | 5 +- dotCMS/src/main/resources/stxx.properties | 28 ++-- dotCMS/src/main/resources/system.properties | 2 +- .../main/webapp/WEB-INF/jsp/rules/include.jsp | 2 +- .../main/webapp/WEB-INF/jsp/rules/render.jsp | 2 +- .../WEB-INF/jsp/tag_manager/tag_manager.jsp | 4 +- .../src/main/webapp/WEB-INF/struts-config.xml | 4 +- .../webapp/WEB-INF/tld/old/struts-html.tld | 58 +++---- .../webapp/WEB-INF/tld/old/struts-logic.tld | 36 ++-- .../webapp/WEB-INF/tld/old/struts-nested.tld | 90 +++++----- .../main/webapp/WEB-INF/tld/struts-html.tld | 58 +++---- .../main/webapp/WEB-INF/tld/struts-logic.tld | 36 ++-- .../main/webapp/WEB-INF/tld/struts-nested.tld | 90 +++++----- .../main/webapp/WEB-INF/tld/struts-tiles.tld | 22 +-- .../main/webapp/WEB-INF/validator-rules.xml | 156 +++++++++--------- .../main/webapp/html/common/init-basic.jsp | 2 +- dotCMS/src/main/webapp/html/common/init.jsp | 6 +- .../main/webapp/html/common/messages_inc.jsp | 14 +- .../main/webapp/html/common/top_js_inc.jsp | 2 +- dotCMS/src/main/webapp/html/portal/init.jsp | 6 +- .../webapp/html/portal/view_portlet_inc.jsp | 2 +- .../html/portlet/ext/cmsconfig/license.jsp | 2 +- .../contentlet/contentlet_actions_wrapper.jsp | 4 +- .../ext/contentlet/field/edit_field.jsp | 4 +- .../ext/contentlet/order_contentlets.jsp | 2 +- .../publishing/edit_publish_bundle.jsp | 2 +- .../publishing/view_publish_audit_list.jsp | 2 +- .../publishing/view_publish_content_list.jsp | 2 +- .../publishing/view_publish_queue_list.jsp | 2 +- .../publishing/view_unpushed_bundles.jsp | 2 +- .../ext/dashboard/host_properties_tab_inc.jsp | 2 +- .../rel_content_properties_tab_inc.jsp | 2 +- .../portlet/ext/usermanager/load_users.jsp | 2 +- .../ext/usermanager/search_form_inc.jsp | 2 +- .../portlet/ext/workflows/view_tasks_list.jsp | 2 +- .../business/ESIndexHelperTest.java | 12 +- .../java/com/dotcms/rest/RestUtilTest.java | 19 ++- .../ForgotPasswordResourceTest.java | 32 ++-- .../rest/api/v1/site/SiteResourceTest.java | 29 ++-- .../rest/api/v1/user/UserResourceTest.java | 25 ++- .../cache/provider/h22/H22CacheTest.java | 2 +- .../util/BaseMessageResources.java | 10 +- 485 files changed, 3027 insertions(+), 3481 deletions(-) diff --git a/dotCMS/dependencies.gradle b/dotCMS/dependencies.gradle index c7f715e65039..5f153b8c20df 100644 --- a/dotCMS/dependencies.gradle +++ b/dotCMS/dependencies.gradle @@ -27,34 +27,28 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.cactus.integration.ant', version:'1.8.0_2' compile group: 'com.dotcms.lib', name: 'dot.cargo-ant', version:'0.9_2' compile group: 'com.dotcms.lib', name: 'dot.cargo-core-uberjar', version:'0.9_2' - compile group: 'com.dotcms.lib', name: 'dot.cglib-nodep', version:'2.2_2' compile group: 'com.dotcms.lib', name: 'dot.com.dotmarketing.jhlabs.images.filters', version:'ukv_2' - compile group: 'com.dotcms.lib', name: 'dot.commons-beanutils', version:'1.6.1_2' compile group: 'com.dotcms.lib', name: 'dot.commons-cli', version:'1.2_2' - compile group: 'com.dotcms.lib', name: 'dot.commons-collections', version:'3.2_2' - compile group: 'com.dotcms.lib', name: 'dot.commons-configuration', version:'1.0_2' compile group: 'com.dotcms.lib', name: 'dot.commons-dbcp', version:'1.3_2' compile group: 'com.dotcms.lib', name: 'dot.commons-fileupload', version:'1.2_2' compile group: 'com.dotcms.lib', name: 'dot.commons-httpclient', version:'3.1_2' compile group: 'com.dotcms.lib', name: 'dot.commons-io', version:'2.0.1_2' compile group: 'com.dotcms.lib', name: 'dot.commons-jci-core', version:'1.0.406301_2' compile group: 'com.dotcms.lib', name: 'dot.commons-jci-eclipse', version:'3.2.0.666_2' - compile group: 'com.dotcms.lib', name: 'dot.commons-lang', version:'2.4_2' compile group: 'com.dotcms.lib', name: 'dot.commons-net', version:'3.3_2' compile group: 'com.dotcms.lib', name: 'dot.commons-pool', version:'1.5.4_2' - compile group: 'com.dotcms.lib', name: 'dot.commons-validator', version:'1.1.3_2' compile group: 'com.dotcms.lib', name: 'dot.compression-filter', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.concurrent', version:'1.3.4_2' compile group: 'com.dotcms.lib', name: 'dot.core-renderer-modified', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.cos', version:'ukv_2' - compile group: 'com.dotcms.lib', name: 'dot.counter-ejb', version:'ukv_2' + compile group: 'com.dotcms.lib', name: 'dot.counter-ejb', version:'ukv_3' compile group: 'com.dotcms.lib', name: 'dot.daisydiff', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.dnsjava', version:'2.0.8_2' compile group: 'com.dotcms.lib', name: 'dot.drools-compiler', version:'3.0.5_2' compile group: 'com.dotcms.lib', name: 'dot.drools-core', version:'3.0.5_2' compile group: 'com.dotcms.lib', name: 'dot.drools-decisiontables', version:'3.0.5_2' compile group: 'com.dotcms.lib', name: 'dot.drools-jsr94', version:'3.0.5_2' - compile group: 'com.dotcms.lib', name: 'dot.dwr', version:'3rc2modified_2' + compile group: 'com.dotcms.lib', name: 'dot.dwr', version:'3rc2modified_3' compile group: 'com.dotcms.lib', name: 'dot.elasticsearch', version:'1.7.3_1' compile group: 'com.dotcms.lib', name: 'dot.fileupload-ext', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.fop', version:'0.20.1_3' @@ -65,7 +59,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.hadoop-dev-core', version:'0.20.3_2' compile group: 'com.dotcms.lib', name: 'dot.hadoop-dev-tools', version:'0.20.3_2' compile group: 'com.hazelcast', name: 'hazelcast-all', version: '3.9.2' - compile group: 'com.dotcms.lib', name: 'dot.hibernate', version:'2.1.7_2' compile group: 'com.dotcms.lib', name: 'dot.httpbridge', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.httpclient', version:'4.2.2_2' compile group: 'com.dotcms.lib', name: 'dot.httpcore', version:'4.2.2_2' @@ -93,16 +86,16 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.jcaptcha-mod', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.jempbox', version:'1.6.0_2' compile group: 'com.dotcms.lib', name: 'dot.jep', version:'2.4.1_2' - compile group: 'com.dotcms.lib', name: 'dot.jersey-client', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-common', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet-core', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-guava', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-media-jaxb', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-media-multipart', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-media-json-jackson', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-server', version:'2.22.1_1' - compile group: 'com.dotcms.lib', name: 'dot.jersey-entity-filtering', version:'2.22.1_1' + compile group: 'com.dotcms.lib', name: 'dot.jersey-client', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-common', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet-core', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-guava', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-media-jaxb', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-media-multipart', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-media-json-jackson', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-server', version:'2.22.1_4' + compile group: 'com.dotcms.lib', name: 'dot.jersey-entity-filtering', version:'2.22.1_4' compile group: 'com.dotcms.lib', name: 'dot.jettison', version:'1.1_2' compile group: 'com.dotcms.lib', name: 'dot.jfreechart', version:'1.0.13_2' compile group: 'com.dotcms.lib', name: 'dot.jid3lib', version:'0.5.4_2' @@ -145,7 +138,6 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.org.eclipse.mylyn.wikitext.textile.core', version:'1.8.0.I20120918-1109_2' compile group: 'com.dotcms.lib', name: 'dot.org.eclipse.mylyn.wikitext.tracwiki.core', version:'1.8.0.I20120918-1109_2' compile group: 'com.dotcms.lib', name: 'dot.org.eclipse.mylyn.wikitext.twiki.core', version:'1.8.0.I20120918-1109_2' - compile group: 'com.dotcms.lib', name: 'dot.oro', version:'2.0.8_2' compile group: 'com.dotcms.lib', name: 'dot.platform', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.portlet', version:'1.0_2' compile group: 'com.dotcms.lib', name: 'dot.quartz-all', version:'1.8.6_2' @@ -153,22 +145,16 @@ dependencies { compile group: 'com.dotcms.lib', name: 'dot.secure-filter', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.simplecaptcha', version:'1.2.1_2' compile group: 'com.dotcms.lib', name: 'dot.snappy-java', version:'1.0.4.1_2' - compile group: 'com.dotcms.lib', name: 'dot.sslext', version:'1.2_2' compile group: 'com.dotcms.lib', name: 'dot.stax2-api', version:'3.1.1_2' - compile group: 'com.dotcms.lib', name: 'dot.struts', version:'1.2.4_2' - compile group: 'com.dotcms.lib', name: 'dot.stxx', version:'1.3_2' compile group: 'com.dotcms.lib', name: 'dot.Tidy', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.trove', version:'1.0.2_2' compile group: 'com.dotcms.lib', name: 'dot.twitter4j-core', version:'3.0.3_2' - compile group: 'com.dotcms.lib', name: 'dot.urlrewritefilter', version:'4.0.3_2' compile group: 'com.dotcms.lib', name: 'dot.util-taglib', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.Verisign', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.wbmp', version:'ukv_2' compile group: 'com.dotcms.lib', name: 'dot.woodstox-core-lgpl', version:'4.2.0_2' compile group: 'com.dotcms.lib', name: 'dot.xalan', version:'2.7.0_2' - compile group: 'com.dotcms.lib', name: 'dot.xmlpull', version:'1.1.3.1_2' compile group: 'com.dotcms.lib', name: 'dot.xpp3-min', version:'1.1.4c_2' - compile group: 'com.dotcms.lib', name: 'dot.xstream', version:'1.4.8_2' compile group: 'com.dotcms.lib', name: 'dot.slf4j-api', version:'1.7.12_2' compile group: 'com.dotcms.lib', name: 'dot.slf4j-jcl', version:'1.7.12_2' compile (group: 'xerces', name: 'xercesImpl', version: '2.11.0'){ @@ -180,6 +166,24 @@ dependencies { compile (group: 'commons-digester', name: 'commons-digester', version: '2.1'){ transitive = false } + compile (group: 'commons-validator', name: 'commons-validator', version: '1.6'){ + transitive = false + } + compile (group: 'commons-collections', name: 'commons-collections', version: '3.2.2'){ + transitive = false + } + compile (group: 'commons-configuration', name: 'commons-configuration', version: '1.10'){ + transitive = false + } + compile (group: 'commons-lang', name: 'commons-lang', version: '2.6'){ + transitive = false + } + compile (group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'){ + transitive = false + } + compile (group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'){ + transitive = false + } compile (group: 'org.jdom', name: 'jdom', version: '1.1.3'){ transitive = false } @@ -207,18 +211,54 @@ dependencies { compile (group: 'org.jgroups', name: 'jgroups', version: '3.6.1.Final'){ transitive = false } + compile (group: 'org.tuckey', name: 'urlrewritefilter', version: '4.0.4'){ + transitive = false + } + compile (group: 'struts', name: 'struts', version: '1.2.4'){ + transitive = false + } + compile (group: 'stxx', name: 'stxx', version: '1.3'){ + transitive = false + } + compile (group: 'oro', name: 'oro', version: '2.0.8'){ + transitive = false + } + compile (group: 'sslext', name: 'sslext', version: '1.2-0'){ + transitive = false + } + compile (group: 'hibernate', name: 'hibernate', version: '2.1.7c'){ + transitive = false + } + compile (group: 'cglib', name: 'cglib-nodep', version: '3.2.6'){ + transitive = false + } + compile (group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10'){ + transitive = false + } + compile (group: 'xmlpull', name: 'xmlpull', version: '1.1.3.1'){ + transitive = false + } + compile (group: 'org.glassfish.hk2', name: 'hk2-locator', version: '2.4.0'){ + transitive = false + } + compile (group: 'org.glassfish.hk2', name: 'hk2-utils', version: '2.4.0'){ + transitive = false + } + compile (group: 'org.glassfish.hk2', name: 'hk2-api', version: '2.4.0'){ + transitive = false + } + compile (group: 'org.glassfish.hk2.external', name: 'javax.inject', version: '2.4.0-b10'){ + transitive = false + } + compile group: 'redis.clients', name: 'jedis', version:'2.7.3' compile group: 'org.apache.commons', name: 'commons-pool2', version:'2.0' compile group: 'com.dotcms.lib', name: 'dot.maxmind-db', version:'1.0.0_2' compile group: 'org.openjdk.jmh', name: 'jmh-core', version:'0.1' compile group: 'com.dotcms.lib', name: 'dot.geoip2', version:'2.1.0_2' compile group: 'com.dotcms.lib', name: 'dot.aopalliance-repackaged', version:'2.4.0-b10_2' - compile group: 'com.dotcms.lib', name: 'dot.hk2-api', version:'2.4.0-b10_2' - compile group: 'com.dotcms.lib', name: 'dot.hk2-locator', version:'2.4.0-b10_2' - compile group: 'com.dotcms.lib', name: 'dot.hk2-utils', version:'2.4.0-b10_2' compile group: 'com.dotcms.lib', name: 'dot.javassist', version:'3.18.1-GA_2' compile group: 'com.dotcms.lib', name: 'dot.javax.annotation-api', version:'1.2_2' - compile group: 'com.dotcms.lib', name: 'dot.javax.inject', version:'2.4.0-b10_2' compile group: 'com.dotcms.lib', name: 'dot.javax.ws.rs-api', version:'2.0.1_2' compile group: 'com.dotcms.lib', name: 'dot.persistence-api', version:'1.0_2' compile group: 'com.dotcms.lib', name: 'dot.validation-api', version:'1.1.0.Final_2' diff --git a/dotCMS/src/integration-test/java/com/dotcms/IntegrationTestBase.java b/dotCMS/src/integration-test/java/com/dotcms/IntegrationTestBase.java index 7e83ed7c696b..718ea4c03c50 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/IntegrationTestBase.java +++ b/dotCMS/src/integration-test/java/com/dotcms/IntegrationTestBase.java @@ -1,6 +1,5 @@ package com.dotcms; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.Role; @@ -24,6 +23,7 @@ import java.io.UnsupportedEncodingException; import java.sql.SQLException; import java.util.List; +import net.sf.hibernate.HibernateException; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/ContentTypeAPIImplTest.java b/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/ContentTypeAPIImplTest.java index c5cd308bc278..3e59fff8588d 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/ContentTypeAPIImplTest.java +++ b/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/ContentTypeAPIImplTest.java @@ -17,7 +17,6 @@ import com.dotcms.contenttype.model.type.ContentTypeBuilder; import com.dotcms.contenttype.model.type.Expireable; import com.dotcms.contenttype.model.type.UrlMapable; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; @@ -31,6 +30,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import org.apache.commons.lang.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/DeleteFieldJobTest.java b/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/DeleteFieldJobTest.java index 46e3991639f2..dfb6da9a9a59 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/DeleteFieldJobTest.java +++ b/dotCMS/src/integration-test/java/com/dotcms/contenttype/test/DeleteFieldJobTest.java @@ -1,15 +1,7 @@ package com.dotcms.contenttype.test; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.field.ImmutableBinaryField; import com.dotcms.contenttype.model.field.ImmutableCategoryField; @@ -39,7 +31,6 @@ import com.dotcms.contenttype.model.type.ContentTypeBuilder; import com.dotcms.contenttype.model.type.SimpleContentType; import com.dotcms.contenttype.transform.field.LegacyFieldTransformer; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.CollectionsUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; @@ -49,6 +40,12 @@ import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.quartz.job.DeleteFieldJob; import com.dotmarketing.quartz.job.TestJobExecutor; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import org.apache.commons.lang.StringUtils; +import org.junit.Assert; +import org.junit.Test; /** * diff --git a/dotCMS/src/integration-test/java/com/dotcms/notification/business/NotificationAPITest.java b/dotCMS/src/integration-test/java/com/dotcms/notification/business/NotificationAPITest.java index b97b513bc5ef..1f218360eb68 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/notification/business/NotificationAPITest.java +++ b/dotCMS/src/integration-test/java/com/dotcms/notification/business/NotificationAPITest.java @@ -1,5 +1,10 @@ package com.dotcms.notification.business; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import com.dotcms.IntegrationTestBase; import com.dotcms.api.system.event.Visibility; import com.dotcms.concurrent.DotConcurrentFactory; @@ -11,7 +16,6 @@ import com.dotcms.notifications.business.NotificationAPIImpl; import com.dotcms.notifications.business.NotificationFactory; import com.dotcms.notifications.dto.NotificationDTO; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.IntegrationTestInitService; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.FactoryLocator; @@ -22,13 +26,15 @@ import com.dotmarketing.exception.DotHibernateException; import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import org.apache.commons.lang.StringUtils; import org.junit.BeforeClass; import org.junit.Test; -import java.util.*; - -import static org.junit.Assert.*; - /** * * @author Daniel Silva diff --git a/dotCMS/src/integration-test/java/com/dotcms/util/IntegrationTestInitService.java b/dotCMS/src/integration-test/java/com/dotcms/util/IntegrationTestInitService.java index b0e5314c2913..a3a5536478e5 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/util/IntegrationTestInitService.java +++ b/dotCMS/src/integration-test/java/com/dotcms/util/IntegrationTestInitService.java @@ -1,17 +1,15 @@ package com.dotcms.util; import com.dotcms.config.DotInitializationService; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfigFactory; -import com.liferay.util.SystemProperties; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.FactoryLocator; import com.dotmarketing.util.Config; - +import com.liferay.util.SystemProperties; import java.util.concurrent.atomic.AtomicBoolean; - +import org.apache.struts.Globals; +import org.apache.struts.config.ModuleConfig; +import org.apache.struts.config.ModuleConfigFactory; import org.mockito.Mockito; /** diff --git a/dotCMS/src/integration-test/java/com/dotcms/uuid/shorty/TestShortyIdApi.java b/dotCMS/src/integration-test/java/com/dotcms/uuid/shorty/TestShortyIdApi.java index c3afc0acd424..10b2d2ca4455 100644 --- a/dotCMS/src/integration-test/java/com/dotcms/uuid/shorty/TestShortyIdApi.java +++ b/dotCMS/src/integration-test/java/com/dotcms/uuid/shorty/TestShortyIdApi.java @@ -1,22 +1,20 @@ package com.dotcms.uuid.shorty; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import com.dotcms.repackage.com.google.common.collect.ImmutableList; import com.dotcms.repackage.com.google.common.collect.ImmutableList.Builder; -import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; import com.dotcms.util.IntegrationTestInitService; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.exception.DotDataException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; /** * Integration tests for the Shorty ID API class. diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java b/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java index 9c07877c08b9..60de79df7aa7 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java @@ -2,7 +2,6 @@ import static org.hamcrest.MatcherAssert.assertThat; -import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; import com.dotmarketing.business.cache.provider.CacheProvider; import com.dotmarketing.business.cache.provider.CacheProviderStats; import com.dotmarketing.business.cache.provider.CacheStats; @@ -16,6 +15,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.commons.lang.RandomStringUtils; import org.junit.Test; public class CachePerformanceTest { diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/db/HibernateUtilTest.java b/dotCMS/src/integration-test/java/com/dotmarketing/db/HibernateUtilTest.java index 4603e4ce9778..4cb5b97a5610 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/db/HibernateUtilTest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/db/HibernateUtilTest.java @@ -1,16 +1,6 @@ package com.dotmarketing.db; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Assert; -import com.dotcms.repackage.net.sf.hibernate.Session; import com.dotcms.util.IntegrationTestInitService; - -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode; @@ -20,6 +10,14 @@ import com.dotmarketing.portlets.containers.model.Container; import com.dotmarketing.util.UUIDGenerator; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.List; +import junit.framework.Assert; +import net.sf.hibernate.Session; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; public class HibernateUtilTest { diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/containers/business/ContainerAPITest.java b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/containers/business/ContainerAPITest.java index c573301ebe5f..84a75637154b 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/containers/business/ContainerAPITest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/containers/business/ContainerAPITest.java @@ -6,7 +6,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.beans.Inode; import com.dotmarketing.db.HibernateUtil; @@ -20,6 +19,7 @@ import com.dotmarketing.util.UtilMethods; import java.util.ArrayList; import java.util.List; +import org.apache.commons.beanutils.BeanUtils; import org.junit.Test; public class ContainerAPITest extends ContentletBaseTest { diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java index eb700c989e3d..a3cae389df90 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.dotcms.business.WrapInTransaction; import com.dotcms.content.business.DotMappingException; import com.dotcms.content.elasticsearch.business.ESMappingAPIImpl; import com.dotcms.contenttype.business.ContentTypeAPIImpl; @@ -33,8 +32,8 @@ import com.dotcms.mock.request.MockInternalRequest; import com.dotcms.mock.response.BaseResponse; import com.dotcms.rendering.velocity.services.VelocityType; +import com.dotcms.rendering.velocity.util.VelocityUtil; import com.dotcms.repackage.org.apache.commons.io.FileUtils; -import com.dotcms.repackage.org.apache.commons.lang.time.FastDateFormat; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.MultiTree; @@ -78,7 +77,6 @@ import com.dotmarketing.util.PageMode; import com.dotmarketing.util.UUIDGenerator; import com.dotmarketing.util.UtilMethods; -import com.dotcms.rendering.velocity.util.VelocityUtil; import com.dotmarketing.util.WebKeys; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -105,6 +103,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.time.FastDateFormat; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapterImpl; diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/quartz/job/DeleteFieldJobTest.java b/dotCMS/src/integration-test/java/com/dotmarketing/quartz/job/DeleteFieldJobTest.java index 916997ee55a8..ad0ab92e9670 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/quartz/job/DeleteFieldJobTest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/quartz/job/DeleteFieldJobTest.java @@ -1,18 +1,9 @@ package com.dotmarketing.quartz.job; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.util.Date; -import java.util.List; - -import org.junit.BeforeClass; -import org.junit.Test; -import org.quartz.JobExecutionException; - import com.dotcms.IntegrationTestBase; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.CollectionsUtils; import com.dotcms.util.IntegrationTestInitService; import com.dotmarketing.beans.Host; @@ -29,6 +20,12 @@ import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.portlets.structure.model.Structure; import com.liferay.portal.model.User; +import java.util.Date; +import java.util.List; +import org.apache.commons.lang.StringUtils; +import org.junit.BeforeClass; +import org.junit.Test; +import org.quartz.JobExecutionException; /** * This class will test routines related to deleting fields from Content Types diff --git a/dotCMS/src/integration-test/java/com/ettrema/httpclient/Resource.java b/dotCMS/src/integration-test/java/com/ettrema/httpclient/Resource.java index 723b3e2e557c..3e5beb72f618 100644 --- a/dotCMS/src/integration-test/java/com/ettrema/httpclient/Resource.java +++ b/dotCMS/src/integration-test/java/com/ettrema/httpclient/Resource.java @@ -7,6 +7,8 @@ import com.dotcms.repackage.com.bradmcevoy.http.exceptions.ConflictException; import com.dotcms.repackage.com.bradmcevoy.http.exceptions.NotAuthorizedException; import com.dotcms.repackage.com.bradmcevoy.http.exceptions.NotFoundException; +import com.dotcms.repackage.org.slf4j.Logger; +import com.dotcms.repackage.org.slf4j.LoggerFactory; import com.ettrema.cache.Cache; import com.ettrema.httpclient.PropFindMethod.Response; import java.io.FileNotFoundException; @@ -17,9 +19,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.slf4j.Logger; -import com.dotcms.repackage.org.slf4j.LoggerFactory; +import org.apache.commons.lang.StringUtils; /** * diff --git a/dotCMS/src/integration-test/java/com/liferay/util/LocaleUtilTest.java b/dotCMS/src/integration-test/java/com/liferay/util/LocaleUtilTest.java index 3f95a664ecb5..db2f0f60db05 100644 --- a/dotCMS/src/integration-test/java/com/liferay/util/LocaleUtilTest.java +++ b/dotCMS/src/integration-test/java/com/liferay/util/LocaleUtilTest.java @@ -5,19 +5,16 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.dotcms.util.IntegrationTestInitService; +import com.dotmarketing.business.UserAPI; +import com.dotmarketing.business.web.UserWebAPI; import java.util.Locale; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; - +import org.apache.struts.Globals; import org.junit.BeforeClass; import org.junit.Test; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.util.IntegrationTestInitService; -import com.dotmarketing.business.UserAPI; -import com.dotmarketing.business.web.UserWebAPI; - /** * Locale Util test. * diff --git a/dotCMS/src/main/java/com/dotcms/api/system/user/UserServiceFactory.java b/dotCMS/src/main/java/com/dotcms/api/system/user/UserServiceFactory.java index a43dca2386d4..d86d3f231697 100644 --- a/dotCMS/src/main/java/com/dotcms/api/system/user/UserServiceFactory.java +++ b/dotCMS/src/main/java/com/dotcms/api/system/user/UserServiceFactory.java @@ -1,6 +1,10 @@ package com.dotcms.api.system.user; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import static com.dotcms.util.CollectionsUtils.getMapValue; +import static com.dotcms.util.CollectionsUtils.map; +import static com.dotcms.util.ConversionUtils.toBoolean; +import static com.dotcms.util.ConversionUtils.toInt; + import com.dotcms.rest.api.v1.authentication.ResetPasswordTokenUtil; import com.dotcms.rest.api.v1.authentication.url.UrlStrategy; import com.dotcms.util.MessageAPI; @@ -23,14 +27,15 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.util.Validator; - import java.io.Serializable; -import java.util.*; - -import static com.dotcms.util.CollectionsUtils.getMapValue; -import static com.dotcms.util.CollectionsUtils.map; -import static com.dotcms.util.ConversionUtils.toBoolean; -import static com.dotcms.util.ConversionUtils.toInt; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import org.apache.commons.lang.StringUtils; /** * This factory creates a singleton instance of the {@link UserService} class. diff --git a/dotCMS/src/main/java/com/dotcms/auth/providers/jwt/services/JsonWebTokenAuthCredentialProcessorImpl.java b/dotCMS/src/main/java/com/dotcms/auth/providers/jwt/services/JsonWebTokenAuthCredentialProcessorImpl.java index 816d71785109..0318492d00e5 100644 --- a/dotCMS/src/main/java/com/dotcms/auth/providers/jwt/services/JsonWebTokenAuthCredentialProcessorImpl.java +++ b/dotCMS/src/main/java/com/dotcms/auth/providers/jwt/services/JsonWebTokenAuthCredentialProcessorImpl.java @@ -2,19 +2,16 @@ import com.dotcms.auth.providers.jwt.JsonWebTokenAuthCredentialProcessor; import com.dotcms.auth.providers.jwt.JsonWebTokenUtils; -import com.dotcms.auth.providers.jwt.factories.JsonWebTokenFactory; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.repackage.org.glassfish.jersey.server.ContainerRequest; import com.dotcms.rest.exception.SecurityException; -import com.dotmarketing.business.ApiProvider; import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; /** * Default implementation diff --git a/dotCMS/src/main/java/com/dotcms/cache/transport/AbstractHazelcastCacheTransport.java b/dotCMS/src/main/java/com/dotcms/cache/transport/AbstractHazelcastCacheTransport.java index 994041084016..9f034dfe7f80 100644 --- a/dotCMS/src/main/java/com/dotcms/cache/transport/AbstractHazelcastCacheTransport.java +++ b/dotCMS/src/main/java/com/dotcms/cache/transport/AbstractHazelcastCacheTransport.java @@ -4,7 +4,6 @@ import com.dotcms.cluster.business.HazelcastUtil; import com.dotcms.cluster.business.HazelcastUtil.HazelcastInstanceType; import com.dotcms.enterprise.license.LicenseManager; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.ChainableCacheAdministratorImpl; @@ -14,17 +13,16 @@ import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.ITopic; import com.hazelcast.core.Message; import com.hazelcast.core.MessageListener; import com.liferay.portal.struts.MultiMessageResources; - import java.net.InetSocketAddress; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import org.apache.struts.Globals; /** * Created by jasontesser on 3/28/17. diff --git a/dotCMS/src/main/java/com/dotcms/cluster/business/HazelcastUtil.java b/dotCMS/src/main/java/com/dotcms/cluster/business/HazelcastUtil.java index b1ea0a4b7e96..b080846854ca 100644 --- a/dotCMS/src/main/java/com/dotcms/cluster/business/HazelcastUtil.java +++ b/dotCMS/src/main/java/com/dotcms/cluster/business/HazelcastUtil.java @@ -1,7 +1,6 @@ package com.dotcms.cluster.business; import com.dotcms.cluster.ClusterUtils; -import com.dotcms.repackage.org.apache.commons.lang.NotImplementedException; import com.dotcms.util.CloseUtils; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; @@ -12,11 +11,11 @@ import com.hazelcast.config.XmlConfigBuilder; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; - import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.commons.lang.NotImplementedException; /** * Created by jasontesser on 4/5/17. diff --git a/dotCMS/src/main/java/com/dotcms/concurrent/DotConcurrentFactory.java b/dotCMS/src/main/java/com/dotcms/concurrent/DotConcurrentFactory.java index fc14f78e9973..2107a9957fd7 100644 --- a/dotCMS/src/main/java/com/dotcms/concurrent/DotConcurrentFactory.java +++ b/dotCMS/src/main/java/com/dotcms/concurrent/DotConcurrentFactory.java @@ -1,18 +1,29 @@ package com.dotcms.concurrent; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import static com.dotcms.util.CollectionsUtils.map; + import com.dotcms.util.ReflectionUtils; import com.dotmarketing.util.Config; import com.dotmarketing.util.DateUtil; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; - -import static com.dotcms.util.CollectionsUtils.*; - import java.io.Serializable; import java.util.List; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * Factory for concurrent {@link Executor} & {@link DotSubmitter} diff --git a/dotCMS/src/main/java/com/dotcms/config/DotInitializationService.java b/dotCMS/src/main/java/com/dotcms/config/DotInitializationService.java index b02121abfc15..0f3fec8f06ea 100644 --- a/dotCMS/src/main/java/com/dotcms/config/DotInitializationService.java +++ b/dotCMS/src/main/java/com/dotcms/config/DotInitializationService.java @@ -1,19 +1,22 @@ package com.dotcms.config; +import static com.dotcms.util.CollectionsUtils.linkSet; + import com.dotcms.api.system.event.PayloadVerifierFactoryInitializer; import com.dotcms.api.system.event.SystemEventProcessorFactoryInitializer; -import com.dotcms.repackage.org.apache.commons.lang.time.StopWatch; import com.dotcms.system.event.local.business.LocalSystemEventSubscribersInitializer; import com.dotcms.util.ReflectionUtils; -import com.dotmarketing.util.*; - +import com.dotmarketing.util.Config; +import com.dotmarketing.util.DateUtil; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.StringUtils; +import com.dotmarketing.util.UtilMethods; import java.io.Serializable; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.ServiceLoader; import java.util.Set; - -import static com.dotcms.util.CollectionsUtils.*; +import org.apache.commons.lang.time.StopWatch; /** * This class is in charge of the Services, Factories or any eager Component to be initialized diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java index c970a1ffd098..42639336569d 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java @@ -1,50 +1,13 @@ package com.dotcms.content.elasticsearch.business; -import com.dotcms.notifications.bean.NotificationLevel; -import com.dotcms.notifications.bean.NotificationType; -import com.dotcms.util.I18NMessage; -import com.dotmarketing.business.IdentifierCache; -import com.dotmarketing.common.model.ContentletSearch; -import java.io.Serializable; -import java.io.StringWriter; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.action.count.CountRequestBuilder; -import org.elasticsearch.action.search.SearchPhaseExecutionException; -import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.Client; -import org.elasticsearch.index.query.FilterBuilders; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryStringQueryBuilder; -import org.elasticsearch.index.query.functionscore.random.RandomScoreFunctionBuilder; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.internal.InternalSearchHits; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; -import org.springframework.util.NumberUtils; - import com.dotcms.content.business.DotMappingException; import com.dotcms.content.elasticsearch.business.IndiciesAPI.IndiciesInfo; import com.dotcms.content.elasticsearch.util.ESClient; +import com.dotcms.notifications.bean.NotificationLevel; +import com.dotcms.notifications.bean.NotificationType; import com.dotcms.notifications.business.NotificationAPI; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; import com.dotcms.repackage.org.apache.commons.io.FileUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import com.dotcms.util.I18NMessage; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; @@ -52,6 +15,7 @@ import com.dotmarketing.business.DotStateException; import com.dotmarketing.business.FactoryLocator; import com.dotmarketing.business.IdentifierAPI; +import com.dotmarketing.business.IdentifierCache; import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.business.query.ComplexCriteria; import com.dotmarketing.business.query.Criteria; @@ -60,6 +24,7 @@ import com.dotmarketing.business.query.ValidationException; import com.dotmarketing.cache.FieldsCache; import com.dotmarketing.common.db.DotConnect; +import com.dotmarketing.common.model.ContentletSearch; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; @@ -86,6 +51,39 @@ import com.dotmarketing.util.RegExMatch; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.io.Serializable; +import java.io.StringWriter; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import net.sf.hibernate.ObjectNotFoundException; +import org.apache.commons.lang.StringUtils; +import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.action.count.CountRequestBuilder; +import org.elasticsearch.action.search.SearchPhaseExecutionException; +import org.elasticsearch.action.search.SearchRequestBuilder; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.client.Client; +import org.elasticsearch.index.query.FilterBuilders; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.QueryStringQueryBuilder; +import org.elasticsearch.index.query.functionscore.random.RandomScoreFunctionBuilder; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.internal.InternalSearchHits; +import org.elasticsearch.search.sort.SortBuilders; +import org.elasticsearch.search.sort.SortOrder; +import org.springframework.util.NumberUtils; /** * Implementation class for the {@link ContentletFactory} interface. This class diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIHelper.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIHelper.java index 4efe0676754f..202ac4d2b6db 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIHelper.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIHelper.java @@ -6,16 +6,14 @@ import com.dotcms.notifications.bean.NotificationLevel; import com.dotcms.notifications.bean.NotificationType; import com.dotcms.notifications.business.NotificationAPI; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.I18NMessage; -import com.dotmarketing.business.*; -import com.dotmarketing.exception.*; -import com.dotmarketing.util.*; +import com.dotmarketing.business.DotStateException; +import com.dotmarketing.exception.DotDataException; +import com.dotmarketing.util.Logger; import com.liferay.portal.language.LanguageException; import com.liferay.portal.language.LanguageUtil; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Locale; /** * A helper for {@link ESContentletAPIImpl} diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java index c537111098e7..47859ec52441 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java @@ -20,10 +20,7 @@ import com.dotcms.repackage.com.google.common.collect.Lists; import com.dotcms.repackage.com.google.common.collect.Maps; import com.dotcms.repackage.com.google.common.collect.Sets; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.repackage.org.apache.commons.io.FileUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.repackage.org.jboss.util.Strings; import com.dotcms.services.VanityUrlServices; import com.dotcms.system.event.local.type.content.CommitListenerEvent; @@ -124,6 +121,8 @@ import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; import com.liferay.util.FileUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; @@ -148,6 +147,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.apache.commons.lang.StringUtils; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.SearchHit; diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESIndexHelper.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESIndexHelper.java index 0c6ce4cc2cbe..260fba198864 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESIndexHelper.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESIndexHelper.java @@ -1,5 +1,11 @@ package com.dotcms.content.elasticsearch.business; +import com.dotcms.enterprise.LicenseService; +import com.dotcms.enterprise.license.LicenseLevel; +import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.sitesearch.business.SiteSearchAPI; +import com.dotmarketing.util.UtilMethods; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -10,14 +16,7 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.Map; - -import com.dotcms.enterprise.LicenseService; -import com.dotcms.enterprise.license.LicenseLevel; -import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotmarketing.business.APILocator; -import com.dotmarketing.sitesearch.business.SiteSearchAPI; -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.StringUtils; /** * A helper for {@link ESIndexAPI} diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESMappingAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESMappingAPIImpl.java index aa8321c921a1..e70f624cbb39 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESMappingAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESMappingAPIImpl.java @@ -4,38 +4,16 @@ import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ; import static com.dotmarketing.business.PermissionAPI.PERMISSION_WRITE; -import com.dotcms.content.elasticsearch.constants.ESMappingConstants; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.stream.Collectors; - import com.dotcms.content.business.ContentMappingAPI; import com.dotcms.content.business.DotMappingException; +import com.dotcms.content.elasticsearch.constants.ESMappingConstants; import com.dotcms.content.elasticsearch.util.ESClient; import com.dotcms.contenttype.model.field.CategoryField; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.enterprise.LicenseUtil; import com.dotcms.enterprise.license.LicenseLevel; import com.dotcms.repackage.com.fasterxml.jackson.databind.ObjectMapper; -import com.dotcms.repackage.org.apache.commons.collections.CollectionUtils; -import com.dotcms.repackage.org.apache.commons.lang.time.FastDateFormat; - import com.dotcms.util.CollectionsUtils; -import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.action.ListenableActionFuture; -import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; -import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; - import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Permission; import com.dotmarketing.business.APILocator; @@ -55,7 +33,6 @@ import com.dotmarketing.portlets.fileassets.business.FileAssetAPI; import com.dotmarketing.portlets.folders.model.Folder; import com.dotmarketing.portlets.structure.business.FieldAPI; - import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.portlets.structure.model.FieldVariable; import com.dotmarketing.portlets.structure.model.KeyValueFieldUtil; @@ -68,6 +45,24 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.ThreadSafeSimpleDateFormat; import com.dotmarketing.util.UtilMethods; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.time.FastDateFormat; +import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.action.ListenableActionFuture; +import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; +import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; public class ESMappingAPIImpl implements ContentMappingAPI { diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/util/ESUtils.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/util/ESUtils.java index 344d816f5364..d8efd10d94f8 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/util/ESUtils.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/util/ESUtils.java @@ -1,6 +1,6 @@ package com.dotcms.content.elasticsearch.util; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.StringUtils; public class ESUtils { diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeFactoryImpl.java b/dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeFactoryImpl.java index 26c5d8d7b4f1..b38293f9d464 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeFactoryImpl.java @@ -5,12 +5,20 @@ import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.field.FieldBuilder; import com.dotcms.contenttype.model.field.HostFolderField; -import com.dotcms.contenttype.model.type.*; +import com.dotcms.contenttype.model.type.BaseContentType; +import com.dotcms.contenttype.model.type.ContentType; +import com.dotcms.contenttype.model.type.ContentTypeBuilder; +import com.dotcms.contenttype.model.type.Expireable; +import com.dotcms.contenttype.model.type.FileAssetContentType; +import com.dotcms.contenttype.model.type.UrlMapable; import com.dotcms.contenttype.transform.contenttype.DbContentTypeTransformer; import com.dotcms.contenttype.transform.contenttype.ImplClassContentTypeTransformer; import com.dotcms.repackage.javax.validation.constraints.NotNull; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.CacheLocator; +import com.dotmarketing.business.DotStateException; +import com.dotmarketing.business.DotValidationException; +import com.dotmarketing.business.FactoryLocator; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.common.util.SQLUtil; import com.dotmarketing.exception.DotDataException; @@ -20,11 +28,20 @@ import com.dotmarketing.portlets.fileassets.business.FileAssetAPI; import com.dotmarketing.portlets.structure.model.Relationship; import com.dotmarketing.portlets.workflows.business.WorkFlowFactory; -import com.dotmarketing.util.*; -import org.elasticsearch.indices.IndexMissingException; - -import java.util.*; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UUIDUtil; +import com.dotmarketing.util.UtilMethods; +import com.dotmarketing.util.VelocityUtil; +import java.util.ArrayList; import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.apache.commons.lang.time.DateUtils; +import org.elasticsearch.indices.IndexMissingException; public class ContentTypeFactoryImpl implements ContentTypeFactory { diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldAPIImpl.java b/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldAPIImpl.java index c51195adc985..379b691d0404 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldAPIImpl.java @@ -37,8 +37,6 @@ import com.dotcms.rendering.velocity.services.ContentletLoader; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; - import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.DotStateException; @@ -52,10 +50,9 @@ import com.dotmarketing.quartz.job.DeleteFieldJobHelper; import com.dotmarketing.util.ActivityLogger; import com.dotmarketing.util.UtilMethods; - -import java.util.List; - import com.liferay.portal.model.User; +import java.util.List; +import org.apache.commons.lang.StringUtils; public class FieldAPIImpl implements FieldAPI { diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldFactoryImpl.java b/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldFactoryImpl.java index d752c71f7022..761c8557b509 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/business/FieldFactoryImpl.java @@ -4,25 +4,37 @@ import com.dotcms.contenttype.exception.DotDataValidationException; import com.dotcms.contenttype.exception.NotFoundInDbException; import com.dotcms.contenttype.exception.OverFieldLimitException; -import com.dotcms.contenttype.model.field.*; +import com.dotcms.contenttype.model.field.CategoryField; +import com.dotcms.contenttype.model.field.ConstantField; +import com.dotcms.contenttype.model.field.DataTypes; +import com.dotcms.contenttype.model.field.Field; +import com.dotcms.contenttype.model.field.FieldBuilder; +import com.dotcms.contenttype.model.field.FieldVariable; +import com.dotcms.contenttype.model.field.HostFolderField; +import com.dotcms.contenttype.model.field.ImmutableConstantField; +import com.dotcms.contenttype.model.field.ImmutableFieldVariable; import com.dotcms.contenttype.model.field.ImmutableFieldVariable.Builder; +import com.dotcms.contenttype.model.field.LegacyFieldTypes; +import com.dotcms.contenttype.model.field.OnePerContentType; +import com.dotcms.contenttype.model.field.TagField; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.transform.field.DbFieldTransformer; import com.dotcms.contenttype.transform.field.DbFieldVariableTransformer; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; -import com.dotcms.uuid.shorty.ShortyIdAPIImpl; - import com.dotmarketing.business.APILocator; import com.dotmarketing.common.db.DotConnect; -import com.dotmarketing.db.LocalTransaction; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; import com.dotmarketing.util.StringUtils; -import com.dotmarketing.util.UUIDGenerator; import com.dotmarketing.util.UtilMethods; - -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.UUID; +import org.apache.commons.lang.time.DateUtils; public class FieldFactoryImpl implements FieldFactory { diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java b/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java index 44c59ee0656f..1a746e87dd1f 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java @@ -1,9 +1,6 @@ package com.dotcms.contenttype.business.sql; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -17,6 +14,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; @@ -28,6 +27,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import net.sf.hibernate.HibernateException; public class FixTaskFixStructureTable implements FixTask { @@ -132,7 +132,7 @@ public List > executeFix() throws DotDataException, DotRunti if(o instanceof Inode){ Inode i = (Inode)o; String type = i.getType(); - String tableName = ((com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); + String tableName = ((net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); MaintenanceUtil.cleanInodeTableData(tableName, type); //FixAssetsProcessStatus.addAError(); } @@ -154,7 +154,7 @@ public List > executeFix() throws DotDataException, DotRunti if(o instanceof Inode){ Inode i = (Inode)o; String type = i.getType(); - String tableName = ((com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); + String tableName = ((net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); MaintenanceUtil.removeOphanedInodes(tableName, type); } diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/Field.java b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/Field.java index 24e051ccd4ca..8ac54a785a19 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/Field.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/Field.java @@ -1,27 +1,31 @@ package com.dotcms.contenttype.model.field; -import java.io.Serializable; -import java.util.*; - -import org.elasticsearch.common.Nullable; -import org.immutables.value.Value; -import org.immutables.value.Value.Derived; - import com.dotcms.contenttype.model.component.FieldFormRenderer; import com.dotcms.contenttype.model.component.FieldValueRenderer; import com.dotcms.repackage.com.google.common.base.Preconditions; import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; import com.dotmarketing.business.DotStateException; import com.dotmarketing.business.FactoryLocator; import com.dotmarketing.exception.DotDataException; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; import com.google.common.collect.ImmutableMap; +import java.io.Serializable; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.DateUtils; +import org.elasticsearch.common.Nullable; +import org.immutables.value.Value; +import org.immutables.value.Value.Derived; @JsonTypeInfo( diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java index 3cd006c2cfdf..a53fdde457da 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java @@ -1,20 +1,16 @@ package com.dotcms.contenttype.model.field; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.io.Serializable; import java.util.Calendar; import java.util.Date; - +import org.apache.commons.lang.time.DateUtils; import org.elasticsearch.common.Nullable; import org.immutables.value.Value; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; -import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - @JsonTypeInfo( use = Id.CLASS, include = JsonTypeInfo.As.PROPERTY, diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/SelectableValuesField.java b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/SelectableValuesField.java index dfc0a9c8ad87..2bec25a5881d 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/SelectableValuesField.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/SelectableValuesField.java @@ -1,14 +1,12 @@ package com.dotcms.contenttype.model.field; -import java.util.ArrayList; -import java.util.List; - -import org.immutables.value.Value; - import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.commons.lang.BooleanUtils; import com.dotmarketing.business.DotStateException; import com.liferay.util.StringUtil; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.BooleanUtils; +import org.immutables.value.Value; public abstract class SelectableValuesField extends Field{ diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/model/type/ContentType.java b/dotCMS/src/main/java/com/dotcms/contenttype/model/type/ContentType.java index 1c4deb75bae4..85bcaa1f02a3 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/model/type/ContentType.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/model/type/ContentType.java @@ -1,22 +1,8 @@ package com.dotcms.contenttype.model.type; -import java.io.Serializable; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.elasticsearch.common.Nullable; - -import org.immutables.value.Value; -import org.immutables.value.Value.Default; - import com.dotcms.contenttype.model.field.Field; import com.dotcms.repackage.com.google.common.base.Preconditions; import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.PermissionableProxy; import com.dotmarketing.business.APILocator; @@ -36,6 +22,17 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; import com.google.common.collect.ImmutableMap; +import java.io.Serializable; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.DateUtils; +import org.elasticsearch.common.Nullable; +import org.immutables.value.Value; +import org.immutables.value.Value.Default; @JsonTypeInfo( use = Id.CLASS, diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/DbFieldTransformer.java b/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/DbFieldTransformer.java index d2b91fa82d90..bf9f501afd38 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/DbFieldTransformer.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/DbFieldTransformer.java @@ -1,21 +1,19 @@ package com.dotcms.contenttype.transform.field; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.elasticsearch.common.Nullable; - import com.dotcms.contenttype.model.field.DataTypes; import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.field.LegacyFieldTypes; import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; import com.dotmarketing.business.DotStateException; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.util.StringUtils; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.time.DateUtils; +import org.elasticsearch.common.Nullable; public class DbFieldTransformer implements FieldTransformer { diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/LegacyFieldTransformer.java b/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/LegacyFieldTransformer.java index a09fce09ee0e..0527b1517cf3 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/LegacyFieldTransformer.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/transform/field/LegacyFieldTransformer.java @@ -1,24 +1,19 @@ package com.dotcms.contenttype.transform.field; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.elasticsearch.common.Nullable; - import com.dotcms.contenttype.model.field.BinaryField; import com.dotcms.contenttype.model.field.DataTypes; import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.field.FieldBuilder; import com.dotcms.contenttype.model.field.FieldIf; -import com.dotcms.contenttype.model.field.FieldVariable; import com.dotcms.contenttype.model.field.LegacyFieldTypes; import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.commons.lang.time.DateUtils; import com.dotmarketing.business.DotStateException; import com.dotmarketing.util.StringUtils; import com.dotmarketing.util.UtilMethods; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import org.elasticsearch.common.Nullable; public class LegacyFieldTransformer implements FieldTransformer { diff --git a/dotCMS/src/main/java/com/dotcms/filters/interceptor/dotcms/DefaultFrontEndLoginRequiredWebInterceptor.java b/dotCMS/src/main/java/com/dotcms/filters/interceptor/dotcms/DefaultFrontEndLoginRequiredWebInterceptor.java index 607016a522bd..d79173928bf6 100644 --- a/dotCMS/src/main/java/com/dotcms/filters/interceptor/dotcms/DefaultFrontEndLoginRequiredWebInterceptor.java +++ b/dotCMS/src/main/java/com/dotcms/filters/interceptor/dotcms/DefaultFrontEndLoginRequiredWebInterceptor.java @@ -2,17 +2,16 @@ import com.dotcms.filters.interceptor.Result; import com.dotcms.filters.interceptor.WebInterceptor; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; import com.dotmarketing.util.Logger; import com.dotmarketing.util.PageMode; import com.dotmarketing.util.WebKeys; - +import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.io.IOException; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; /** * This interceptor basically checks the user status login on the FRONT-END diff --git a/dotCMS/src/main/java/com/dotcms/integritycheckers/AbstractIntegrityChecker.java b/dotCMS/src/main/java/com/dotcms/integritycheckers/AbstractIntegrityChecker.java index a551778c457d..edb864023117 100644 --- a/dotCMS/src/main/java/com/dotcms/integritycheckers/AbstractIntegrityChecker.java +++ b/dotCMS/src/main/java/com/dotcms/integritycheckers/AbstractIntegrityChecker.java @@ -1,5 +1,14 @@ package com.dotcms.integritycheckers; +import com.dotcms.repackage.com.csvreader.CsvReader; +import com.dotcms.repackage.com.csvreader.CsvWriter; +import com.dotmarketing.common.db.DotConnect; +import com.dotmarketing.db.DbConnectionFactory; +import com.dotmarketing.exception.DotDataException; +import com.dotmarketing.portlets.structure.model.Structure; +import com.dotmarketing.util.ConfigUtils; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -10,17 +19,7 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; - -import com.dotcms.repackage.com.csvreader.CsvReader; -import com.dotcms.repackage.com.csvreader.CsvWriter; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotmarketing.common.db.DotConnect; -import com.dotmarketing.db.DbConnectionFactory; -import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.portlets.structure.model.Structure; -import com.dotmarketing.util.ConfigUtils; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.StringUtils; /** * Base class for all the integrity checkers implementation diff --git a/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java b/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java index 3a3736ca6738..ea4767180bc6 100644 --- a/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java +++ b/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java @@ -2,8 +2,6 @@ import com.dotcms.repackage.com.csvreader.CsvReader; import com.dotcms.repackage.com.csvreader.CsvWriter; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.mutable.MutableInt; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.PermissionAPI; @@ -18,8 +16,6 @@ import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portlets.workflows.business.WorkflowAPI; import com.dotmarketing.util.ConfigUtils; -import com.liferay.util.StringPool; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -32,6 +28,8 @@ import java.util.Map; import java.util.Stack; import java.util.function.Consumer; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.mutable.MutableInt; /** * Role integrity checker implementation diff --git a/dotCMS/src/main/java/com/dotcms/notifications/NotificationConverter.java b/dotCMS/src/main/java/com/dotcms/notifications/NotificationConverter.java index aa6df21d5f82..bf140b610488 100644 --- a/dotCMS/src/main/java/com/dotcms/notifications/NotificationConverter.java +++ b/dotCMS/src/main/java/com/dotcms/notifications/NotificationConverter.java @@ -1,24 +1,23 @@ package com.dotcms.notifications; +import static com.dotcms.util.CollectionsUtils.list; +import static com.dotmarketing.util.DateUtil.prettyDateSince; + import com.dotcms.notifications.bean.Notification; import com.dotcms.notifications.bean.NotificationAction; import com.dotcms.notifications.bean.UserNotificationPair; import com.dotcms.notifications.view.NotificationActionView; import com.dotcms.notifications.view.NotificationDataView; import com.dotcms.notifications.view.NotificationView; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.Converter; import com.dotcms.util.I18NMessage; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.language.LanguageException; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; - import java.util.List; import java.util.Locale; - -import static com.dotcms.util.CollectionsUtils.list; -import static com.dotmarketing.util.DateUtil.prettyDateSince; +import org.apache.commons.lang.StringUtils; /** * This converter basically tooks a {@link UserNotificationPair} and convert to notification but doing i18n support with the user {@link java.util.Locale} info diff --git a/dotCMS/src/main/java/com/dotcms/notifications/business/NotificationAPIImpl.java b/dotCMS/src/main/java/com/dotcms/notifications/business/NotificationAPIImpl.java index 4956af8b804b..c3eb7acf248b 100644 --- a/dotCMS/src/main/java/com/dotcms/notifications/business/NotificationAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/notifications/business/NotificationAPIImpl.java @@ -1,15 +1,21 @@ package com.dotcms.notifications.business; -import com.dotcms.api.system.event.*; +import com.dotcms.api.system.event.Payload; +import com.dotcms.api.system.event.SystemEvent; +import com.dotcms.api.system.event.SystemEventType; +import com.dotcms.api.system.event.SystemEventsAPI; +import com.dotcms.api.system.event.Visibility; import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; import com.dotcms.concurrent.DotConcurrentFactory; import com.dotcms.concurrent.DotSubmitter; -import com.dotcms.notifications.bean.*; +import com.dotcms.notifications.bean.Notification; +import com.dotcms.notifications.bean.NotificationAction; +import com.dotcms.notifications.bean.NotificationData; +import com.dotcms.notifications.bean.NotificationLevel; +import com.dotcms.notifications.bean.NotificationType; import com.dotcms.notifications.dto.NotificationDTO; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.NotImplementedException; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.ConversionUtils; import com.dotcms.util.I18NMessage; import com.dotcms.util.marshal.MarshalFactory; @@ -18,19 +24,18 @@ import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.FactoryLocator; import com.dotmarketing.business.RoleAPI; -import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.exception.DotHibernateException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.util.DateUtil; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Locale; +import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang.StringUtils; /** * Concrete implementation of the {@link NotificationAPI} class. diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java index 71721a50148c..8636f329c0dc 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java @@ -1,15 +1,14 @@ package com.dotcms.publisher.business; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.UtilMethods; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; - public class PublishAuditHistory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherAPIImpl.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherAPIImpl.java index 4ad03a2c2069..89f5c0ada500 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherAPIImpl.java @@ -1,22 +1,5 @@ package com.dotcms.publisher.business; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.dotcms.system.event.local.business.LocalSystemEventsAPI; -import com.dotcms.system.event.local.type.publish.AddedToQueueEvent; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.ObjectAlreadyExistsException; -import org.quartz.Scheduler; -import org.quartz.SimpleTrigger; -import org.quartz.Trigger; - import com.dotcms.publisher.bundle.bean.Bundle; import com.dotcms.publisher.business.PublishAuditStatus.Status; import com.dotcms.publisher.environment.bean.Environment; @@ -24,7 +7,8 @@ import com.dotcms.publisher.util.PublisherUtil; import com.dotcms.publisher.util.PusheableAsset; import com.dotcms.publishing.PublisherConfig.DeliveryStrategy; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import com.dotcms.system.event.local.business.LocalSystemEventsAPI; +import com.dotcms.system.event.local.type.publish.AddedToQueueEvent; import com.dotcms.util.CollectionsUtils; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; @@ -45,6 +29,20 @@ import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.quartz.JobDataMap; +import org.quartz.JobDetail; +import org.quartz.ObjectAlreadyExistsException; +import org.quartz.Scheduler; +import org.quartz.SimpleTrigger; +import org.quartz.Trigger; /** * Provides utility methods to interact with asset information added to the diff --git a/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java b/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java index b3b2d74a5374..55171fc50c5d 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/receiver/BundlePublisher.java @@ -35,7 +35,6 @@ import com.dotcms.publishing.Publisher; import com.dotcms.publishing.PublisherConfig; import com.dotcms.repackage.org.apache.commons.io.FileUtils; -import com.dotcms.repackage.org.apache.commons.lang.exception.ExceptionUtils; import com.dotcms.rest.BundlePublisherResource; import com.dotcms.util.CloseUtils; import com.dotmarketing.db.DbConnectionFactory; @@ -61,6 +60,7 @@ import java.util.zip.GZIPInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.tools.tar.TarBuffer; /** diff --git a/dotCMS/src/main/java/com/dotcms/publisher/util/DependencyManager.java b/dotCMS/src/main/java/com/dotcms/publisher/util/DependencyManager.java index e7289ad4a98a..ace496389cc4 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/util/DependencyManager.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/util/DependencyManager.java @@ -7,7 +7,6 @@ import com.dotcms.publisher.pusher.PushPublisherConfig.AssetTypes; import com.dotcms.publishing.DotBundleException; import com.dotcms.publishing.PublisherConfig.Operation; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -52,6 +51,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.lang.StringUtils; /** * The main purpose of this class is to determine all possible content diff --git a/dotCMS/src/main/java/com/dotcms/publisher/util/DependencySet.java b/dotCMS/src/main/java/com/dotcms/publisher/util/DependencySet.java index a57402176798..40a61c21b1be 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/util/DependencySet.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/util/DependencySet.java @@ -1,19 +1,11 @@ package com.dotcms.publisher.util; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - import com.dotcms.publisher.assets.bean.PushedAsset; import com.dotcms.publisher.assets.business.PushedAssetsCache; import com.dotcms.publisher.bundle.bean.Bundle; import com.dotcms.publisher.endpoint.bean.PublishingEndPoint; import com.dotcms.publisher.environment.bean.Environment; import com.dotcms.publishing.PublisherConfiguration; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.AnnotationUtils; import com.dotmarketing.beans.VersionInfo; import com.dotmarketing.business.APILocator; @@ -23,6 +15,13 @@ import com.dotmarketing.portlets.languagesmanager.model.Language; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.StringUtils; public class DependencySet extends HashSet { diff --git a/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java b/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java index 7477e673fcb4..1cd5e76e9fd4 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java @@ -2,8 +2,8 @@ import com.dotcms.publisher.pusher.wrapper.CategoryWrapper; import com.dotcms.publishing.DotPublishingException; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/dotCMS/src/main/java/com/dotcms/publishing/BundlerUtil.java b/dotCMS/src/main/java/com/dotcms/publishing/BundlerUtil.java index d0e241fc3f98..392a81656de0 100644 --- a/dotCMS/src/main/java/com/dotcms/publishing/BundlerUtil.java +++ b/dotCMS/src/main/java/com/dotcms/publishing/BundlerUtil.java @@ -1,16 +1,15 @@ package com.dotcms.publishing; import com.dotcms.content.elasticsearch.business.ESMappingAPIImpl; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.HierarchicalStreamWriter; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.Host; import com.dotmarketing.business.DotStateException; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.fasterxml.jackson.databind.ObjectMapper; - +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedInputStream; import java.io.File; import java.io.FileNotFoundException; diff --git a/dotCMS/src/main/java/com/dotcms/publishing/DotPrettyPrintWriter.java b/dotCMS/src/main/java/com/dotcms/publishing/DotPrettyPrintWriter.java index 7eecc4986f4f..8ec4f2dc261b 100644 --- a/dotCMS/src/main/java/com/dotcms/publishing/DotPrettyPrintWriter.java +++ b/dotCMS/src/main/java/com/dotcms/publishing/DotPrettyPrintWriter.java @@ -1,8 +1,7 @@ package com.dotcms.publishing; -import com.dotcms.repackage.com.thoughtworks.xstream.core.util.QuickWriter; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.PrettyPrintWriter; - +import com.thoughtworks.xstream.core.util.QuickWriter; +import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import java.io.Writer; /** @@ -20,7 +19,7 @@ public DotPrettyPrintWriter(Writer writer) { } /* (non-Javadoc) - * @see com.dotcms.repackage.com.thoughtworks.xstream.io.xml.PrettyPrintWriter#writeText(com.dotcms.repackage.com.thoughtworks.xstream.core.util.QuickWriter, java.lang.String) + * @see com.thoughtworks.xstream.io.xml.PrettyPrintWriter#writeText(com.thoughtworks.xstream.core.util.QuickWriter, java.lang.String) */ protected void writeText(QuickWriter writer, String text) { diff --git a/dotCMS/src/main/java/com/dotcms/publishing/Publisher.java b/dotCMS/src/main/java/com/dotcms/publishing/Publisher.java index fae24070ac8c..8f258d98978e 100644 --- a/dotCMS/src/main/java/com/dotcms/publishing/Publisher.java +++ b/dotCMS/src/main/java/com/dotcms/publishing/Publisher.java @@ -2,7 +2,6 @@ import com.dotcms.publisher.endpoint.bean.PublishingEndPoint; import com.dotcms.publisher.pusher.PushUtils; -import com.dotcms.repackage.org.apache.commons.collections.map.CompositeMap; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.cms.factories.PublicEncryptionFactory; @@ -30,6 +29,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.collections.map.CompositeMap; public abstract class Publisher implements IPublisher { diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/services/DotResourceLoader.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/services/DotResourceLoader.java index 31846f322673..601e25f3ae34 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/services/DotResourceLoader.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/services/DotResourceLoader.java @@ -1,17 +1,14 @@ package com.dotcms.rendering.velocity.services; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; - import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; import com.dotmarketing.util.PageMode; import com.dotmarketing.util.UtilMethods; - import java.io.InputStream; - +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.loader.ResourceLoader; diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/ContentsWebAPI.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/ContentsWebAPI.java index 12f1d60de22e..45e8865a47af 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/ContentsWebAPI.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/ContentsWebAPI.java @@ -1,24 +1,7 @@ package com.dotcms.rendering.velocity.viewtools; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.velocity.tools.view.context.ViewContext; -import org.apache.velocity.tools.view.tools.ViewTool; - import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.contenttype.transform.contenttype.StructureTransformer; -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; - -import org.elasticsearch.search.SearchHits; - import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotStateException; @@ -37,7 +20,6 @@ import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI; import com.dotmarketing.portlets.languagesmanager.model.Language; - import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.portlets.structure.model.Relationship; import com.dotmarketing.portlets.structure.model.Structure; @@ -48,6 +30,18 @@ import com.dotmarketing.util.LuceneHits; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.velocity.tools.view.context.ViewContext; +import org.apache.velocity.tools.view.tools.ViewTool; +import org.elasticsearch.search.SearchHits; public class ContentsWebAPI implements ViewTool { diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/MessagesTools.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/MessagesTools.java index cca6721f8a11..70b1efc9dae1 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/MessagesTools.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/MessagesTools.java @@ -1,8 +1,8 @@ package com.dotcms.rendering.velocity.viewtools; + import java.util.List; import java.util.Locale; - -import com.dotcms.repackage.org.apache.struts.util.MessageResources; +import org.apache.struts.util.MessageResources; import org.apache.velocity.tools.struts.MessageResourcesTool; /** diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/BinaryMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/BinaryMap.java index 5ff9df98e233..1847daa8e1a0 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/BinaryMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/BinaryMap.java @@ -1,6 +1,5 @@ package com.dotcms.rendering.velocity.viewtools.content; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.structure.model.Field; @@ -8,10 +7,10 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.util.FileUtil; - -import java.awt.*; +import java.awt.Dimension; import java.io.File; import java.io.IOException; +import org.apache.commons.lang.builder.ToStringBuilder; /** * A helper class to provide an object to return to the dotCMS when a content has a binary field diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/CheckboxMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/CheckboxMap.java index 66220b2e90df..caabc3a46a8e 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/CheckboxMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/CheckboxMap.java @@ -1,13 +1,11 @@ package com.dotcms.rendering.velocity.viewtools.content; -import java.util.ArrayList; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.structure.model.Field; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.builder.ToStringBuilder; /** * The class helps get at the values and options of a Checkbox Field belonging to a piece of content. diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/ContentMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/ContentMap.java index 6d7d8882da53..73fd4919c4a2 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/ContentMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/ContentMap.java @@ -3,20 +3,10 @@ */ package com.dotcms.rendering.velocity.viewtools.content; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.*; - -import com.dotmarketing.tag.model.Tag; -import org.apache.velocity.Template; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.context.Context; - import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.rendering.velocity.services.VelocityType; import com.dotcms.rendering.velocity.util.VelocityUtil; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; +import com.dotcms.rendering.velocity.viewtools.ContentsWebAPI; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; @@ -30,13 +20,26 @@ import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.portlets.structure.model.KeyValueFieldUtil; import com.dotmarketing.portlets.structure.model.Structure; +import com.dotmarketing.tag.model.Tag; import com.dotmarketing.util.Config; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.PageMode; import com.dotmarketing.util.UtilMethods; -import com.dotcms.rendering.velocity.viewtools.ContentsWebAPI; import com.liferay.portal.model.User; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.velocity.Template; +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.context.Context; /** * The purpose of this object is to provide an easy way on the frontend of dotCMS diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/FileAssetMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/FileAssetMap.java index 419f373373dc..71bc886394ee 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/FileAssetMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/FileAssetMap.java @@ -1,11 +1,12 @@ package com.dotcms.rendering.velocity.viewtools.content; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; + import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.fileassets.business.FileAsset; import com.dotmarketing.portlets.fileassets.business.FileAssetAPI; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang.builder.ToStringBuilder; public class FileAssetMap extends FileAsset { private static final long serialVersionUID = -3798679965316360641L; diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/MultiSelectMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/MultiSelectMap.java index c6c4c7d92e32..61f426ccffd4 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/MultiSelectMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/MultiSelectMap.java @@ -1,13 +1,11 @@ package com.dotcms.rendering.velocity.viewtools.content; -import java.util.ArrayList; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.structure.model.Field; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.builder.ToStringBuilder; /** * The class helps get at the values and options of a MultiSelect Field belonging to a piece of content. diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/PaginatedContentList.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/PaginatedContentList.java index 06829a7b56aa..061a79125390 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/PaginatedContentList.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/PaginatedContentList.java @@ -1,7 +1,7 @@ package com.dotcms.rendering.velocity.viewtools.content; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; import com.dotmarketing.util.PaginatedArrayList; +import org.apache.commons.lang.builder.ToStringBuilder; public class PaginatedContentList extends PaginatedArrayList { diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/RadioMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/RadioMap.java index b405079161f4..4e0b91cc5407 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/RadioMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/RadioMap.java @@ -1,12 +1,11 @@ package com.dotcms.rendering.velocity.viewtools.content; -import java.util.ArrayList; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.structure.model.Field; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.builder.ToStringBuilder; /** * The class helps get at the values and options of a Select Field belonging to a piece of content. diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/SelectMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/SelectMap.java index 7823b364cf00..973eaf40a026 100644 --- a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/SelectMap.java +++ b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/SelectMap.java @@ -1,13 +1,11 @@ package com.dotcms.rendering.velocity.viewtools.content; -import java.util.ArrayList; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.structure.model.Field; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.builder.ToStringBuilder; /** * The class helps get at the values and options of a Select Field belonging to a piece of content. diff --git a/dotCMS/src/main/java/com/dotcms/rest/BundleResource.java b/dotCMS/src/main/java/com/dotcms/rest/BundleResource.java index 3591180ce234..2eee93965e68 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/BundleResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/BundleResource.java @@ -8,7 +8,6 @@ import com.dotcms.repackage.javax.ws.rs.core.CacheControl; import com.dotcms.repackage.javax.ws.rs.core.Context; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotStateException; import com.dotmarketing.exception.DotDataException; @@ -22,6 +21,7 @@ import java.net.URLDecoder; import java.util.List; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringEscapeUtils; @Path("/bundle") diff --git a/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java b/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java index 9856f31e20e3..55401efc2159 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java @@ -1,28 +1,12 @@ package com.dotcms.rest; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLDecoder; -import java.util.*; -import java.util.Map.Entry; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; +import static com.dotmarketing.util.NumberUtil.toInt; +import static com.dotmarketing.util.NumberUtil.toLong; import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.transform.field.LegacyFieldTransformer; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.converters.Converter; -import com.dotcms.repackage.com.thoughtworks.xstream.converters.MarshallingContext; -import com.dotcms.repackage.com.thoughtworks.xstream.converters.UnmarshallingContext; -import com.dotcms.repackage.com.thoughtworks.xstream.io.HierarchicalStreamReader; -import com.dotcms.repackage.com.thoughtworks.xstream.io.HierarchicalStreamWriter; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; +import com.dotcms.rendering.velocity.viewtools.content.util.ContentUtils; import com.dotcms.repackage.javax.ws.rs.Consumes; import com.dotcms.repackage.javax.ws.rs.GET; import com.dotcms.repackage.javax.ws.rs.POST; @@ -45,7 +29,6 @@ import com.dotcms.repackage.org.glassfish.jersey.media.multipart.FormDataMultiPart; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; -import com.dotmarketing.beans.Permission; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.FactoryLocator; @@ -65,11 +48,40 @@ import com.dotmarketing.portlets.structure.model.Field.FieldType; import com.dotmarketing.portlets.structure.model.Relationship; import com.dotmarketing.portlets.workflows.model.WorkflowAction; -import com.dotmarketing.util.*; -import com.dotcms.rendering.velocity.viewtools.content.util.ContentUtils; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.InodeUtils; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.SecurityLogger; +import com.dotmarketing.util.UUIDUtil; +import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - -import static com.dotmarketing.util.NumberUtil.*; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.MarshallingContext; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import com.thoughtworks.xstream.io.xml.DomDriver; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLDecoder; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.Part; @Path("/content") public class ContentResource { diff --git a/dotCMS/src/main/java/com/dotcms/rest/EnvironmentResource.java b/dotCMS/src/main/java/com/dotcms/rest/EnvironmentResource.java index a09f069f8488..e4b66cab38cb 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/EnvironmentResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/EnvironmentResource.java @@ -9,7 +9,6 @@ import com.dotcms.repackage.javax.ws.rs.core.Context; import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotStateException; import com.dotmarketing.business.Role; @@ -24,6 +23,7 @@ import java.util.List; import java.util.Set; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringEscapeUtils; @Path("/environment") diff --git a/dotCMS/src/main/java/com/dotcms/rest/OSGIResource.java b/dotCMS/src/main/java/com/dotcms/rest/OSGIResource.java index b1a79dcc589b..7dc15c38f22d 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/OSGIResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/OSGIResource.java @@ -1,7 +1,5 @@ package com.dotcms.rest; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.repackage.javax.ws.rs.GET; import com.dotcms.repackage.javax.ws.rs.Path; import com.dotcms.repackage.javax.ws.rs.PathParam; @@ -10,7 +8,6 @@ import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; import com.dotcms.repackage.org.apache.commons.httpclient.HttpStatus; -import org.osgi.framework.Bundle; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.util.Logger; @@ -20,6 +17,8 @@ import com.dotmarketing.util.json.JSONException; import com.dotmarketing.util.json.JSONObject; import com.liferay.portal.model.User; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +26,7 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; +import org.osgi.framework.Bundle; /** * @author Jonathan Gamba diff --git a/dotCMS/src/main/java/com/dotcms/rest/TestResource.java b/dotCMS/src/main/java/com/dotcms/rest/TestResource.java index ad933d165942..8c513c4f23ed 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/TestResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/TestResource.java @@ -1,7 +1,5 @@ package com.dotcms.rest; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.repackage.javax.ws.rs.Consumes; import com.dotcms.repackage.javax.ws.rs.FormParam; import com.dotcms.repackage.javax.ws.rs.GET; @@ -17,6 +15,8 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.json.JSONException; import com.dotmarketing.util.json.JSONObject; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/dotCMS/src/main/java/com/dotcms/rest/WebResource.java b/dotCMS/src/main/java/com/dotcms/rest/WebResource.java index dbc025981937..309e81637911 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/WebResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/WebResource.java @@ -1,13 +1,11 @@ package com.dotcms.rest; import com.dotcms.auth.providers.jwt.JsonWebTokenAuthCredentialProcessor; -import com.dotcms.auth.providers.jwt.JsonWebTokenUtils; import com.dotcms.auth.providers.jwt.services.JsonWebTokenAuthCredentialProcessorImpl; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.com.google.common.base.Optional; import com.dotcms.repackage.javax.ws.rs.core.Response; import com.dotcms.repackage.org.apache.commons.io.IOUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.repackage.org.codehaus.jettison.json.JSONException; import com.dotcms.repackage.org.codehaus.jettison.json.JSONObject; import com.dotcms.repackage.org.glassfish.jersey.internal.util.Base64; @@ -24,12 +22,12 @@ import com.dotmarketing.cms.login.factories.LoginFactory; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; -import com.dotmarketing.util.*; -import com.dotmarketing.util.WebKeys; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.SecurityLogger; +import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; -import com.liferay.portal.util.*; - import java.io.IOException; import java.io.InputStream; import java.util.HashMap; @@ -37,6 +35,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; public class WebResource { diff --git a/dotCMS/src/main/java/com/dotcms/rest/annotation/HeaderFilter.java b/dotCMS/src/main/java/com/dotcms/rest/annotation/HeaderFilter.java index d7ec1b9e54da..d042bc4cc617 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/annotation/HeaderFilter.java +++ b/dotCMS/src/main/java/com/dotcms/rest/annotation/HeaderFilter.java @@ -1,18 +1,17 @@ package com.dotcms.rest.annotation; +import static com.dotcms.util.CollectionsUtils.map; + import com.dotcms.repackage.javax.annotation.Priority; -import com.dotcms.repackage.javax.inject.Singleton; import com.dotcms.repackage.javax.ws.rs.Priorities; import com.dotcms.repackage.javax.ws.rs.container.ContainerRequestContext; import com.dotcms.repackage.javax.ws.rs.container.ContainerResponseContext; import com.dotcms.repackage.javax.ws.rs.container.ContainerResponseFilter; import com.dotcms.repackage.javax.ws.rs.core.MultivaluedMap; - import java.io.IOException; import java.lang.annotation.Annotation; import java.util.Map; - -import static com.dotcms.util.CollectionsUtils.map; +import javax.inject.Singleton; /** * This decorator reads the annotations on the resources and includes header based on it based on them. diff --git a/dotCMS/src/main/java/com/dotcms/rest/annotation/RequestFilter.java b/dotCMS/src/main/java/com/dotcms/rest/annotation/RequestFilter.java index 33f545952a9f..7ebdb7b50b7c 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/annotation/RequestFilter.java +++ b/dotCMS/src/main/java/com/dotcms/rest/annotation/RequestFilter.java @@ -1,13 +1,13 @@ package com.dotcms.rest.annotation; +import static com.dotcms.util.CollectionsUtils.map; + import com.dotcms.api.web.HttpServletRequestThreadLocal; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.javax.inject.Singleton; import com.dotcms.repackage.javax.ws.rs.container.ContainerRequestContext; import com.dotcms.repackage.javax.ws.rs.container.ContainerRequestFilter; import com.dotcms.repackage.javax.ws.rs.container.ResourceInfo; import com.dotcms.repackage.javax.ws.rs.ext.Provider; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.repackage.org.glassfish.jersey.server.ContainerRequest; import com.dotcms.repackage.org.glassfish.jersey.server.internal.routing.UriRoutingContext; import com.dotmarketing.cms.factories.PublicCompanyFactory; @@ -17,16 +17,15 @@ import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.WebAppPool; import com.liferay.portal.util.WebKeys; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Proxy; import java.util.Map; - -import static com.dotcms.util.CollectionsUtils.map; +import javax.inject.Singleton; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; /** * This filter decorates the headers in addition to apply Request Commander associated to the annotations. diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/AuthenticationResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/AuthenticationResource.java index 76fd6b69359c..30eef5dbf8ef 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/AuthenticationResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/AuthenticationResource.java @@ -9,7 +9,6 @@ import com.dotcms.repackage.javax.ws.rs.core.Context; import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.repackage.org.glassfish.jersey.server.JSONP; import com.dotcms.rest.ErrorEntity; import com.dotcms.rest.ResponseEntityView; @@ -17,7 +16,11 @@ import com.dotcms.rest.exception.mapper.ExceptionMapperUtil; import com.dotmarketing.business.APILocator; import com.dotmarketing.util.SecurityLogger; -import com.liferay.portal.*; +import com.liferay.portal.NoSuchUserException; +import com.liferay.portal.RequiredLayoutException; +import com.liferay.portal.UserActiveException; +import com.liferay.portal.UserEmailAddressException; +import com.liferay.portal.UserPasswordException; import com.liferay.portal.auth.AuthException; import com.liferay.portal.ejb.UserLocalManager; import com.liferay.portal.ejb.UserLocalManagerFactory; @@ -27,15 +30,15 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.WebKeys; import com.liferay.util.LocaleUtil; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.Serializable; import java.util.Arrays; import java.util.Date; import java.util.Locale; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; /** * This resource does the authentication, if the authentication is successfully diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/ResetPasswordTokenUtil.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/ResetPasswordTokenUtil.java index 15da6166a4ac..69aa5b6e0c6c 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/ResetPasswordTokenUtil.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/authentication/ResetPasswordTokenUtil.java @@ -1,13 +1,11 @@ package com.dotcms.rest.api.v1.authentication; -import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; -import com.dotmarketing.business.APILocator; import com.dotmarketing.util.Config; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - import java.util.Calendar; import java.util.Date; +import org.apache.commons.lang.RandomStringUtils; /** * Util to manage the token that is used in the user reset password proccess. diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/container/ContainerResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/container/ContainerResource.java index 68b4aa7ee0d6..0083cecdf003 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/container/ContainerResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/container/ContainerResource.java @@ -1,6 +1,7 @@ package com.dotcms.rest.api.v1.container; +import com.beust.jcommander.internal.Maps; import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.rendering.velocity.services.ContainerLoader; import com.dotcms.rendering.velocity.services.VelocityType; @@ -9,7 +10,6 @@ import com.dotcms.repackage.javax.ws.rs.DELETE; import com.dotcms.repackage.javax.ws.rs.DefaultValue; import com.dotcms.repackage.javax.ws.rs.GET; -import com.dotcms.repackage.javax.ws.rs.POST; import com.dotcms.repackage.javax.ws.rs.Path; import com.dotcms.repackage.javax.ws.rs.PathParam; import com.dotcms.repackage.javax.ws.rs.Produces; @@ -17,7 +17,6 @@ import com.dotcms.repackage.javax.ws.rs.core.Context; import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotcms.repackage.org.glassfish.jersey.server.JSONP; import com.dotcms.rest.InitDataObject; import com.dotcms.rest.WebResource; @@ -29,7 +28,6 @@ import com.dotcms.util.pagination.OrderDirection; import com.dotcms.uuid.shorty.ShortType; import com.dotcms.uuid.shorty.ShortyId; - import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.beans.MultiTree; import com.dotmarketing.business.APILocator; @@ -44,7 +42,8 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.PageMode; import com.dotmarketing.util.VelocityUtil; - +import com.google.common.collect.Lists; +import com.liferay.portal.model.User; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -52,19 +51,13 @@ import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.io.IOUtils; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -import com.beust.jcommander.internal.Maps; -import com.google.common.collect.Lists; -import com.liferay.portal.model.User; - /** * This resource provides all the different end-points associated to information and actions that * the front-end can perform on the {@link com.dotmarketing.portlets.containers.model.Container}. diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/folder/FolderHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/folder/FolderHelper.java index 0ecfc58ccb81..25478848acde 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/folder/FolderHelper.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/folder/FolderHelper.java @@ -1,12 +1,9 @@ package com.dotcms.rest.api.v1.folder; -import com.dotcms.repackage.net.sf.hibernate.expression.Example; -import com.dotcms.repackage.org.apache.commons.collections.map.HashedMap; import com.dotcms.rest.ErrorEntity; import com.dotcms.util.TreeableNameComparator; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.Treeable; import com.dotmarketing.business.UserAPI; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; @@ -15,7 +12,6 @@ import com.dotmarketing.portlets.folders.model.Folder; import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/menu/MenuResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/menu/MenuResource.java index 53e7b10010dc..2c9d5006b065 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/menu/MenuResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/menu/MenuResource.java @@ -7,7 +7,6 @@ import com.dotcms.repackage.javax.ws.rs.core.Context; import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; import com.dotcms.repackage.org.glassfish.jersey.server.JSONP; import com.dotcms.rest.ResponseEntityView; import com.dotcms.rest.WebResource; @@ -15,20 +14,25 @@ import com.dotcms.rest.annotation.InitRequestRequired; import com.dotcms.rest.annotation.NoCache; import com.dotcms.rest.exception.mapper.ExceptionMapperUtil; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.ApiProvider; +import com.dotmarketing.business.Layout; +import com.dotmarketing.business.LayoutAPI; +import com.dotmarketing.business.NoSuchUserException; +import com.dotmarketing.business.UserAPI; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.liferay.portal.language.LanguageException; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; import com.liferay.portal.util.WebKeys; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringEscapeUtils; /** * Encapsulates the Menu Resource diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteHelper.java index 21e352accb74..ddf4301c1ee1 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteHelper.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteHelper.java @@ -3,28 +3,21 @@ import static com.dotmarketing.util.Logger.debug; import static com.dotmarketing.util.Logger.error; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.util.PaginationUtil; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.util.HostNameComparator; import com.dotmarketing.business.web.WebAPILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portlets.contentlet.business.HostAPI; -import com.dotmarketing.util.PaginatedArrayList; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - +import java.io.Serializable; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; /** * Provides all the utility methods used by the {@link SiteResource} diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteResource.java index d23e5983d5f5..2f0ea0722806 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/site/SiteResource.java @@ -2,11 +2,6 @@ import static com.dotcms.util.CollectionsUtils.map; -import java.io.Serializable; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.javax.ws.rs.GET; import com.dotcms.repackage.javax.ws.rs.PUT; @@ -17,7 +12,6 @@ import com.dotcms.repackage.javax.ws.rs.core.Context; import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.repackage.org.glassfish.jersey.server.JSONP; import com.dotcms.rest.InitDataObject; import com.dotcms.rest.ResponseEntityView; @@ -33,6 +27,10 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; +import java.io.Serializable; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; /** * This resource provides all the different end-points associated to information diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/RuleTransform.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/RuleTransform.java index 3374b50b40a7..342316972fa5 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/RuleTransform.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/RuleTransform.java @@ -1,6 +1,8 @@ package com.dotcms.rest.api.v1.sites.ruleengine.rules; -import com.dotcms.repackage.org.apache.commons.lang.SerializationUtils; +import static com.dotcms.util.DotPreconditions.checkNotNull; + +import com.dotcms.enterprise.rules.RulesAPI; import com.dotcms.rest.api.v1.sites.ruleengine.rules.conditions.ConditionGroupTransform; import com.dotcms.rest.api.v1.sites.ruleengine.rules.conditions.RestConditionGroup; import com.dotcms.rest.exception.BadRequestException; @@ -10,16 +12,17 @@ import com.dotmarketing.business.ApiProvider; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; -import com.dotcms.enterprise.rules.RulesAPI; import com.dotmarketing.portlets.rules.model.ConditionGroup; import com.dotmarketing.portlets.rules.model.Rule; import com.dotmarketing.portlets.rules.model.RuleAction; import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; - -import static com.dotcms.util.DotPreconditions.checkNotNull; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.SerializationUtils; /** * @author Geoff M. Granum diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionParameterTransform.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionParameterTransform.java index 05a9a19f33d5..866529836ea5 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionParameterTransform.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionParameterTransform.java @@ -1,11 +1,10 @@ package com.dotcms.rest.api.v1.sites.ruleengine.rules.actions; -import com.dotcms.repackage.org.apache.commons.lang.SerializationUtils; -import com.dotmarketing.business.ApiProvider; import com.dotcms.enterprise.rules.RulesAPI; +import com.dotmarketing.business.ApiProvider; import com.dotmarketing.portlets.rules.model.ParameterModel; - import java.util.function.Function; +import org.apache.commons.lang.SerializationUtils; public class RuleActionParameterTransform { private final RulesAPI rulesAPI; diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionTransform.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionTransform.java index 5817a9d7be7e..69e76c225ae6 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionTransform.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/actions/RuleActionTransform.java @@ -1,16 +1,13 @@ package com.dotcms.rest.api.v1.sites.ruleengine.rules.actions; -import com.dotcms.repackage.com.google.common.collect.Lists; -import com.dotcms.repackage.org.apache.commons.lang.SerializationUtils; -import com.dotmarketing.business.ApiProvider; import com.dotcms.enterprise.rules.RulesAPI; +import com.dotmarketing.business.ApiProvider; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.portlets.rules.model.RuleAction; - -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import org.apache.commons.lang.SerializationUtils; public class RuleActionTransform { private final RulesAPI rulesAPI; diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionGroupTransform.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionGroupTransform.java index 0014f4976a15..f7ec44eccf29 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionGroupTransform.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionGroupTransform.java @@ -1,16 +1,15 @@ package com.dotcms.rest.api.v1.sites.ruleengine.rules.conditions; -import com.dotcms.repackage.org.apache.commons.lang.SerializationUtils; +import com.dotcms.enterprise.rules.RulesAPI; import com.dotcms.rest.exception.NotFoundException; import com.dotmarketing.business.ApiProvider; -import com.dotcms.enterprise.rules.RulesAPI; import com.dotmarketing.portlets.rules.model.Condition; import com.dotmarketing.portlets.rules.model.ConditionGroup; import com.dotmarketing.portlets.rules.model.LogicalOperator; import com.dotmarketing.util.Logger; - import java.util.HashMap; import java.util.Map; +import org.apache.commons.lang.SerializationUtils; public class ConditionGroupTransform { private final RulesAPI rulesAPI; diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionTransform.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionTransform.java index 926f4e1d234a..3bd0d32b4442 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionTransform.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ConditionTransform.java @@ -1,14 +1,13 @@ package com.dotcms.rest.api.v1.sites.ruleengine.rules.conditions; import com.dotcms.repackage.com.google.common.collect.Maps; -import com.dotcms.repackage.org.apache.commons.lang.SerializationUtils; import com.dotmarketing.portlets.rules.model.Condition; - import com.dotmarketing.portlets.rules.model.LogicalOperator; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.util.Logger; import java.util.Map; import java.util.function.Function; +import org.apache.commons.lang.SerializationUtils; public class ConditionTransform { private final ParameterModelTransform parameterModelTransform = new ParameterModelTransform(); diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ParameterModelTransform.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ParameterModelTransform.java index 7c26d4da7de9..96280b7c36ee 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ParameterModelTransform.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/sites/ruleengine/rules/conditions/ParameterModelTransform.java @@ -1,8 +1,8 @@ package com.dotcms.rest.api.v1.sites.ruleengine.rules.conditions; import com.dotcms.repackage.com.google.common.base.Function; -import com.dotcms.repackage.org.apache.commons.lang.SerializationUtils; import com.dotmarketing.portlets.rules.model.ParameterModel; +import org.apache.commons.lang.SerializationUtils; public class ParameterModelTransform { diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/i18n/I18NResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/i18n/I18NResource.java index b77b525586bc..39fca50db198 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/i18n/I18NResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/i18n/I18NResource.java @@ -1,7 +1,6 @@ package com.dotcms.rest.api.v1.system.i18n; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.com.google.common.collect.ImmutableMap; import com.dotcms.repackage.com.google.common.collect.Maps; import com.dotcms.repackage.javax.ws.rs.GET; import com.dotcms.repackage.javax.ws.rs.Path; @@ -9,7 +8,6 @@ import com.dotcms.repackage.javax.ws.rs.Produces; import com.dotcms.repackage.javax.ws.rs.core.MediaType; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.repackage.org.json.JSONException; import com.dotcms.repackage.org.json.JSONObject; import com.dotcms.rest.exception.BadRequestException; @@ -24,6 +22,7 @@ import java.util.Map; import java.util.Optional; import java.util.TreeMap; +import org.apache.commons.lang.StringUtils; /** * @author Geoff M. Granum diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UserResourceHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UserResourceHelper.java index 8e3abce1aad7..9c2e80e3516e 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UserResourceHelper.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/user/UserResourceHelper.java @@ -1,16 +1,26 @@ package com.dotcms.rest.api.v1.user; +import static com.dotcms.util.CollectionsUtils.list; +import static com.dotcms.util.CollectionsUtils.map; + import com.dotcms.api.system.user.UserService; import com.dotcms.api.system.user.UserServiceFactory; import com.dotcms.cms.login.LoginServiceAPI; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.rest.ResponseEntityView; import com.dotcms.rest.api.v1.authentication.IncorrectPasswordException; import com.dotcms.util.SecurityUtils; import com.dotcms.util.SecurityUtils.DelayStrategy; import com.dotmarketing.beans.Host; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.Layout; +import com.dotmarketing.business.LayoutAPI; +import com.dotmarketing.business.NoSuchUserException; +import com.dotmarketing.business.PermissionAPI; +import com.dotmarketing.business.Role; +import com.dotmarketing.business.RoleAPI; +import com.dotmarketing.business.UserAPI; +import com.dotmarketing.business.UserProxyAPI; import com.dotmarketing.business.web.HostWebAPI; import com.dotmarketing.business.web.UserWebAPI; import com.dotmarketing.business.web.WebAPILocator; @@ -26,17 +36,14 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.WebKeys; import com.liferay.util.StringPool; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; - -import static com.dotcms.util.CollectionsUtils.list; -import static com.dotcms.util.CollectionsUtils.map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; /** * Provides utility methods to interact with information of dotCMS users and diff --git a/dotCMS/src/main/java/com/dotcms/rest/validation/Preconditions.java b/dotCMS/src/main/java/com/dotcms/rest/validation/Preconditions.java index e9d3ed67d1ac..b11ee9250957 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/validation/Preconditions.java +++ b/dotCMS/src/main/java/com/dotcms/rest/validation/Preconditions.java @@ -1,8 +1,8 @@ package com.dotcms.rest.validation; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import org.apache.commons.lang.StringUtils; /** * Simple Precondition checks, influenced heavily by Google's version of same. diff --git a/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java b/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java index 8f69f99a23e1..5236d03a6db8 100644 --- a/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java +++ b/dotCMS/src/main/java/com/dotcms/tika/TikaUtils.java @@ -27,26 +27,33 @@ public class TikaUtils { private TikaProxyService tikaService; + private Boolean osgiInitialized; public TikaUtils() { - //Search for the TikaServiceBuilder service instance expose through OSGI - TikaServiceBuilder tikaServiceBuilder = OSGIUtil.getInstance() - .getService(TikaServiceBuilder.class, - OSGIConstants.BUNDLE_NAME_DOTCMS_TIKA); - if (null == tikaServiceBuilder) { - throw new IllegalStateException( - String.format("OSGI Service [%s] not found for bundle [%s]", - TikaServiceBuilder.class, - OSGIConstants.BUNDLE_NAME_DOTCMS_TIKA)); - } + osgiInitialized = OSGIUtil.getInstance().isInitialized(); + if (osgiInitialized) { + + //Search for the TikaServiceBuilder service instance expose through OSGI + TikaServiceBuilder tikaServiceBuilder = OSGIUtil.getInstance() + .getService(TikaServiceBuilder.class, + OSGIConstants.BUNDLE_NAME_DOTCMS_TIKA); + if (null == tikaServiceBuilder) { + throw new IllegalStateException( + String.format("OSGI Service [%s] not found for bundle [%s]", + TikaServiceBuilder.class, + OSGIConstants.BUNDLE_NAME_DOTCMS_TIKA)); + } - /* - Creating a new instance of the TikaProxyService in order to use the Tika services exposed in OSGI, - when the createTikaService method is called a new instance of Tika is also created - by the TikaProxyService implementation. - */ - this.tikaService = tikaServiceBuilder.createTikaService(); + /* + Creating a new instance of the TikaProxyService in order to use the Tika services exposed in OSGI, + when the createTikaService method is called a new instance of Tika is also created + by the TikaProxyService implementation. + */ + this.tikaService = tikaServiceBuilder.createTikaService(); + } else { + Logger.error(this.getClass(), "OSGI Framework not initialized"); + } } /** @@ -59,6 +66,12 @@ public TikaUtils() { */ public Map getMetaDataMap(String inode, File binFile, String mimeType, boolean forceMemory) { + if (!osgiInitialized) { + Logger.error(this.getClass(), + "Unable to get file Meta Data, OSGI Framework not initialized"); + return new HashMap<>(); + } + this.tikaService.setMaxStringLength(-1); Map metaMap = new HashMap<>(); @@ -198,6 +211,12 @@ public Map getMetaDataMap(String inode, File binFile, String mim * @throws IOException if the file can not be read */ public String detect(File file) throws IOException { + if (!osgiInitialized) { + Logger.error(this.getClass(), + "Unable to get file media type, OSGI Framework not initialized"); + return ""; + } + return this.tikaService.detect(file); } diff --git a/dotCMS/src/main/java/com/dotcms/translate/GoogleTranslationService.java b/dotCMS/src/main/java/com/dotcms/translate/GoogleTranslationService.java index fba3f8b93dbb..e6ccb102381b 100644 --- a/dotCMS/src/main/java/com/dotcms/translate/GoogleTranslationService.java +++ b/dotCMS/src/main/java/com/dotcms/translate/GoogleTranslationService.java @@ -1,9 +1,9 @@ package com.dotcms.translate; +import com.dotcms.rendering.velocity.viewtools.JSONTool; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.com.google.common.base.Preconditions; import com.dotcms.repackage.com.google.common.base.Strings; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; import com.dotmarketing.business.ApiProvider; import com.dotmarketing.business.DotStateException; import com.dotmarketing.portlets.languagesmanager.model.Language; @@ -11,8 +11,6 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.json.JSONArray; import com.dotmarketing.util.json.JSONObject; -import com.dotcms.rendering.velocity.viewtools.JSONTool; - import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; @@ -21,6 +19,7 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import org.apache.commons.lang.StringEscapeUtils; public class GoogleTranslationService extends AbstractTranslationService { diff --git a/dotCMS/src/main/java/com/dotcms/util/AnnotationUtils.java b/dotCMS/src/main/java/com/dotcms/util/AnnotationUtils.java index cb6bf5945fe8..7caba9248997 100644 --- a/dotCMS/src/main/java/com/dotcms/util/AnnotationUtils.java +++ b/dotCMS/src/main/java/com/dotcms/util/AnnotationUtils.java @@ -1,14 +1,17 @@ package com.dotcms.util; -import com.dotcms.repackage.org.apache.commons.collections.keyvalue.MultiKey; import com.google.common.collect.ImmutableSet; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.apache.commons.collections.keyvalue.MultiKey; /** diff --git a/dotCMS/src/main/java/com/dotcms/util/ConfigurationInterpolator.java b/dotCMS/src/main/java/com/dotcms/util/ConfigurationInterpolator.java index 985eff6fec9d..6f3c4b47cf9d 100644 --- a/dotCMS/src/main/java/com/dotcms/util/ConfigurationInterpolator.java +++ b/dotCMS/src/main/java/com/dotcms/util/ConfigurationInterpolator.java @@ -1,8 +1,7 @@ package com.dotcms.util; -import com.dotcms.repackage.org.apache.commons.configuration.Configuration; - import java.io.Serializable; +import org.apache.commons.configuration.Configuration; /** * Defines an interpolator for a Configuration. diff --git a/dotCMS/src/main/java/com/dotcms/util/ContentTypeUtil.java b/dotCMS/src/main/java/com/dotcms/util/ContentTypeUtil.java index 0bf991897387..796f97120d2b 100644 --- a/dotCMS/src/main/java/com/dotcms/util/ContentTypeUtil.java +++ b/dotCMS/src/main/java/com/dotcms/util/ContentTypeUtil.java @@ -2,12 +2,6 @@ import static com.dotcms.util.CollectionsUtils.map; -import java.util.List; -import java.util.Locale; -import java.util.Optional; - -import javax.servlet.http.HttpServletRequest; - import com.dotcms.api.web.HttpServletRequestThreadLocal; import com.dotcms.cms.login.LoginServiceAPI; import com.dotcms.contenttype.model.type.ContentType; @@ -15,7 +9,6 @@ import com.dotcms.repackage.javax.portlet.PortletURL; import com.dotcms.repackage.javax.portlet.WindowState; import com.dotcms.repackage.javax.portlet.WindowStateException; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.rest.api.v1.contenttype.ContentTypeResource; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.Layout; @@ -27,6 +20,11 @@ import com.liferay.portal.model.User; import com.liferay.portlet.PortletURLImpl; import com.liferay.util.LocaleUtil; +import java.util.List; +import java.util.Locale; +import java.util.Optional; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; /** * Utility class for the {@link ContentTypeResource} end-point and other Content diff --git a/dotCMS/src/main/java/com/dotcms/util/DotPreconditions.java b/dotCMS/src/main/java/com/dotcms/util/DotPreconditions.java index 9868b2369c21..38f88a41c7ea 100644 --- a/dotCMS/src/main/java/com/dotcms/util/DotPreconditions.java +++ b/dotCMS/src/main/java/com/dotcms/util/DotPreconditions.java @@ -1,12 +1,12 @@ package com.dotcms.util; import com.dotcms.repackage.javax.validation.constraints.NotNull; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.Map; import java.util.function.Supplier; +import org.apache.commons.lang.StringUtils; /** * Simple Precondition checks, wrapping Google's version. diff --git a/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java b/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java index a1a88a00840c..c96172c28b32 100644 --- a/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java +++ b/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java @@ -1,5 +1,8 @@ package com.dotcms.util; +import com.dotcms.repackage.org.apache.commons.net.util.SubnetUtils; +import com.dotcms.repackage.org.apache.commons.net.util.SubnetUtils.SubnetInfo; +import com.dotmarketing.util.UtilMethods; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.MalformedURLException; @@ -8,13 +11,8 @@ import java.net.UnknownHostException; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.commons.net.util.SubnetUtils; -import com.dotcms.repackage.org.apache.commons.net.util.SubnetUtils.SubnetInfo; -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.StringUtils; /** * Provides quick access to information that can be obtained from the HTTP diff --git a/dotCMS/src/main/java/com/dotcms/util/LogTimeUtil.java b/dotCMS/src/main/java/com/dotcms/util/LogTimeUtil.java index 08642e020017..ef349b88af6c 100644 --- a/dotCMS/src/main/java/com/dotcms/util/LogTimeUtil.java +++ b/dotCMS/src/main/java/com/dotcms/util/LogTimeUtil.java @@ -1,10 +1,9 @@ package com.dotcms.util; -import com.dotcms.repackage.org.apache.commons.lang.time.StopWatch; import com.dotmarketing.util.DateUtil; import com.dotmarketing.util.Logger; - import java.util.function.Supplier; +import org.apache.commons.lang.time.StopWatch; /** * This util logs the total time for a calling delegate method. diff --git a/dotCMS/src/main/java/com/dotcms/util/PaginationUtil.java b/dotCMS/src/main/java/com/dotcms/util/PaginationUtil.java index 668871a8c2a5..0ba77fe93732 100644 --- a/dotCMS/src/main/java/com/dotcms/util/PaginationUtil.java +++ b/dotCMS/src/main/java/com/dotcms/util/PaginationUtil.java @@ -1,7 +1,10 @@ package com.dotcms.util; +import static com.dotcms.util.CollectionsUtils.map; +import static com.dotmarketing.util.WebKeys.DOTCMS_PAGINATION_LINKS; +import static com.dotmarketing.util.WebKeys.DOTCMS_PAGINATION_ROWS; + import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.rest.ResponseEntityView; import com.dotcms.util.pagination.OrderDirection; import com.dotcms.util.pagination.Paginator; @@ -11,15 +14,14 @@ import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; import com.liferay.util.StringUtil; - -import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.*; - -import static com.dotcms.util.CollectionsUtils.map; -import static com.dotmarketing.util.WebKeys.DOTCMS_PAGINATION_LINKS; -import static com.dotmarketing.util.WebKeys.DOTCMS_PAGINATION_ROWS; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; /** * Utility class to the pagination elements and filter diff --git a/dotCMS/src/main/java/com/dotcms/util/SystemEnvironmentConfigurationInterpolator.java b/dotCMS/src/main/java/com/dotcms/util/SystemEnvironmentConfigurationInterpolator.java index 6ee75c350631..a27a77b39a90 100644 --- a/dotCMS/src/main/java/com/dotcms/util/SystemEnvironmentConfigurationInterpolator.java +++ b/dotCMS/src/main/java/com/dotcms/util/SystemEnvironmentConfigurationInterpolator.java @@ -1,12 +1,11 @@ package com.dotcms.util; -import com.dotcms.repackage.org.apache.commons.configuration.Configuration; -import com.dotcms.repackage.org.apache.commons.configuration.PropertiesConfiguration; import com.dotmarketing.util.StringUtils; - import java.lang.reflect.Array; import java.util.HashMap; import java.util.Iterator; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.PropertiesConfiguration; /** * If you required to interpolate System properties or Environment variables you can use this implementations. @@ -156,11 +155,11 @@ public Object get(Object key) { private String envKeyUnWrap(String key) { - return com.dotcms.repackage.org.apache.commons.lang.StringUtils.replace(key, ENV_PREFIX, com.dotcms.repackage.org.apache.commons.lang.StringUtils.EMPTY); + return org.apache.commons.lang.StringUtils.replace(key, ENV_PREFIX, org.apache.commons.lang.StringUtils.EMPTY); } private String systemKeyUnWrap(String key) { - return com.dotcms.repackage.org.apache.commons.lang.StringUtils.replace(key, SYS_PREFIX, com.dotcms.repackage.org.apache.commons.lang.StringUtils.EMPTY); + return org.apache.commons.lang.StringUtils.replace(key, SYS_PREFIX, org.apache.commons.lang.StringUtils.EMPTY); } } // SystemEnvironmentMapDecorator. } // E:O:F:SystemEnvironmentConfigurationInterpolator. diff --git a/dotCMS/src/main/java/com/dotcms/util/UrlStrategyUtil.java b/dotCMS/src/main/java/com/dotcms/util/UrlStrategyUtil.java index d13c2c2650a9..4190892e6f02 100644 --- a/dotCMS/src/main/java/com/dotcms/util/UrlStrategyUtil.java +++ b/dotCMS/src/main/java/com/dotcms/util/UrlStrategyUtil.java @@ -1,13 +1,10 @@ package com.dotcms.util; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.rest.api.v1.authentication.url.UrlStrategy; import com.liferay.portal.model.Company; -import com.liferay.portal.model.User; - -import java.util.Locale; import java.util.Map; +import org.apache.commons.lang.StringUtils; /** * Util class to get the app base URL diff --git a/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java b/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java index 47cd524ce707..b3c6d59b17f1 100644 --- a/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java +++ b/dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java @@ -5,7 +5,6 @@ import com.dotcms.contenttype.transform.contenttype.JsonContentTypeTransformer; import com.dotcms.contenttype.transform.contenttype.StructureTransformer; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotRuntimeException; @@ -17,6 +16,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.apache.commons.lang.StringUtils; /** * Handle {@link ContentType} pagination diff --git a/dotCMS/src/main/java/com/dotcms/util/pagination/SitePaginator.java b/dotCMS/src/main/java/com/dotcms/util/pagination/SitePaginator.java index cf4813cd5ace..b0054308a431 100644 --- a/dotCMS/src/main/java/com/dotcms/util/pagination/SitePaginator.java +++ b/dotCMS/src/main/java/com/dotcms/util/pagination/SitePaginator.java @@ -1,15 +1,13 @@ package com.dotcms.util.pagination; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.contentlet.business.HostAPI; import com.dotmarketing.util.PaginatedArrayList; import com.liferay.portal.model.User; - -import java.util.Collection; import java.util.Map; +import org.apache.commons.lang.StringUtils; /** * Paginator util for Host diff --git a/dotCMS/src/main/java/com/dotcms/vanityurl/action/ViewVanityURLAction.java b/dotCMS/src/main/java/com/dotcms/vanityurl/action/ViewVanityURLAction.java index 6aaf72e6381b..7ab6bf3dce28 100644 --- a/dotCMS/src/main/java/com/dotcms/vanityurl/action/ViewVanityURLAction.java +++ b/dotCMS/src/main/java/com/dotcms/vanityurl/action/ViewVanityURLAction.java @@ -4,10 +4,10 @@ import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.portal.struts.DotPortletAction; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewVanityURLAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotcms/vanityurl/business/VanityUrlAPIImpl.java b/dotCMS/src/main/java/com/dotcms/vanityurl/business/VanityUrlAPIImpl.java index 83ba4706be05..fb8afb1979f9 100644 --- a/dotCMS/src/main/java/com/dotcms/vanityurl/business/VanityUrlAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/vanityurl/business/VanityUrlAPIImpl.java @@ -1,11 +1,16 @@ package com.dotcms.vanityurl.business; +import static com.dotcms.util.CollectionsUtils.map; +import static com.dotcms.util.CollectionsUtils.toImmutableList; +import static com.dotcms.util.VanityUrlUtil.isValidRegex; +import static com.dotcms.util.VanityUrlUtil.processExpressions; +import static java.util.stream.IntStream.rangeClosed; + import com.dotcms.business.CloseDBIfOpened; import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.model.type.VanityUrlContentType; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.collections.keyvalue.MultiKey; import com.dotcms.services.VanityUrlServices; import com.dotcms.vanityurl.model.CachedVanityUrl; import com.dotcms.vanityurl.model.DefaultVanityUrl; @@ -28,17 +33,15 @@ import com.google.common.collect.ImmutableSet; import com.liferay.portal.model.User; import com.liferay.util.StringPool; -import org.elasticsearch.indices.IndexMissingException; - import java.text.MessageFormat; -import java.util.*; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; - -import static com.dotcms.util.CollectionsUtils.map; -import static com.dotcms.util.CollectionsUtils.toImmutableList; -import static com.dotcms.util.VanityUrlUtil.isValidRegex; -import static com.dotcms.util.VanityUrlUtil.processExpressions; -import static java.util.stream.IntStream.rangeClosed; +import org.apache.commons.collections.keyvalue.MultiKey; +import org.elasticsearch.indices.IndexMissingException; /** * Implementation class for the {@link VanityUrlAPI}. diff --git a/dotCMS/src/main/java/com/dotcms/vanityurl/model/CacheVanityKey.java b/dotCMS/src/main/java/com/dotcms/vanityurl/model/CacheVanityKey.java index 044a840dfdd6..d0f4aff4515d 100644 --- a/dotCMS/src/main/java/com/dotcms/vanityurl/model/CacheVanityKey.java +++ b/dotCMS/src/main/java/com/dotcms/vanityurl/model/CacheVanityKey.java @@ -1,8 +1,7 @@ package com.dotcms.vanityurl.model; -import com.dotcms.repackage.org.apache.commons.collections.keyvalue.MultiKey; - import java.io.Serializable; +import org.apache.commons.collections.keyvalue.MultiKey; /** * Encapsulates the keys for cache vanities. diff --git a/dotCMS/src/main/java/com/dotcms/vanityurl/model/SecondaryCacheVanityKey.java b/dotCMS/src/main/java/com/dotcms/vanityurl/model/SecondaryCacheVanityKey.java index 806867b4dc44..f1564b222dd1 100644 --- a/dotCMS/src/main/java/com/dotcms/vanityurl/model/SecondaryCacheVanityKey.java +++ b/dotCMS/src/main/java/com/dotcms/vanityurl/model/SecondaryCacheVanityKey.java @@ -1,8 +1,7 @@ package com.dotcms.vanityurl.model; -import com.dotcms.repackage.org.apache.commons.collections.keyvalue.MultiKey; - import java.io.Serializable; +import org.apache.commons.collections.keyvalue.MultiKey; /** * Encapsulates the keys for second cache vanities. diff --git a/dotCMS/src/main/java/com/dotcms/workflow/helper/WorkflowHelper.java b/dotCMS/src/main/java/com/dotcms/workflow/helper/WorkflowHelper.java index 89200efe479d..65af0491122e 100644 --- a/dotCMS/src/main/java/com/dotcms/workflow/helper/WorkflowHelper.java +++ b/dotCMS/src/main/java/com/dotcms/workflow/helper/WorkflowHelper.java @@ -1,10 +1,11 @@ package com.dotcms.workflow.helper; +import static com.dotmarketing.db.HibernateUtil.addSyncCommitListener; + import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotcms.workflow.form.WorkflowActionForm; import com.dotcms.workflow.form.WorkflowActionStepBean; import com.dotcms.workflow.form.WorkflowReorderBean; @@ -30,12 +31,10 @@ import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; import com.liferay.util.StringPool; - import java.util.ArrayList; import java.util.Collections; import java.util.List; - -import static com.dotmarketing.db.HibernateUtil.addSyncCommitListener; +import org.apache.commons.beanutils.BeanUtils; /** * Helper for Workflow Actions diff --git a/dotCMS/src/main/java/com/dotcms/xmlsitemap/XMLSitemapJob.java b/dotCMS/src/main/java/com/dotcms/xmlsitemap/XMLSitemapJob.java index 86e5273b774a..824f8ad8ea8f 100644 --- a/dotCMS/src/main/java/com/dotcms/xmlsitemap/XMLSitemapJob.java +++ b/dotCMS/src/main/java/com/dotcms/xmlsitemap/XMLSitemapJob.java @@ -1,23 +1,8 @@ package com.dotcms.xmlsitemap; -import java.io.File; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.zip.GZIPOutputStream; - import com.dotcms.business.CloseDBIfOpened; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.quartz.StatefulJob; - import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.transform.contenttype.StructureTransformer; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -60,6 +45,7 @@ import java.util.List; import java.util.Map; import java.util.zip.GZIPOutputStream; +import org.apache.commons.lang.StringUtils; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/MultiTree.java b/dotCMS/src/main/java/com/dotmarketing/beans/MultiTree.java index ad894b4851f3..2991aef522db 100644 --- a/dotCMS/src/main/java/com/dotmarketing/beans/MultiTree.java +++ b/dotCMS/src/main/java/com/dotmarketing/beans/MultiTree.java @@ -1,10 +1,9 @@ package com.dotmarketing.beans; -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import java.io.Serializable; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/Permission.java b/dotCMS/src/main/java/com/dotmarketing/beans/Permission.java index b66939267af4..2743f7d9c33d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/beans/Permission.java +++ b/dotCMS/src/main/java/com/dotmarketing/beans/Permission.java @@ -1,14 +1,12 @@ package com.dotmarketing.beans; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.portlets.htmlpageasset.model.HTMLPageAsset; import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; /** * @author Hibernate CodeGenerator diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/PermissionAsset.java b/dotCMS/src/main/java/com/dotmarketing/beans/PermissionAsset.java index 46b828ea82a3..664a7180731c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/beans/PermissionAsset.java +++ b/dotCMS/src/main/java/com/dotmarketing/beans/PermissionAsset.java @@ -1,10 +1,9 @@ package com.dotmarketing.beans; +import com.dotmarketing.business.Permissionable; import java.io.Serializable; import java.util.ArrayList; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotmarketing.business.Permissionable; +import org.apache.commons.lang.builder.ToStringBuilder; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/PermissionReference.java b/dotCMS/src/main/java/com/dotmarketing/beans/PermissionReference.java index ef000b501d9d..e3553b28f942 100644 --- a/dotCMS/src/main/java/com/dotmarketing/beans/PermissionReference.java +++ b/dotCMS/src/main/java/com/dotmarketing/beans/PermissionReference.java @@ -1,12 +1,11 @@ package com.dotmarketing.beans; +import com.dotmarketing.portlets.htmlpageasset.model.HTMLPageAsset; +import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage; import java.io.Serializable; import java.util.HashMap; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotmarketing.portlets.htmlpageasset.model.HTMLPageAsset; -import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage; +import org.apache.commons.lang.builder.ToStringBuilder; /** * @author Hibernate CodeGenerator diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/Tree.java b/dotCMS/src/main/java/com/dotmarketing/beans/Tree.java index d036717f2599..f7737e1f9ae8 100644 --- a/dotCMS/src/main/java/com/dotmarketing/beans/Tree.java +++ b/dotCMS/src/main/java/com/dotmarketing/beans/Tree.java @@ -1,12 +1,9 @@ package com.dotmarketing.beans; import java.io.Serializable; - -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - -import com.dotmarketing.util.InodeUtils; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/business/BlockPageCache.java b/dotCMS/src/main/java/com/dotmarketing/business/BlockPageCache.java index fa47599b417c..861ace076828 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/BlockPageCache.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/BlockPageCache.java @@ -1,7 +1,7 @@ package com.dotmarketing.business; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage; +import org.apache.commons.lang.StringUtils; /** * This cache will keep a set of different {@link HTMLPage} objects and their diff --git a/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java index a5e9f40a1fb9..2e625a0b67e7 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java @@ -3,18 +3,6 @@ */ package com.dotmarketing.business; -import java.lang.reflect.InvocationTargetException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Set; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.dotmarketing.business.RoleCache.UserRoleCacheHelper; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -26,8 +14,17 @@ import com.dotmarketing.util.StringUtils; import com.dotmarketing.util.UUIDGenerator; import com.dotmarketing.util.UtilMethods; -import com.dotmarketing.util.VelocityUtil; import com.liferay.portal.model.User; +import java.lang.reflect.InvocationTargetException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; +import org.apache.commons.beanutils.BeanUtils; /** * @author Jason Tesser diff --git a/dotCMS/src/main/java/com/dotmarketing/business/UserAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/UserAPIImpl.java index 43d3ffad0560..7a4835538eb4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/UserAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/UserAPIImpl.java @@ -1,17 +1,11 @@ package com.dotmarketing.business; -import java.text.MessageFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; import com.dotcms.enterprise.PasswordFactoryProxy; import com.dotcms.enterprise.de.qaware.heimdall.PasswordException; import com.dotcms.notifications.business.NotificationAPI; import com.dotcms.publisher.bundle.business.BundleAPI; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.cms.factories.PublicCompanyFactory; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotRuntimeException; @@ -38,6 +32,11 @@ import com.liferay.portal.pwd.PwdToolkitUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.util.GetterUtil; +import java.text.MessageFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import org.apache.commons.lang.StringUtils; /** * UserAPIImpl is an API intended to be a helper class for class to get User diff --git a/dotCMS/src/main/java/com/dotmarketing/business/UserFactoryLiferayImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/UserFactoryLiferayImpl.java index f4285a2b5cdb..d38c130b2227 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/UserFactoryLiferayImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/UserFactoryLiferayImpl.java @@ -1,7 +1,6 @@ package com.dotmarketing.business; import com.dotcms.repackage.com.liferay.counter.ejb.CounterManagerUtil; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.cms.factories.PublicAddressFactory; import com.dotmarketing.cms.factories.PublicCompanyFactory; import com.dotmarketing.common.db.DotConnect; @@ -25,7 +24,6 @@ import com.liferay.portal.model.Address; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; - import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; diff --git a/dotCMS/src/main/java/com/dotmarketing/business/UserProxyFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/UserProxyFactoryImpl.java index dc02db0dd48a..8f764617892e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/UserProxyFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/UserProxyFactoryImpl.java @@ -1,11 +1,5 @@ package com.dotmarketing.business; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -17,6 +11,10 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import org.apache.commons.beanutils.BeanUtils; public class UserProxyFactoryImpl extends UserProxyFactory { diff --git a/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactoryImpl.java index f954421ca34e..4195a51c369b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactoryImpl.java @@ -2,13 +2,7 @@ import static com.dotcms.util.CollectionsUtils.set; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Set; - import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; import com.dotmarketing.beans.VersionInfo; @@ -24,6 +18,11 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Set; +import org.apache.commons.beanutils.BeanUtils; /** * Implementation class for the {@link VersionableFactory} class. diff --git a/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/h22/H22Cache.java b/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/h22/H22Cache.java index 428ae8b6cf16..f12f93f16520 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/h22/H22Cache.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/h22/H22Cache.java @@ -1,5 +1,16 @@ package com.dotmarketing.business.cache.provider.h22; +import com.dotcms.repackage.com.zaxxer.hikari.pool.HikariPool.PoolInitializationException; +import com.dotcms.repackage.org.apache.commons.io.comparator.LastModifiedFileComparator; +import com.dotcms.repackage.org.apache.commons.io.filefilter.DirectoryFileFilter; +import com.dotcms.util.CloseUtils; +import com.dotmarketing.business.cache.provider.CacheProvider; +import com.dotmarketing.business.cache.provider.CacheProviderStats; +import com.dotmarketing.business.cache.provider.CacheStats; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.ConfigUtils; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; @@ -19,30 +30,15 @@ import java.sql.Statement; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; - -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; -import com.dotcms.repackage.org.apache.commons.io.comparator.LastModifiedFileComparator; -import com.dotcms.repackage.org.apache.commons.io.filefilter.DirectoryFileFilter; -import com.dotcms.util.CloseUtils; -import com.dotmarketing.business.cache.provider.CacheProvider; -import com.dotmarketing.business.cache.provider.CacheProviderStats; -import com.dotmarketing.business.cache.provider.CacheStats; -import com.dotmarketing.util.Config; -import com.dotmarketing.util.ConfigUtils; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.UtilMethods; -import com.dotcms.repackage.com.zaxxer.hikari.pool.HikariPool.PoolInitializationException; +import org.apache.commons.collections.map.LRUMap; public class H22Cache extends CacheProvider { diff --git a/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/redis/RedisProvider.java b/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/redis/RedisProvider.java index ccf2efc78a2d..00678876bbc9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/redis/RedisProvider.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/cache/provider/redis/RedisProvider.java @@ -1,19 +1,36 @@ package com.dotmarketing.business.cache.provider.redis; -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; import com.dotmarketing.business.cache.provider.CacheProvider; import com.dotmarketing.business.cache.provider.CacheProviderStats; import com.dotmarketing.business.cache.provider.CacheStats; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; - -import redis.clients.jedis.*; - -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.NotSerializableException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.StringWriter; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.commons.collections.map.LRUMap; +import redis.clients.jedis.Client; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; +import redis.clients.jedis.Protocol; /** * @author Jonathan Gamba diff --git a/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java b/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java index 332fdacb1b8a..dad075b3a852 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/jgroups/JGroupsCacheTransport.java @@ -2,8 +2,6 @@ import com.dotcms.cluster.bean.Server; import com.dotcms.cluster.business.ServerAPI; -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.ChainableCacheAdministratorImpl; @@ -18,6 +16,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.apache.commons.collections.map.LRUMap; +import org.apache.struts.Globals; import org.jgroups.Address; import org.jgroups.Event; import org.jgroups.JChannel; diff --git a/dotCMS/src/main/java/com/dotmarketing/business/query/QueryUtil.java b/dotCMS/src/main/java/com/dotmarketing/business/query/QueryUtil.java index c3a62a9c1447..02fa5853afa3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/query/QueryUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/query/QueryUtil.java @@ -1,21 +1,6 @@ package com.dotmarketing.business.query; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.dotcms.repackage.javax.portlet.ActionRequest; -import com.dotcms.repackage.javax.portlet.ActionResponse; -import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.PermissionableProxy; -import com.dotmarketing.beans.WebAsset; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.business.query.GenericQueryFactory.BuilderType; @@ -23,9 +8,14 @@ import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; -import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/SecureAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/SecureAction.java index f8d6e9e3ba3d..0199295b19f9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/SecureAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/SecureAction.java @@ -1,9 +1,9 @@ package com.dotmarketing.cms; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; import com.dotmarketing.util.SecurityLogger; +import org.apache.struts.actions.DispatchAction; @Deprecated public class SecureAction extends DispatchAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/comment/action/CommentsAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/comment/action/CommentsAction.java index f794941cf407..801eff9fa36e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/comment/action/CommentsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/comment/action/CommentsAction.java @@ -1,24 +1,7 @@ package com.dotmarketing.cms.comment.action; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.dotcms.rendering.velocity.viewtools.CommentsWebAPI; import com.dotcms.repackage.com.google.common.collect.ImmutableList; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -52,10 +35,25 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.VelocityUtil; import com.dotmarketing.util.WebKeys; -import com.dotcms.rendering.velocity.viewtools.CommentsWebAPI; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.util.Html; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/comment/struts/CommentsForm.java b/dotCMS/src/main/java/com/dotmarketing/cms/comment/struts/CommentsForm.java index 941b8de284ca..7b8ef4425931 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/comment/struts/CommentsForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/comment/struts/CommentsForm.java @@ -1,16 +1,7 @@ package com.dotmarketing.cms.comment.struts; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.dotcms.repackage.com.octo.captcha.service.CaptchaServiceException; import com.dotcms.repackage.nl.captcha.Captcha; -import com.dotcms.repackage.org.apache.struts.action.ActionError; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.exception.DotDataException; @@ -23,6 +14,13 @@ import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionError; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; /** * This class manage the comments beans @@ -30,7 +28,7 @@ * @version 1.5 * @since 1.0 */ -@Deprecated +@Deprecated public class CommentsForm extends ValidatorForm { /** diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/content/submit/action/SubmitContentAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/content/submit/action/SubmitContentAction.java index 113f2b7035b0..de2ee1e9727e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/content/submit/action/SubmitContentAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/content/submit/action/SubmitContentAction.java @@ -1,22 +1,5 @@ package com.dotmarketing.cms.content.submit.action; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Clickstream; import com.dotmarketing.beans.Host; @@ -51,6 +34,21 @@ import com.liferay.portal.model.User; import com.liferay.util.FileUtil; import com.liferay.util.servlet.UploadServletRequest; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; /** * This Action manage the submit content save procedure diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/action/CreateAccountAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/action/CreateAccountAction.java index caa7ec509058..2be3158bf080 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/action/CreateAccountAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/action/CreateAccountAction.java @@ -1,24 +1,10 @@ package com.dotmarketing.cms.createaccount.action; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.dotcms.enterprise.PasswordFactoryProxy; import com.dotcms.enterprise.de.qaware.heimdall.PasswordException; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.DotStateException; import com.dotmarketing.business.NoSuchUserException; import com.dotmarketing.business.Role; import com.dotmarketing.business.UserAPI; @@ -29,20 +15,17 @@ import com.dotmarketing.cms.login.action.LoginAction; import com.dotmarketing.cms.login.factories.LoginFactory; import com.dotmarketing.cms.login.struts.LoginForm; -import com.dotmarketing.cms.myaccount.action.MyAccountAction; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.portlets.categories.business.CategoryAPI; import com.dotmarketing.portlets.categories.model.Category; - import com.dotmarketing.portlets.user.factories.UserCommentsFactory; import com.dotmarketing.portlets.user.model.UserComment; import com.dotmarketing.util.Config; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.Mailer; -import com.dotmarketing.util.SecurityLogger; import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.language.LanguageException; @@ -50,6 +33,16 @@ import com.liferay.portal.model.Address; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; +import java.util.Date; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; @Deprecated public class CreateAccountAction extends SecureAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/struts/CreateAccountForm.java b/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/struts/CreateAccountForm.java index 2a824fc4b08e..ed12de104445 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/struts/CreateAccountForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/createaccount/struts/CreateAccountForm.java @@ -1,21 +1,18 @@ package com.dotmarketing.cms.createaccount.struts; -import java.io.Serializable; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; - import com.dotmarketing.business.APILocator; import com.dotmarketing.util.FormSpamFilter; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.io.Serializable; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; @Deprecated public class CreateAccountForm extends ActionForm implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/action/ForgotPasswordAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/action/ForgotPasswordAction.java index f8b80798dea8..c07397a85d88 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/action/ForgotPasswordAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/action/ForgotPasswordAction.java @@ -1,21 +1,6 @@ package com.dotmarketing.cms.forgotpassword.action; -import java.util.Date; -import java.util.HashMap; -import java.util.StringTokenizer; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.dotcms.enterprise.PasswordFactoryProxy; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.UserProxy; @@ -40,6 +25,18 @@ import com.liferay.portal.SystemException; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; +import java.util.Date; +import java.util.HashMap; +import java.util.StringTokenizer; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/struts/ForgotPasswordForm.java b/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/struts/ForgotPasswordForm.java index 3b844bf84307..f67e4b58da56 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/struts/ForgotPasswordForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/forgotpassword/struts/ForgotPasswordForm.java @@ -1,15 +1,13 @@ package com.dotmarketing.cms.forgotpassword.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.UtilMethods; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.validator.ValidatorForm; @Deprecated public class ForgotPasswordForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LoginAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LoginAction.java index 6fa4d9b4596e..2a45b74c05c7 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LoginAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LoginAction.java @@ -1,20 +1,5 @@ package com.dotmarketing.cms.login.action; -import java.util.List; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; - import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; @@ -31,6 +16,17 @@ import com.liferay.portal.NoSuchUserException; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; +import java.util.List; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LogoutAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LogoutAction.java index ca02a8cca375..bd2273b8a14d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LogoutAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/login/action/LogoutAction.java @@ -1,21 +1,18 @@ package com.dotmarketing.cms.login.action; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; - import com.dotcms.util.SecurityUtils; import com.dotmarketing.cms.SecureAction; import com.dotmarketing.cms.login.factories.LoginFactory; import com.dotmarketing.util.UtilMethods; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/login/struts/LoginForm.java b/dotCMS/src/main/java/com/dotmarketing/cms/login/struts/LoginForm.java index a80a903a82bc..9dfe3cf34cb8 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/login/struts/LoginForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/login/struts/LoginForm.java @@ -1,13 +1,11 @@ package com.dotmarketing.cms.login.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.liferay.portal.util.Constants; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; @Deprecated public class LoginForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AccountActivationAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AccountActivationAction.java index 3d7b2ad08035..721a130f58c3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AccountActivationAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AccountActivationAction.java @@ -1,19 +1,5 @@ package com.dotmarketing.cms.myaccount.action; -import java.util.Date; -import java.util.HashMap; -import java.util.StringTokenizer; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.web.HostWebAPI; @@ -28,8 +14,18 @@ import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; +import java.util.Date; +import java.util.HashMap; +import java.util.StringTokenizer; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; -@Deprecated +@Deprecated public class AccountActivationAction extends SecureAction { @SuppressWarnings("unchecked") diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AddressAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AddressAction.java index df8ba02c4b35..f98ded54f991 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AddressAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/AddressAction.java @@ -1,6 +1,5 @@ package com.dotmarketing.cms.myaccount.action; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; import com.dotmarketing.cms.SecureAction; diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyAccountAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyAccountAction.java index 4b6224b2c0f7..44c4b65b2ee2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyAccountAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyAccountAction.java @@ -1,19 +1,6 @@ package com.dotmarketing.cms.myaccount.action; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.dotcms.enterprise.PasswordFactoryProxy; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; @@ -36,6 +23,17 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.Address; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; @Deprecated public class MyAccountAction extends SecureAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyInterestsAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyInterestsAction.java index 0afb42cb1328..2daf36707109 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyInterestsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/action/MyInterestsAction.java @@ -1,17 +1,5 @@ package com.dotmarketing.cms.myaccount.action; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; import com.dotmarketing.cms.SecureAction; @@ -24,8 +12,17 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; - -@Deprecated +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +@Deprecated public class MyInterestsAction extends SecureAction { private CategoryAPI categoryAPI = APILocator.getCategoryAPI(); diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/struts/MyAccountForm.java b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/struts/MyAccountForm.java index f1d5e2364a2c..cda6b6e3b9fc 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/struts/MyAccountForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/myaccount/struts/MyAccountForm.java @@ -1,12 +1,11 @@ package com.dotmarketing.cms.myaccount.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; import com.dotmarketing.util.UtilMethods; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; @Deprecated public class MyAccountForm extends ActionForm diff --git a/dotCMS/src/main/java/com/dotmarketing/cms/webforms/action/SubmitWebFormAction.java b/dotCMS/src/main/java/com/dotmarketing/cms/webforms/action/SubmitWebFormAction.java index f942857a288f..7725ffcc4ae9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/cms/webforms/action/SubmitWebFormAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/cms/webforms/action/SubmitWebFormAction.java @@ -1,26 +1,7 @@ package com.dotmarketing.cms.webforms.action; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import com.dotcms.enterprise.PasswordFactoryProxy; import com.dotcms.repackage.nl.captcha.Captcha; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.UserProxy; @@ -50,6 +31,22 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.util.servlet.UploadServletRequest; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java b/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java index ab6cd8bf6924..b8832d79c66e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java @@ -1,5 +1,16 @@ package com.dotmarketing.common.db; +import static com.dotcms.util.CloseUtils.closeQuietly; +import static com.dotcms.util.CollectionsUtils.map; + +import com.dotcms.business.CloseDBIfOpened; +import com.dotmarketing.db.DbConnectionFactory; +import com.dotmarketing.exception.DotDataException; +import com.dotmarketing.exception.DotRuntimeException; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.json.JSONException; +import com.dotmarketing.util.json.JSONObject; import java.math.BigDecimal; import java.sql.CallableStatement; import java.sql.Connection; @@ -9,22 +20,17 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Timestamp; -import java.util.*; - -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import static com.dotcms.util.CloseUtils.*; -import com.dotmarketing.db.DbConnectionFactory; -import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.exception.DotRuntimeException; -import com.dotmarketing.util.Config; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.json.JSONException; -import com.dotmarketing.util.json.JSONObject; -import static com.dotcms.util.CollectionsUtils.*; - -import com.dotcms.business.CloseDBIfOpened; -import com.dotcms.business.WrapInTransaction; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import org.apache.commons.collections.map.LRUMap; +import org.apache.commons.lang.StringUtils; /** * Description of the Class diff --git a/dotCMS/src/main/java/com/dotmarketing/common/util/SQLUtil.java b/dotCMS/src/main/java/com/dotmarketing/common/util/SQLUtil.java index 34ca4a64c0c1..441e53e3d859 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/util/SQLUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/util/SQLUtil.java @@ -1,8 +1,6 @@ package com.dotmarketing.common.util; import com.dotcms.repackage.com.google.common.collect.ImmutableSet; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.SecurityLoggerServiceAPI; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotStateException; @@ -26,6 +24,8 @@ import net.sourceforge.squirrel_sql.plugins.mysql.tokenizer.MysqlQueryTokenizer; import net.sourceforge.squirrel_sql.plugins.oracle.prefs.OraclePreferenceBean; import net.sourceforge.squirrel_sql.plugins.oracle.tokenizer.OracleQueryTokenizer; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; /** * Util class for sanitize, tokenize, etc diff --git a/dotCMS/src/main/java/com/dotmarketing/comparators/ContentComparator.java b/dotCMS/src/main/java/com/dotmarketing/comparators/ContentComparator.java index 304d4fa0ab74..92e38a3cf62a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/comparators/ContentComparator.java +++ b/dotCMS/src/main/java/com/dotmarketing/comparators/ContentComparator.java @@ -1,11 +1,9 @@ package com.dotmarketing.comparators; +import com.dotmarketing.portlets.contentlet.model.Contentlet; import java.util.Comparator; import java.util.Date; - -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; - -import com.dotmarketing.portlets.contentlet.model.Contentlet; +import org.apache.commons.beanutils.PropertyUtils; /** * @author Maria & David (Fat contentlet adaptations) diff --git a/dotCMS/src/main/java/com/dotmarketing/db/DotSQLGeneratorTask.java b/dotCMS/src/main/java/com/dotmarketing/db/DotSQLGeneratorTask.java index 7ce8fd47a6f3..0b235784ea3d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/db/DotSQLGeneratorTask.java +++ b/dotCMS/src/main/java/com/dotmarketing/db/DotSQLGeneratorTask.java @@ -1,20 +1,17 @@ package com.dotmarketing.db; +import com.dotmarketing.util.Logger; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.util.regex.Matcher; - -import com.dotcms.repackage.net.sf.hibernate.cfg.Configuration; -import com.dotcms.repackage.net.sf.hibernate.tool.hbm2ddl.SchemaExport; - +import net.sf.hibernate.cfg.Configuration; +import net.sf.hibernate.tool.hbm2ddl.SchemaExport; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -import com.dotmarketing.util.Logger; - public final class DotSQLGeneratorTask extends Task { /* * This class is meant to be run from ant in the project root. It will @@ -50,19 +47,19 @@ public void execute() throws BuildException { Configuration cfg = new Configuration(); cfg.setProperty("hibernate.dialect", dialect); - if (dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.MySQLDialect")){ + if (dialect.equals("net.sf.hibernate.dialect.MySQLDialect")){ cfg.setProperty("hibernate.connection.driver_class", "com.mysql.jdbc.Driver"); cfg.addResource("com/dotmarketing/beans/DotCMSId.hbm.xml"); - }else if (dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.SybaseDialect")){ + }else if (dialect.equals("net.sf.hibernate.dialect.SybaseDialect")){ cfg.addResource("com/dotmarketing/beans/DotCMSId.hbm.xml"); cfg.setProperty("hibernate.connection.driver_class", "net.sourceforge.jtds.jdbc.Driver"); - }else if(dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.OracleDialect")){ + }else if(dialect.equals("net.sf.hibernate.dialect.OracleDialect")){ cfg.addResource("com/dotmarketing/beans/DotCMSSeq.hbm.xml"); cfg.setProperty("hibernate.connection.driver_class", "oracle.jdbc.driver.OracleDriver"); - }else if(dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.PostgreSQLDialect")) { + }else if(dialect.equals("net.sf.hibernate.dialect.PostgreSQLDialect")) { cfg.addResource("com/dotmarketing/beans/DotCMSSeq.hbm.xml"); cfg.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver"); - }else if(dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.HSQLDialect")) { + }else if(dialect.equals("net.sf.hibernate.dialect.HSQLDialect")) { cfg.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); cfg.addResource("com/dotmarketing/beans/DotCMSId.hbm.xml"); } @@ -108,20 +105,20 @@ public void execute() throws BuildException { myLine = s.toString(); } } - if (dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.PostgreSQLDialect") - || dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.SybaseDialect") - || dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.HSQLDialect")) { + if (dialect.equals("net.sf.hibernate.dialect.PostgreSQLDialect") + || dialect.equals("net.sf.hibernate.dialect.SybaseDialect") + || dialect.equals("net.sf.hibernate.dialect.HSQLDialect")) { if (myLine.contains("varchar(123456789)")) { myLine = myLine.replaceAll("varchar\\(123456789\\)", "text"); } - } else if (dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.OracleDialect")) { + } else if (dialect.equals("net.sf.hibernate.dialect.OracleDialect")) { if (myLine.contains("varchar2(123456789)")) { myLine = myLine.replaceAll("varchar2\\(123456789\\)", "clob"); } else if (myLine.contains(" long ") || myLine.contains(" long,")) { myLine = myLine.replaceAll("long", "nclob"); } - } else if (dialect.equals("com.dotcms.repackage.net.sf.hibernate.dialect.MySQLDialect")) { + } else if (dialect.equals("net.sf.hibernate.dialect.MySQLDialect")) { if (myLine.contains("varchar(123456789)")) { myLine = myLine.replaceAll("varchar\\(123456789\\)", "longtext"); } diff --git a/dotCMS/src/main/java/com/dotmarketing/db/HibernateUtil.java b/dotCMS/src/main/java/com/dotmarketing/db/HibernateUtil.java index 6caf3aa0629f..b09c91039fd0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/db/HibernateUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/db/HibernateUtil.java @@ -1,17 +1,5 @@ package com.dotmarketing.db; -import com.dotcms.repackage.net.sf.hibernate.CallbackException; -import com.dotcms.repackage.net.sf.hibernate.FlushMode; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.Interceptor; -import com.dotcms.repackage.net.sf.hibernate.MappingException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.Session; -import com.dotcms.repackage.net.sf.hibernate.SessionFactory; -import com.dotcms.repackage.net.sf.hibernate.cfg.Configuration; -import com.dotcms.repackage.net.sf.hibernate.cfg.Mappings; -import com.dotcms.repackage.net.sf.hibernate.type.Type; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotHibernateException; @@ -37,6 +25,18 @@ import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import net.sf.hibernate.CallbackException; +import net.sf.hibernate.FlushMode; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.Interceptor; +import net.sf.hibernate.MappingException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.Session; +import net.sf.hibernate.SessionFactory; +import net.sf.hibernate.cfg.Configuration; +import net.sf.hibernate.cfg.Mappings; +import net.sf.hibernate.type.Type; /** * This class provides a great number of utility methods that allow developers to interact with @@ -641,27 +641,27 @@ private static void buildSessionFactory() throws DotHibernateException{ cfg.addResource("com/dotmarketing/beans/DotCMSId.hbm.xml"); cfg.addResource("com/dotmarketing/beans/DotCMSId_NOSQLGEN.hbm.xml"); getPluginsHBM("Id",cfg); - cfg.setProperty("hibernate.dialect", "com.dotcms.repackage.net.sf.hibernate.dialect.MySQLDialect"); + cfg.setProperty("hibernate.dialect", "net.sf.hibernate.dialect.MySQLDialect"); } else if (DbConnectionFactory.isPostgres()) { cfg.addResource("com/dotmarketing/beans/DotCMSSeq.hbm.xml"); cfg.addResource("com/dotmarketing/beans/DotCMSSeq_NOSQLGEN.hbm.xml"); getPluginsHBM("Seq",cfg); - cfg.setProperty("hibernate.dialect", "com.dotcms.repackage.net.sf.hibernate.dialect.PostgreSQLDialect"); + cfg.setProperty("hibernate.dialect", "net.sf.hibernate.dialect.PostgreSQLDialect"); } else if (DbConnectionFactory.isMsSql()) { cfg.addResource("com/dotmarketing/beans/DotCMSId.hbm.xml"); cfg.addResource("com/dotmarketing/beans/DotCMSId_NOSQLGEN.hbm.xml"); getPluginsHBM("Id",cfg); - cfg.setProperty("hibernate.dialect", "com.dotcms.repackage.net.sf.hibernate.dialect.SQLServerDialect"); + cfg.setProperty("hibernate.dialect", "net.sf.hibernate.dialect.SQLServerDialect"); } else if (DbConnectionFactory.isOracle()) { cfg.addResource("com/dotmarketing/beans/DotCMSSeq.hbm.xml"); cfg.addResource("com/dotmarketing/beans/DotCMSSeq_NOSQLGEN.hbm.xml"); getPluginsHBM("Seq",cfg); - cfg.setProperty("hibernate.dialect", "com.dotcms.repackage.net.sf.hibernate.dialect.OracleDialect"); + cfg.setProperty("hibernate.dialect", "net.sf.hibernate.dialect.OracleDialect"); } else if (DbConnectionFactory.isH2()) { cfg.addResource("com/dotmarketing/beans/DotCMSId.hbm.xml"); cfg.addResource("com/dotmarketing/beans/DotCMSId_NOSQLGEN.hbm.xml"); getPluginsHBM("Id",cfg); - cfg.setProperty("hibernate.dialect", "com.dotcms.repackage.net.sf.hibernate.dialect.HSQLDialect"); + cfg.setProperty("hibernate.dialect", "net.sf.hibernate.dialect.HSQLDialect"); } cfg.setInterceptor(new NoDirtyFlushInterceptor()); diff --git a/dotCMS/src/main/java/com/dotmarketing/db/LowercaseNamingStrategy.java b/dotCMS/src/main/java/com/dotmarketing/db/LowercaseNamingStrategy.java index f31a212a87f6..339dc2f432c1 100644 --- a/dotCMS/src/main/java/com/dotmarketing/db/LowercaseNamingStrategy.java +++ b/dotCMS/src/main/java/com/dotmarketing/db/LowercaseNamingStrategy.java @@ -1,6 +1,6 @@ package com.dotmarketing.db; -import com.dotcms.repackage.net.sf.hibernate.cfg.DefaultNamingStrategy; +import net.sf.hibernate.cfg.DefaultNamingStrategy; public class LowercaseNamingStrategy extends DefaultNamingStrategy { diff --git a/dotCMS/src/main/java/com/dotmarketing/db/NoCacheProvider.java b/dotCMS/src/main/java/com/dotmarketing/db/NoCacheProvider.java index c3ce15ee2765..f43cb31dce9b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/db/NoCacheProvider.java +++ b/dotCMS/src/main/java/com/dotmarketing/db/NoCacheProvider.java @@ -1,10 +1,9 @@ package com.dotmarketing.db; import java.util.Properties; - -import com.dotcms.repackage.net.sf.hibernate.cache.Cache; -import com.dotcms.repackage.net.sf.hibernate.cache.CacheException; -import com.dotcms.repackage.net.sf.hibernate.cache.CacheProvider; +import net.sf.hibernate.cache.Cache; +import net.sf.hibernate.cache.CacheException; +import net.sf.hibernate.cache.CacheProvider; public class NoCacheProvider implements CacheProvider { @@ -18,16 +17,4 @@ public long nextTimestamp() { return System.currentTimeMillis() / 100; } - @Override - public void start(Properties arg0) throws CacheException { - - - } - - @Override - public void stop() { - - - } - } diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/EmailFactory.java b/dotCMS/src/main/java/com/dotmarketing/factories/EmailFactory.java index fdf7dd2bb7aa..b4d86d59035f 100644 --- a/dotCMS/src/main/java/com/dotmarketing/factories/EmailFactory.java +++ b/dotCMS/src/main/java/com/dotmarketing/factories/EmailFactory.java @@ -1,7 +1,6 @@ package com.dotmarketing.factories; import com.dotcms.rendering.velocity.services.VelocityType; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.UserProxy; @@ -54,6 +53,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.beanutils.BeanUtils; import org.apache.velocity.Template; import org.apache.velocity.context.Context; import org.apache.velocity.exception.MethodInvocationException; diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java b/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java index 1893eb7a218b..cfcf4a3da101 100644 --- a/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java +++ b/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java @@ -1,12 +1,5 @@ package com.dotmarketing.factories; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; - import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.APILocator; @@ -25,6 +18,11 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.Parameter; import com.dotmarketing.util.UtilMethods; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import net.sf.hibernate.ObjectNotFoundException; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/PermissionGenerator.java b/dotCMS/src/main/java/com/dotmarketing/factories/PermissionGenerator.java index a8391384a44f..7832415dd394 100644 --- a/dotCMS/src/main/java/com/dotmarketing/factories/PermissionGenerator.java +++ b/dotCMS/src/main/java/com/dotmarketing/factories/PermissionGenerator.java @@ -1,9 +1,8 @@ package com.dotmarketing.factories; import java.io.Serializable; - -import com.dotcms.repackage.net.sf.hibernate.engine.SessionImplementor; -import com.dotcms.repackage.net.sf.hibernate.id.IdentifierGenerator; +import net.sf.hibernate.engine.SessionImplementor; +import net.sf.hibernate.id.IdentifierGenerator; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/filters/CharsetEncodingFilter.java b/dotCMS/src/main/java/com/dotmarketing/filters/CharsetEncodingFilter.java index bb4e79a9bc3c..d70b281cb46e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/filters/CharsetEncodingFilter.java +++ b/dotCMS/src/main/java/com/dotmarketing/filters/CharsetEncodingFilter.java @@ -5,9 +5,17 @@ */ package com.dotmarketing.filters; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.web.WebAPILocator; +import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.ServletResponseCharacterEncoding; +import com.dotmarketing.util.UtilMethods; +import com.liferay.portal.PortalException; +import com.liferay.portal.model.User; +import com.liferay.portal.util.PortalUtil; import java.io.IOException; import java.util.Locale; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -17,21 +25,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.Globals; - -import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.web.WebAPILocator; -import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI; -import com.dotmarketing.portlets.languagesmanager.model.Language; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.ServletResponseCharacterEncoding; -import com.dotmarketing.util.UtilMethods; -import com.dotmarketing.util.WebKeys; -import com.liferay.portal.PortalException; -import com.liferay.portal.model.User; -import com.liferay.portal.util.PortalUtil; -import com.liferay.util.Xss; +import org.apache.struts.Globals; /** * Ensures the proper encoding diff --git a/dotCMS/src/main/java/com/dotmarketing/filters/DotUrlRewriteFilter.java b/dotCMS/src/main/java/com/dotmarketing/filters/DotUrlRewriteFilter.java index 3b8bbd4a6c51..7af83ab915f5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/filters/DotUrlRewriteFilter.java +++ b/dotCMS/src/main/java/com/dotmarketing/filters/DotUrlRewriteFilter.java @@ -1,14 +1,13 @@ package com.dotmarketing.filters; import com.dotmarketing.util.Config; -import com.dotcms.repackage.org.tuckey.web.filters.urlrewrite.Conf; -import com.dotcms.repackage.org.tuckey.web.filters.urlrewrite.Rule; -import com.dotcms.repackage.org.tuckey.web.filters.urlrewrite.UrlRewriteFilter; - -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import java.lang.reflect.Field; import java.util.List; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import org.tuckey.web.filters.urlrewrite.Conf; +import org.tuckey.web.filters.urlrewrite.Rule; +import org.tuckey.web.filters.urlrewrite.UrlRewriteFilter; /** * Created by Jonathan Gamba diff --git a/dotCMS/src/main/java/com/dotmarketing/filters/ThreadNameFilter.java b/dotCMS/src/main/java/com/dotmarketing/filters/ThreadNameFilter.java index 8043b5f54f01..67815721aa83 100644 --- a/dotCMS/src/main/java/com/dotmarketing/filters/ThreadNameFilter.java +++ b/dotCMS/src/main/java/com/dotmarketing/filters/ThreadNameFilter.java @@ -9,10 +9,14 @@ */ package com.dotmarketing.filters; +import com.dotmarketing.beans.Host; +import com.dotmarketing.business.web.HostWebAPI; +import com.dotmarketing.business.web.WebAPILocator; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.PageMode; import java.io.IOException; import java.io.StringWriter; import java.util.Date; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -20,13 +24,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.time.FastDateFormat; -import com.dotmarketing.beans.Host; -import com.dotmarketing.business.web.HostWebAPI; -import com.dotmarketing.business.web.WebAPILocator; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.PageMode; +import org.apache.commons.lang.time.FastDateFormat; public class ThreadNameFilter implements Filter { FastDateFormat df = FastDateFormat.getInstance("MM-dd-yyyy hh:mm:ss z"); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java index 6d7d0264ac07..2c59c0238b9f 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java @@ -1,9 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -17,6 +14,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; @@ -28,6 +27,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import net.sf.hibernate.HibernateException; public class FixTask00001CheckAssetsMissingIdentifiers implements FixTask { @@ -132,7 +132,7 @@ public List > executeFix() throws DotDataException, DotRunti if(o instanceof Inode){ Inode i = (Inode)o; String type = i.getType(); - String tableName = ((com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); + String tableName = ((net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); MaintenanceUtil.cleanInodeTableData(tableName, type); //FixAssetsProcessStatus.addAError(); } @@ -154,7 +154,7 @@ public List > executeFix() throws DotDataException, DotRunti if(o instanceof Inode){ Inode i = (Inode)o; String type = i.getType(); - String tableName = ((com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); + String tableName = ((net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); MaintenanceUtil.removeOphanedInodes(tableName, type); } diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java index 8ffcc0fa1ac0..866a7d7ebd5d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java @@ -1,8 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Inode; import com.dotmarketing.common.db.DotConnect; @@ -15,6 +13,8 @@ import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactory; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java index 0c312845d42e..cb7e0a1ec288 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java @@ -1,8 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -14,6 +12,8 @@ import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactory; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java index 66c03763ca1d..b7768eb12432 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java @@ -1,8 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -14,6 +12,8 @@ import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactory; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java index 8ef0c3ab0841..ffa792c37598 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java @@ -1,8 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -14,6 +12,8 @@ import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactory; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java index f67114a100c8..dbc0b9d0802d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java @@ -1,8 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -13,6 +11,8 @@ import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactory; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java index c08e682d94e8..676fc85fa961 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java @@ -1,7 +1,5 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -12,6 +10,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java index b43a74570529..fe501b3b79dd 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java @@ -1,7 +1,5 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode; @@ -18,6 +16,8 @@ import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java index d7112746335f..600aafedbb2e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java @@ -1,7 +1,5 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Inode; @@ -14,6 +12,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java index dd2109ceaa7d..e3220e4e3699 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java @@ -3,8 +3,6 @@ */ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; @@ -16,6 +14,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java index 2079b5b5ed73..76f6bc863908 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java @@ -1,7 +1,5 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; @@ -13,6 +11,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java index 4e507af904df..1e1f7f06b033 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java @@ -1,7 +1,5 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.CacheLocator; @@ -12,6 +10,8 @@ import com.dotmarketing.portlets.cmsmaintenance.ajax.FixAssetsProcessStatus; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java index 3fe9c62a5e0a..cd2c2c654293 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java @@ -1,7 +1,5 @@ package com.dotmarketing.fixtask.tasks; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; @@ -14,6 +12,8 @@ import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.MaintenanceUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java index e2a06552ade5..ccdd843a4cf3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java @@ -3,8 +3,6 @@ import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.com.google.common.base.Preconditions; import com.dotcms.repackage.com.google.common.base.Strings; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Identifier; @@ -20,6 +18,8 @@ import com.dotmarketing.portlets.folders.model.Folder; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java index 53c541289d33..6ceb59d58ab6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java @@ -1,22 +1,6 @@ package com.dotmarketing.fixtask.tasks; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.nio.file.Files; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import com.dotcms.business.WrapInTransaction; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Inode; @@ -33,6 +17,21 @@ import com.dotmarketing.portlets.structure.model.Relationship; import com.dotmarketing.util.ConfigUtils; import com.dotmarketing.util.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.nio.file.Files; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * Fix broken relationships diff --git a/dotCMS/src/main/java/com/dotmarketing/logConsole/business/ConsoleLogFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/logConsole/business/ConsoleLogFactoryImpl.java index 9c6ef930f919..53ff350dd539 100644 --- a/dotCMS/src/main/java/com/dotmarketing/logConsole/business/ConsoleLogFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/logConsole/business/ConsoleLogFactoryImpl.java @@ -1,18 +1,17 @@ package com.dotmarketing.logConsole.business; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.logConsole.model.LogMapperRow; import com.dotmarketing.util.Logger; - import java.lang.reflect.InvocationTargetException; import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; public class ConsoleLogFactoryImpl implements ConsoleLogFactory { diff --git a/dotCMS/src/main/java/com/dotmarketing/logConsole/form/ConsoleLogForm.java b/dotCMS/src/main/java/com/dotmarketing/logConsole/form/ConsoleLogForm.java index b7643fd3e29d..a8a3c0ffb8e2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/logConsole/form/ConsoleLogForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/logConsole/form/ConsoleLogForm.java @@ -1,6 +1,6 @@ package com.dotmarketing.logConsole.form; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; +import org.apache.struts.validator.ValidatorForm; public class ConsoleLogForm extends ValidatorForm{ diff --git a/dotCMS/src/main/java/com/dotmarketing/logConsole/model/LogMapperRow.java b/dotCMS/src/main/java/com/dotmarketing/logConsole/model/LogMapperRow.java index 70ced0102c73..eafbb236d5c6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/logConsole/model/LogMapperRow.java +++ b/dotCMS/src/main/java/com/dotmarketing/logConsole/model/LogMapperRow.java @@ -1,11 +1,10 @@ package com.dotmarketing.logConsole.model; import com.dotmarketing.util.UtilMethods; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; public class LogMapperRow implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/osgi/ActivatorUtil.java b/dotCMS/src/main/java/com/dotmarketing/osgi/ActivatorUtil.java index 26a1e40acb5f..d1518a19ea0e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/osgi/ActivatorUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/osgi/ActivatorUtil.java @@ -1,9 +1,6 @@ package com.dotmarketing.osgi; import com.dotcms.repackage.org.apache.commons.io.FilenameUtils; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; -import com.dotcms.repackage.org.apache.struts.config.impl.ModuleConfigImpl; import com.dotmarketing.util.Config; import com.dotmarketing.util.VelocityUtil; import com.liferay.portal.util.Constants; @@ -18,6 +15,9 @@ import java.util.Enumeration; import javax.servlet.ServletContext; import org.apache.felix.http.api.ExtHttpService; +import org.apache.struts.Globals; +import org.apache.struts.config.ModuleConfig; +import org.apache.struts.config.impl.ModuleConfigImpl; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/dotCMS/src/main/java/com/dotmarketing/osgi/GenericBundleActivator.java b/dotCMS/src/main/java/com/dotmarketing/osgi/GenericBundleActivator.java index e9cf538f6379..38b20b079bab 100644 --- a/dotCMS/src/main/java/com/dotmarketing/osgi/GenericBundleActivator.java +++ b/dotCMS/src/main/java/com/dotmarketing/osgi/GenericBundleActivator.java @@ -12,13 +12,6 @@ import com.dotcms.enterprise.cache.provider.CacheProviderAPI; import com.dotcms.enterprise.rules.RulesAPI; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.config.ActionConfig; -import com.dotcms.repackage.org.apache.struts.config.ForwardConfig; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; -import com.dotcms.repackage.org.tuckey.web.filters.urlrewrite.NormalRule; -import com.dotcms.repackage.org.tuckey.web.filters.urlrewrite.Rule; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.Interceptor; import com.dotmarketing.business.cache.CacheOSGIService; @@ -67,6 +60,11 @@ import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.loading.ClassReloadingStrategy; import org.apache.felix.http.proxy.DispatcherTracker; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.config.ActionConfig; +import org.apache.struts.config.ForwardConfig; +import org.apache.struts.config.ModuleConfig; import org.apache.velocity.tools.view.PrimitiveToolboxManager; import org.apache.velocity.tools.view.ToolInfo; import org.apache.velocity.tools.view.servlet.ServletToolboxManager; @@ -75,6 +73,8 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.quartz.SchedulerException; +import org.tuckey.web.filters.urlrewrite.NormalRule; +import org.tuckey.web.filters.urlrewrite.Rule; /** * Created by Jonathan Gamba diff --git a/dotCMS/src/main/java/com/dotmarketing/plugin/model/PluginProperty.java b/dotCMS/src/main/java/com/dotmarketing/plugin/model/PluginProperty.java index 514376b592ef..089c4fd49461 100644 --- a/dotCMS/src/main/java/com/dotmarketing/plugin/model/PluginProperty.java +++ b/dotCMS/src/main/java/com/dotmarketing/plugin/model/PluginProperty.java @@ -4,9 +4,8 @@ package com.dotmarketing.plugin.model; import java.io.Serializable; - -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; /** * @author Jason Tesser diff --git a/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletAction.java b/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletAction.java index 807d8ae61ce8..524a1bdd5145 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletAction.java @@ -9,23 +9,10 @@ import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ; import static com.dotmarketing.business.PermissionAPI.PERMISSION_WRITE; -import java.util.ArrayList; -import java.util.List; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -47,7 +34,13 @@ import com.dotmarketing.portlets.containers.model.Container; import com.dotmarketing.portlets.contentlet.business.HostAPI; import com.dotmarketing.portlets.folders.model.Folder; -import com.dotmarketing.util.*; +import com.dotmarketing.util.ActivityLogger; +import com.dotmarketing.util.HostUtil; +import com.dotmarketing.util.InodeUtils; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.PaginatedArrayList; +import com.dotmarketing.util.UtilMethods; +import com.dotmarketing.util.WebKeys; import com.liferay.portal.NoSuchUserException; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.Company; @@ -57,6 +50,16 @@ import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * Provides utility methods to interact with {@link WebAsset} objects in dotCMS. diff --git a/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletActionInterface.java b/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletActionInterface.java index fa6e875524da..597b65bef9c2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletActionInterface.java +++ b/dotCMS/src/main/java/com/dotmarketing/portal/struts/DotPortletActionInterface.java @@ -9,10 +9,8 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; - import com.liferay.portal.model.User; +import org.apache.struts.action.ActionForm; /** * @author Maria diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/browser/action/ViewBrowserAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/browser/action/ViewBrowserAction.java index 7a0a863fdeb1..db0ed3aa01a3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/browser/action/ViewBrowserAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/browser/action/ViewBrowserAction.java @@ -1,17 +1,8 @@ package com.dotmarketing.portlets.browser.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.factories.PreviewFactory; import com.dotmarketing.portlets.languagesmanager.model.Language; @@ -19,6 +10,12 @@ import com.liferay.portal.struts.PortletAction; import com.liferay.portal.util.Constants; import com.liferay.portlet.RenderRequestImpl; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/EditEventAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/EditEventAction.java index cbc57571caac..8b61683fa4b5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/EditEventAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/EditEventAction.java @@ -1,22 +1,8 @@ package com.dotmarketing.portlets.calendar.action; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; @@ -34,6 +20,17 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionRequestImpl; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * Struts controller that handle portlet actions to save/publish/un-publish/archive and delete diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/SendVCalendarDetail.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/SendVCalendarDetail.java index 11b9ced5337e..e9a1f4c20655 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/SendVCalendarDetail.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/SendVCalendarDetail.java @@ -1,17 +1,5 @@ package com.dotmarketing.portlets.calendar.action; -import java.io.OutputStreamWriter; -import java.text.SimpleDateFormat; -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.web.HostWebAPI; @@ -23,6 +11,15 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.portal.util.PortalUtil; +import java.io.OutputStreamWriter; +import java.text.SimpleDateFormat; +import java.util.Date; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.actions.DispatchAction; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/ViewCalendarAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/ViewCalendarAction.java index 3e2e87b4a2ef..74d227ac32e8 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/ViewCalendarAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/action/ViewCalendarAction.java @@ -4,17 +4,15 @@ import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.portal.struts.DotPortletAction; import com.liferay.portal.PortalException; import com.liferay.portal.SystemException; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/action/CalendarReminderAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/action/CalendarReminderAction.java index 5631d121c14e..cc771620a951 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/action/CalendarReminderAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/action/CalendarReminderAction.java @@ -1,17 +1,15 @@ package com.dotmarketing.portlets.calendar.cms.action; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.actions.DispatchAction; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.calendar.business.CalendarReminderAPI; import com.dotmarketing.portlets.calendar.struts.CalendarReminderForm; import com.dotmarketing.util.UtilMethods; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.actions.DispatchAction; public class CalendarReminderAction extends DispatchAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/struts/EventForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/struts/EventForm.java index c84c8cd26268..96e08711b2a6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/struts/EventForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/cms/struts/EventForm.java @@ -1,21 +1,18 @@ package com.dotmarketing.portlets.calendar.cms.struts; +import com.dotmarketing.util.Logger; +import com.liferay.util.servlet.UploadServletRequest; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; - import javax.activation.MimetypesFileTypeMap; import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import com.dotmarketing.util.Logger; -import com.liferay.util.servlet.UploadServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.validator.ValidatorForm; /** * Used to manage the data comming doem the submit event frontend page diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/CalendarReminderForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/CalendarReminderForm.java index 600ce3585822..4bef2b8538f0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/CalendarReminderForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/CalendarReminderForm.java @@ -1,6 +1,6 @@ package com.dotmarketing.portlets.calendar.struts; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForm; public class CalendarReminderForm extends ActionForm{ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/EventForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/EventForm.java index e00c88f12035..0d33c5725684 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/EventForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/calendar/struts/EventForm.java @@ -1,16 +1,13 @@ package com.dotmarketing.portlets.calendar.struts; +import com.dotmarketing.portlets.contentlet.struts.ContentletForm; +import com.dotmarketing.util.Logger; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; - import javax.servlet.ServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - -import com.dotmarketing.portlets.contentlet.struts.ContentletForm; -import com.dotmarketing.util.Logger; +import org.apache.struts.action.ActionMapping; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/EditCategoryAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/EditCategoryAction.java index 471e08093334..16fb453615b1 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/EditCategoryAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/EditCategoryAction.java @@ -1,16 +1,8 @@ package com.dotmarketing.portlets.categories.action; -import java.lang.reflect.InvocationTargetException; - - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; @@ -27,6 +19,10 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.util.servlet.SessionMessages; +import java.lang.reflect.InvocationTargetException; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; public class EditCategoryAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoriesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoriesAction.java index bb368aaa06e2..52132426d235 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoriesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoriesAction.java @@ -4,16 +4,14 @@ import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.categories.business.CategoryAPI; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewCategoriesAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoryAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoryAction.java index 35d263cb9433..41332b04e104 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoryAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/action/ViewCategoryAction.java @@ -5,17 +5,7 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; -import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.categories.business.CategoryAPI; import com.dotmarketing.portlets.categories.model.Category; @@ -23,8 +13,12 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; -import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewCategoryAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/business/CategoryFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/business/CategoryFactoryImpl.java index 59555d57eec6..9cc350fef3ec 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/business/CategoryFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/business/CategoryFactoryImpl.java @@ -1,7 +1,5 @@ package com.dotmarketing.portlets.categories.business; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotmarketing.beans.Tree; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; @@ -28,6 +26,8 @@ import java.util.Date; import java.util.List; import java.util.Map; +import net.sf.hibernate.ObjectNotFoundException; +import org.apache.commons.beanutils.BeanUtils; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/model/Category.java b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/model/Category.java index 24b956cbd76e..bfef8ad90040 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/model/Category.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/model/Category.java @@ -1,14 +1,5 @@ package com.dotmarketing.portlets.categories.model; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode; import com.dotmarketing.beans.Tree; @@ -18,10 +9,7 @@ import com.dotmarketing.business.Permissionable; import com.dotmarketing.business.UserAPI; import com.dotmarketing.common.db.DotConnect; -import com.dotmarketing.db.DbConnectionFactory; -import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.exception.DotHibernateException; import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.factories.TreeFactory; @@ -29,6 +17,13 @@ import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; public class Category extends Inode implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/struts/CategoryForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/struts/CategoryForm.java index af887b9e4ce9..a0bc9c342da3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/categories/struts/CategoryForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/categories/struts/CategoryForm.java @@ -1,16 +1,5 @@ package com.dotmarketing.portlets.categories.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; @@ -21,6 +10,15 @@ import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java index a49adf4fa618..55e4eeb35d0a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java @@ -3,19 +3,12 @@ import com.dotcms.content.elasticsearch.business.ESIndexAPI; import com.dotcms.content.elasticsearch.business.IndiciesAPI.IndiciesInfo; import com.dotcms.contenttype.util.ContentTypeImportExportUtil; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; -import com.dotcms.repackage.com.thoughtworks.xstream.mapper.Mapper; import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotcms.util.transform.TransformerLocator; import com.dotmarketing.beans.Clickstream; import com.dotmarketing.beans.Clickstream404; @@ -74,6 +67,9 @@ import com.liferay.util.FileUtil; import com.liferay.util.servlet.SessionMessages; import com.liferay.util.servlet.UploadPortletRequest; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; +import com.thoughtworks.xstream.mapper.Mapper; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; @@ -97,6 +93,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * This class group all the CMS Maintenance Task @@ -602,9 +602,9 @@ private void createXMLFiles() throws ServletException, IOException, DotDataExcep //http://jira.dotmarketing.net/browse/DOTCMS-6059 if(clazz.equals(DashboardSummary404.class) || clazz.equals(DashboardUserPreferences.class)){ - _xstream.addDefaultImplementation(com.dotcms.repackage.net.sf.hibernate.collection.Set.class, java.util.Set.class); - _xstream.addDefaultImplementation(com.dotcms.repackage.net.sf.hibernate.collection.List.class, java.util.List.class); - _xstream.addDefaultImplementation(com.dotcms.repackage.net.sf.hibernate.collection.Map.class, java.util.Map.class); + _xstream.addDefaultImplementation(net.sf.hibernate.collection.Set.class, java.util.Set.class); + _xstream.addDefaultImplementation(net.sf.hibernate.collection.List.class, java.util.List.class); + _xstream.addDefaultImplementation(net.sf.hibernate.collection.Map.class, java.util.Map.class); Mapper mapper = _xstream.getMapper(); _xstream.registerConverter(new HibernateCollectionConverter(mapper)); _xstream.registerConverter(new HibernateMapConverter(mapper)); diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/ajax/CMSMaintenanceAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/ajax/CMSMaintenanceAjax.java index b36da3c854e2..df216ce46e4b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/ajax/CMSMaintenanceAjax.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/ajax/CMSMaintenanceAjax.java @@ -6,10 +6,6 @@ import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.field.FieldVariable; import com.dotcms.contenttype.util.ContentTypeImportExportUtil; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; -import com.dotcms.repackage.com.thoughtworks.xstream.mapper.Mapper; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; import com.dotcms.repackage.org.directwebremoting.WebContextFactory; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.Clickstream; @@ -64,6 +60,9 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.util.FileUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; +import com.thoughtworks.xstream.mapper.Mapper; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; @@ -84,6 +83,7 @@ import java.util.zip.ZipOutputStream; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import net.sf.hibernate.HibernateException; import org.quartz.JobExecutionContext; /** @@ -481,9 +481,9 @@ public void createXMLFiles() throws ServletException, IOException, DotDataExcept //http://jira.dotmarketing.net/browse/DOTCMS-6059 if(clazz.equals(DashboardSummary404.class) || clazz.equals(DashboardUserPreferences.class)){ - _xstream.addDefaultImplementation(com.dotcms.repackage.net.sf.hibernate.collection.Set.class, java.util.Set.class); - _xstream.addDefaultImplementation(com.dotcms.repackage.net.sf.hibernate.collection.List.class, java.util.List.class); - _xstream.addDefaultImplementation(com.dotcms.repackage.net.sf.hibernate.collection.Map.class, java.util.Map.class); + _xstream.addDefaultImplementation(net.sf.hibernate.collection.Set.class, java.util.Set.class); + _xstream.addDefaultImplementation(net.sf.hibernate.collection.List.class, java.util.List.class); + _xstream.addDefaultImplementation(net.sf.hibernate.collection.Map.class, java.util.Map.class); Mapper mapper = _xstream.getMapper(); _xstream.registerConverter(new HibernateCollectionConverter(mapper)); _xstream.registerConverter(new HibernateMapConverter(mapper)); diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/struts/CmsMaintenanceForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/struts/CmsMaintenanceForm.java index 89da984c32c5..76f8690b4bf5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/struts/CmsMaintenanceForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/struts/CmsMaintenanceForm.java @@ -1,10 +1,6 @@ package com.dotmarketing.portlets.cmsmaintenance.struts; -import java.util.List; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; - -import com.dotmarketing.portlets.structure.model.Structure; +import org.apache.struts.action.ActionForm; /** * This class form is created to manipulate the maintenance task * of the CMS Maintenance portlet diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/util/CleanAssetsThread.java b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/util/CleanAssetsThread.java index 0bc68611de4a..7b86e16e72be 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/util/CleanAssetsThread.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/cmsmaintenance/util/CleanAssetsThread.java @@ -1,18 +1,16 @@ package com.dotmarketing.portlets.cmsmaintenance.util; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotcms.repackage.org.apache.commons.io.FileUtils; - import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; /** * Created by Jonathan Gamba diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/EditContainerAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/EditContainerAction.java index fa40ff8951f9..876981940ab4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/EditContainerAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/EditContainerAction.java @@ -5,13 +5,6 @@ import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; - import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -43,23 +36,26 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.Validator; import com.dotmarketing.util.WebKeys; - +import com.liferay.portal.model.User; +import com.liferay.portal.struts.ActionException; +import com.liferay.portal.util.Constants; +import com.liferay.portlet.ActionRequestImpl; +import com.liferay.util.servlet.SessionMessages; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.Iterator; import java.util.LinkedList; import java.util.List; - import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; - -import com.liferay.portal.model.User; -import com.liferay.portal.struts.ActionException; -import com.liferay.portal.util.Constants; -import com.liferay.portlet.ActionRequestImpl; -import com.liferay.util.servlet.SessionMessages; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; /** * Portlet action used to maintain the containers diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/PublishContainersAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/PublishContainersAction.java index 20a61c35e1f8..92b7e6e2570b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/PublishContainersAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/PublishContainersAction.java @@ -1,14 +1,8 @@ package com.dotmarketing.portlets.containers.action; -import java.net.URLDecoder; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.exception.WebAssetException; @@ -23,6 +17,9 @@ import com.liferay.portal.model.User; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/ViewContainersAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/ViewContainersAction.java index 0cefde202cb7..5f3d6e4fa52c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/ViewContainersAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/action/ViewContainersAction.java @@ -1,18 +1,8 @@ package com.dotmarketing.portlets.containers.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.PermissionAPI; @@ -23,6 +13,13 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source @@ -34,8 +31,8 @@ public class ViewContainersAction extends DotPortletAction { /* - * @see com.liferay.portal.struts.PortletAction#render(com.dotcms.repackage.org.apache.struts.action.ActionMapping, - * com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, + * @see com.liferay.portal.struts.PortletAction#render(org.apache.struts.action.ActionMapping, + * org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, * com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) */ public ActionForward render(ActionMapping mapping, ActionForm form, diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/model/Container.java b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/model/Container.java index 07c62ca1e7d4..9fe1e7c2d667 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/model/Container.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/model/Container.java @@ -1,11 +1,5 @@ package com.dotmarketing.portlets.containers.model; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode; @@ -24,6 +18,10 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.builder.ToStringBuilder; /** @author Hibernate CodeGenerator */ public class Container extends WebAsset implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/struts/ContainerForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/struts/ContainerForm.java index 07cbf20734df..a126799209c9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/containers/struts/ContainerForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/containers/struts/ContainerForm.java @@ -1,18 +1,15 @@ package com.dotmarketing.portlets.containers.struts; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.beans.ContainerStructure; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.util.Constants; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ public class ContainerForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/EditContentletAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/EditContentletAction.java index 01947be8c930..9c82f1f4d2b9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/EditContentletAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/EditContentletAction.java @@ -1,30 +1,5 @@ package com.dotmarketing.portlets.contentlet.action; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; -import java.net.URLDecoder; -import java.sql.Timestamp; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import com.dotcms.api.system.event.Visibility; import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.contenttype.model.type.ContentType; @@ -37,13 +12,6 @@ import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.collections.CollectionUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; import com.dotcms.util.I18NMessage; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -118,6 +86,36 @@ import com.liferay.util.LocaleUtil; import com.liferay.util.StringPool; import com.liferay.util.servlet.SessionMessages; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import java.net.URLDecoder; +import java.sql.Timestamp; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; /** * This class processes all the interactions with contentlets that are diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportAuditUtil.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportAuditUtil.java index 954ee7030f54..f681f32dbe59 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportAuditUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportAuditUtil.java @@ -1,20 +1,17 @@ package com.dotmarketing.portlets.contentlet.action; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.common.db.DotConnect; +import com.dotmarketing.exception.DotDataException; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; - -import com.dotmarketing.business.APILocator; -import com.dotmarketing.common.db.DotConnect; -import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.util.InodeUtils; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.collections.map.LRUMap; public class ImportAuditUtil { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java index debb936d0649..462048694ed6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ImportContentletsAction.java @@ -4,8 +4,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.cache.FieldsCache; import com.dotmarketing.db.DbConnectionFactory; @@ -42,6 +40,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; import org.mozilla.universalchardet.UniversalDetector; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java index 8da4f8cbe388..9b98526ab438 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java @@ -1,11 +1,5 @@ package com.dotmarketing.portlets.contentlet.action; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.contenttype.model.type.ContentType; @@ -13,9 +7,6 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.portal.struts.DotPortletAction; @@ -33,6 +24,13 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; import com.liferay.portlet.RenderRequestImpl; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * Struts action that retrieves the required information to display the diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/Contentlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/Contentlet.java index 546c40d4c975..4c857a7f77bb 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/Contentlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/Contentlet.java @@ -1,20 +1,6 @@ package com.dotmarketing.portlets.contentlet.business; -import java.io.File; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.sql.Timestamp; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.dotcms.contenttype.transform.field.LegacyFieldTransformer; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; import com.dotmarketing.beans.WebAsset; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; @@ -25,6 +11,19 @@ import com.dotmarketing.portlets.structure.model.Structure; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; +import java.io.File; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.sql.Timestamp; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; /** @author Hibernate CodeGenerator */ public class Contentlet extends WebAsset implements Serializable { @@ -1725,7 +1724,7 @@ public Object getFieldValueByContentletName(String fieldName){ Object value = null; try{ - value = com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils.getProperty(this, fieldName); + value = org.apache.commons.beanutils.PropertyUtils.getProperty(this, fieldName); }catch(Exception e){ Logger .error(this, diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/HostAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/HostAPIImpl.java index 0de7ce741fe4..cb2eae3e8857 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/HostAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/HostAPIImpl.java @@ -6,13 +6,11 @@ import com.dotcms.api.system.event.Visibility; import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; -import com.dotcms.contenttype.model.field.DataTypes; import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.transform.contenttype.StructureTransformer; import com.dotcms.notifications.bean.NotificationLevel; import com.dotcms.notifications.bean.NotificationType; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.I18NMessage; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode; @@ -23,7 +21,6 @@ import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.business.PermissionLevel; import com.dotmarketing.business.Treeable; -import com.dotmarketing.business.query.GenericQueryFactory.Query; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.db.HibernateUtil; @@ -44,13 +41,13 @@ import com.dotmarketing.util.PaginatedArrayList; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.StringTokenizer; import java.util.stream.Collectors; +import org.apache.commons.lang.StringUtils; /** * @author jtesser diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/web/ContentletWebAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/web/ContentletWebAPIImpl.java index fedd534bcc9f..23d4c6de3b59 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/web/ContentletWebAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/business/web/ContentletWebAPIImpl.java @@ -1,25 +1,10 @@ package com.dotmarketing.portlets.contentlet.business.web; -import java.text.DateFormat; -import java.text.MessageFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; - import com.dotcms.api.system.event.ContentletSystemEventUtil; import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.transform.contenttype.StructureTransformer; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.collections.CollectionUtils; import com.dotcms.repackage.org.directwebremoting.WebContextFactory; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -60,7 +45,6 @@ import com.dotmarketing.portlets.folders.model.Folder; import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage; import com.dotmarketing.portlets.structure.business.FieldAPI; - import com.dotmarketing.portlets.structure.factories.StructureFactory; import com.dotmarketing.portlets.structure.model.ContentletRelationships; import com.dotmarketing.portlets.structure.model.ContentletRelationships.ContentletRelationshipRecords; @@ -82,6 +66,19 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.util.servlet.SessionMessages; +import java.text.DateFormat; +import java.text.MessageFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.collections.CollectionUtils; /* * //http://jira.dotmarketing.net/browse/DOTCMS-2273 * To save content via ajax. diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/model/Contentlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/model/Contentlet.java index 0f0f45be2b67..dddc2aedd189 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/model/Contentlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/model/Contentlet.java @@ -3,9 +3,18 @@ import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; import com.dotmarketing.beans.Host; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.CacheLocator; +import com.dotmarketing.business.DotStateException; +import com.dotmarketing.business.PermissionAPI; +import com.dotmarketing.business.PermissionSummary; +import com.dotmarketing.business.Permissionable; +import com.dotmarketing.business.RelatedPermissionableGroup; +import com.dotmarketing.business.Ruleable; +import com.dotmarketing.business.Treeable; +import com.dotmarketing.business.UserAPI; +import com.dotmarketing.business.Versionable; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.exception.DotSecurityException; @@ -29,8 +38,14 @@ import java.io.InputStream; import java.io.Serializable; import java.nio.file.Files; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import org.apache.commons.lang.builder.ToStringBuilder; /** * Represents a content unit in the system. Ideally, every single domain object diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ContentletForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ContentletForm.java index 5b52d925f938..25dd9025eebf 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ContentletForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ContentletForm.java @@ -1,21 +1,6 @@ package com.dotmarketing.portlets.contentlet.struts; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; @@ -29,6 +14,19 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.util.Constants; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; public class ContentletForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ImportContentletsForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ImportContentletsForm.java index bca4149b8f85..4b2847c58727 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ImportContentletsForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/struts/ImportContentletsForm.java @@ -2,10 +2,9 @@ import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; public class ImportContentletsForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/action/ViewDashboardAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/action/ViewDashboardAction.java index 698e154ea6cd..7d26491b9eff 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/action/ViewDashboardAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/action/ViewDashboardAction.java @@ -1,33 +1,15 @@ package com.dotmarketing.portlets.dashboard.action; -import java.io.PrintWriter; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.factories.PreviewFactory; import com.dotmarketing.portal.struts.DotPortletAction; -import com.dotmarketing.portlets.contentlet.business.HostAPI; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.dashboard.business.DashboardAPI; import com.dotmarketing.portlets.dashboard.model.DashboardSummary404; @@ -41,7 +23,20 @@ import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionResponseImpl; import com.liferay.portlet.RenderRequestImpl; -import com.liferay.portlet.RenderResponseImpl; +import java.io.PrintWriter; +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewDashboardAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/DashboardSummary.java b/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/DashboardSummary.java index 8767483b72f5..a12ef2993b77 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/DashboardSummary.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/DashboardSummary.java @@ -2,10 +2,7 @@ import java.io.Serializable; import java.util.Date; - -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; - -import com.dotmarketing.beans.Host; +import org.apache.commons.lang.builder.HashCodeBuilder; public class DashboardSummary implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/HostWrapper.java b/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/HostWrapper.java index b2fb67c0f725..77e774414e94 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/HostWrapper.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/dashboard/model/HostWrapper.java @@ -1,16 +1,15 @@ package com.dotmarketing.portlets.dashboard.model; -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portlets.contentlet.business.Contentlet; +import java.lang.reflect.InvocationTargetException; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/director/action/DirectorAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/director/action/DirectorAction.java index 9b146f598b8f..08db085dfa32 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/director/action/DirectorAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/director/action/DirectorAction.java @@ -26,20 +26,10 @@ import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ; import static com.dotmarketing.business.PermissionAPI.PERMISSION_WRITE; -import java.net.URLDecoder; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Iterator; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.MultiTree; import com.dotmarketing.beans.WebAsset; @@ -75,6 +65,14 @@ import com.liferay.portal.model.User; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.ParamUtil; +import java.net.URLDecoder; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Iterator; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; public class DirectorAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/fileUpload/model/FileUpload.java b/dotCMS/src/main/java/com/dotmarketing/portlets/fileUpload/model/FileUpload.java index 976398019229..efd613f44a88 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/fileUpload/model/FileUpload.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/fileUpload/model/FileUpload.java @@ -1,13 +1,11 @@ package com.dotmarketing.portlets.fileUpload.model; -import java.io.Serializable; - -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.beans.Inode; import com.dotmarketing.util.InodeUtils; +import java.io.Serializable; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; /** @author Hibernate CodeGenerator */ public class FileUpload extends Inode implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/files/action/UploadMultipleFilesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/files/action/UploadMultipleFilesAction.java index 5afe16f9ab62..9d7ac3f6ed92 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/files/action/UploadMultipleFilesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/files/action/UploadMultipleFilesAction.java @@ -1,10 +1,10 @@ package com.dotmarketing.portlets.files.action; +import static com.dotmarketing.business.PermissionAPI.PERMISSION_CAN_ADD_CHILDREN; + import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotcms.util.exceptions.DuplicateFileException; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -35,17 +35,15 @@ import com.liferay.util.ParamUtil; import com.liferay.util.servlet.SessionMessages; import com.liferay.util.servlet.UploadPortletRequest; - import java.io.IOException; import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; import java.util.UUID; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; - -import static com.dotmarketing.business.PermissionAPI.PERMISSION_CAN_ADD_CHILDREN; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Maria diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/files/struts/FileForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/files/struts/FileForm.java index 14ddef0081d3..8a1962d8e98b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/files/struts/FileForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/files/struts/FileForm.java @@ -1,24 +1,11 @@ package com.dotmarketing.portlets.files.struts; -import java.text.ParseException; -import java.text.SimpleDateFormat; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.exception.DotSecurityException; -import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.portlets.contentlet.business.HostAPI; import com.dotmarketing.portlets.folders.model.Folder; import com.dotmarketing.util.InodeUtils; @@ -26,6 +13,15 @@ import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ public class FileForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/EditFolderAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/EditFolderAction.java index 3911dc640fbc..56f6d902094c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/EditFolderAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/EditFolderAction.java @@ -2,19 +2,10 @@ import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ; -import java.util.List; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -24,7 +15,6 @@ import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.business.Treeable; import com.dotmarketing.business.Versionable; - import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; @@ -49,6 +39,13 @@ import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.util.List; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * This Action class provides utility methods to interact with {@link Folder} diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/OrderMenuAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/OrderMenuAction.java index b16c136ce427..bb96d3792e86 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/OrderMenuAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/OrderMenuAction.java @@ -1,24 +1,17 @@ package com.dotmarketing.portlets.folders.action; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; import com.dotmarketing.beans.WebAsset; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.CacheLocator; +import com.dotmarketing.business.PermissionAPI; +import com.dotmarketing.business.Permissionable; +import com.dotmarketing.business.Treeable; import com.dotmarketing.business.web.WebAPILocator; import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; @@ -43,6 +36,16 @@ import com.liferay.portal.struts.ActionException; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Maria */ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/PublishFolderAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/PublishFolderAction.java index 343568aa2721..4604a6aefe35 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/PublishFolderAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/action/PublishFolderAction.java @@ -1,15 +1,8 @@ package com.dotmarketing.portlets.folders.action; -import java.net.URLDecoder; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.exception.WebAssetException; import com.dotmarketing.factories.PublishFactory; import com.dotmarketing.portal.struts.DotPortletAction; @@ -21,6 +14,10 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Maria diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderAPIImpl.java index d1f65510458c..dae3c71cf7ef 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderAPIImpl.java @@ -1,17 +1,17 @@ package com.dotmarketing.portlets.folders.business; -import com.dotcms.contenttype.business.ContentTypeAPI; -import java.io.IOException; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; +import static com.dotmarketing.business.APILocator.getPermissionAPI; -import com.dotcms.api.system.event.*; +import com.dotcms.api.system.event.Payload; +import com.dotcms.api.system.event.SystemEventType; +import com.dotcms.api.system.event.SystemEventsAPI; +import com.dotcms.api.system.event.Visibility; +import com.dotcms.api.system.event.VisibilityRoles; import com.dotcms.api.system.event.verifier.ExcludeOwnerVerifierBean; import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; +import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.publisher.business.PublisherAPI; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -45,8 +45,19 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - -import static com.dotmarketing.business.APILocator.getPermissionAPI; +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TimeZone; +import java.util.stream.Collectors; +import org.apache.commons.lang.StringUtils; public class FolderAPIImpl implements FolderAPI { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderFactoryImpl.java index 6f401e1d1168..2c1eb4d8ed61 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/business/FolderFactoryImpl.java @@ -1,10 +1,6 @@ package com.dotmarketing.portlets.folders.business; // 1212 -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.oro.text.regex.Pattern; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Compiler; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Matcher; import com.dotcms.util.transform.DBTransformer; import com.dotcms.util.transform.TransformerLocator; import com.dotmarketing.beans.Host; @@ -43,7 +39,6 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; - import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -59,6 +54,10 @@ import java.util.Stack; import java.util.StringTokenizer; import java.util.TimeZone; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.Perl5Compiler; +import org.apache.oro.text.regex.Perl5Matcher; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/model/Folder.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/model/Folder.java index 1876833448af..219f33a12052 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/model/Folder.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/model/Folder.java @@ -1,14 +1,6 @@ package com.dotmarketing.portlets.folders.model; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - import com.dotcms.api.tree.Parentable; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.api.tree.TreeableAPI; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.APILocator; @@ -27,6 +19,12 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.model.User; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; /** @author Hibernate CodeGenerator */ public class Folder extends Inode implements Serializable, Permissionable, Treeable, Ruleable, Parentable { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/FolderForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/FolderForm.java index 073f083e9d0a..ec6a6e109dde 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/FolderForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/FolderForm.java @@ -1,14 +1,12 @@ package com.dotmarketing.portlets.folders.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.InodeUtils; import com.liferay.portal.util.Constants; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; public class FolderForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/HostForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/HostForm.java index 5834a882f3c1..8ff4d7537148 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/HostForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/folders/struts/HostForm.java @@ -1,8 +1,7 @@ package com.dotmarketing.portlets.folders.struts; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.InodeUtils; +import org.apache.struts.validator.ValidatorForm; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/form/action/ViewFormHandlerAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/form/action/ViewFormHandlerAction.java index 43d754b1dff9..e106fa0e7e58 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/form/action/ViewFormHandlerAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/form/action/ViewFormHandlerAction.java @@ -1,20 +1,9 @@ package com.dotmarketing.portlets.form.action; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.common.util.SQLUtil; import com.dotmarketing.portal.struts.DotPortletAction; @@ -23,6 +12,14 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * Get the existing forms structures diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/hostadmin/action/ViewHostsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/hostadmin/action/ViewHostsAction.java index 3ba64520422b..b59caff8a397 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/hostadmin/action/ViewHostsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/hostadmin/action/ViewHostsAction.java @@ -3,17 +3,14 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.Interceptor; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.contentlet.business.ContentletAPI; import com.dotmarketing.portlets.contentlet.business.HostAPI; import com.dotmarketing.util.Logger; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/hostvariable/bussiness/HostVariableFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/hostvariable/bussiness/HostVariableFactoryImpl.java index fde93d06e114..e01d27e3cfa4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/hostvariable/bussiness/HostVariableFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/hostvariable/bussiness/HostVariableFactoryImpl.java @@ -1,18 +1,15 @@ package com.dotmarketing.portlets.hostvariable.bussiness; -import java.util.ArrayList; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.dotmarketing.business.CacheLocator; import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotHibernateException; import com.dotmarketing.portlets.hostvariable.model.HostVariable; import com.dotmarketing.util.InodeUtils; +import java.util.ArrayList; +import java.util.List; +import net.sf.hibernate.ObjectNotFoundException; +import org.apache.commons.beanutils.BeanUtils; public class HostVariableFactoryImpl extends HostVariableFactory{ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PreviewHTMLPageAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PreviewHTMLPageAction.java index 6667cfa95aa2..4715f7df9312 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PreviewHTMLPageAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PreviewHTMLPageAction.java @@ -1,13 +1,8 @@ package com.dotmarketing.portlets.htmlpages.action; -import javax.servlet.http.HttpServletRequest; - - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotStateException; @@ -21,13 +16,15 @@ import com.dotmarketing.util.HostUtil; import com.dotmarketing.util.Logger; import com.dotmarketing.util.PageMode; - import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; import com.liferay.portal.struts.ActionException; import com.liferay.portlet.ActionRequestImpl; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PublishHTMLPagesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PublishHTMLPagesAction.java index 5bb7d52a6a64..f1ab87bfadc4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PublishHTMLPagesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpages/action/PublishHTMLPagesAction.java @@ -3,22 +3,24 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.WebAssetException; -import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.factories.PublishFactory; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.contentlet.business.ContentletAPI; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.htmlpageasset.model.HTMLPageAsset; -import com.dotmarketing.util.*; +import com.dotmarketing.util.ActivityLogger; +import com.dotmarketing.util.HostUtil; +import com.dotmarketing.util.InodeUtils; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; - import java.net.URLDecoder; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * This Struts action provides users the ability to publish HTML Pages in diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/HTMLPageReportAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/HTMLPageReportAction.java index ba529b08a2c2..0299b3a26895 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/HTMLPageReportAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/HTMLPageReportAction.java @@ -1,27 +1,13 @@ package com.dotmarketing.portlets.htmlpageviews.action; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.Map; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.IdentifierFactory; import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.contentlet.business.HostAPI; @@ -33,6 +19,16 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionResponseImpl; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.Map; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/ViewHTMLPageViewsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/ViewHTMLPageViewsAction.java index 29822e85b040..b37c1cdfd40f 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/ViewHTMLPageViewsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageviews/action/ViewHTMLPageViewsAction.java @@ -1,14 +1,9 @@ package com.dotmarketing.portlets.htmlpageviews.action; -import javax.servlet.jsp.PageContext; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; @@ -20,6 +15,10 @@ import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageAction.java index e255c51a76ca..3bf4368bee23 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageAction.java @@ -1,15 +1,8 @@ package com.dotmarketing.portlets.languagesmanager.action; -import java.sql.SQLException; - -import javax.servlet.http.HttpServletRequest; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI; @@ -23,6 +16,11 @@ import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.StringPool; import com.liferay.util.servlet.SessionMessages; +import java.sql.SQLException; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * This Struts action will handle all the requests related to adding, updating or deleting a system diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageKeysAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageKeysAction.java index d88e0fee28bc..8fedb1352b68 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageKeysAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/EditLanguageKeysAction.java @@ -6,21 +6,9 @@ */ package com.dotmarketing.portlets.languagesmanager.action; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI; @@ -30,6 +18,15 @@ import com.liferay.portal.struts.MultiMessageResources; import com.liferay.portal.util.Constants; import com.liferay.util.servlet.SessionMessages; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/ViewLanguageAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/ViewLanguageAction.java index eef06fdf31c3..06a715b6003d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/ViewLanguageAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/action/ViewLanguageAction.java @@ -4,24 +4,21 @@ */ package com.dotmarketing.portlets.languagesmanager.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI; import com.dotmarketing.util.Logger; import com.dotmarketing.util.WebKeys; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.util.Constants; +import java.util.List; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * @author alex diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageAPIImpl.java index e566c0e5a770..0b22acf95f5d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageAPIImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageAPIImpl.java @@ -3,7 +3,6 @@ import com.dotcms.business.CloseDBIfOpened; import com.dotcms.business.WrapInTransaction; import com.dotcms.languagevariable.business.LanguageVariableAPI; -import com.dotcms.repackage.org.apache.commons.lang.math.NumberUtils; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.FactoryLocator; @@ -16,10 +15,15 @@ import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; import com.liferay.util.StringPool; -import org.apache.velocity.tools.view.context.ViewContext; - +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.velocity.tools.view.context.ViewContext; /** * Implementation class for the {@link LanguageAPI}. diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageFactoryImpl.java index 2272472a91cc..1907e26279e0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/business/LanguageFactoryImpl.java @@ -3,7 +3,6 @@ import static com.dotcms.util.CloseUtils.closeQuietly; import static com.dotcms.util.ConversionUtils.toLong; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.DotCacheException; import com.dotmarketing.common.db.DotConnect; @@ -20,10 +19,15 @@ import com.google.common.annotations.VisibleForTesting; import com.liferay.portal.struts.MultiMessageResources; import com.liferay.util.FileUtil; - -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.OutputStream; +import java.io.PrintWriter; import java.nio.channels.Channels; -import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; import java.nio.file.Files; @@ -38,6 +42,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.struts.Globals; /** * Implementation class for the {@link LanguageFactory}. * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/model/Language.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/model/Language.java index 220563ebd454..e0fd9d02293d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/model/Language.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/model/Language.java @@ -1,9 +1,8 @@ package com.dotmarketing.portlets.languagesmanager.model; import java.io.Serializable; - -import com.dotcms.repackage.org.apache.commons.lang.builder.EqualsBuilder; -import com.dotcms.repackage.org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/struts/LanguageForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/struts/LanguageForm.java index 96ba026c7a65..fdc0ad7b39d3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/struts/LanguageForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/languagesmanager/struts/LanguageForm.java @@ -4,13 +4,11 @@ */ package com.dotmarketing.portlets.languagesmanager.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.liferay.portal.util.Constants; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; /** * @author alex diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/EditLinkAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/EditLinkAction.java index b6ac214a2fa0..3ab54785c485 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/EditLinkAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/EditLinkAction.java @@ -5,10 +5,6 @@ import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -44,18 +40,18 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.Validator; import com.dotmarketing.util.WebKeys; - +import com.liferay.portal.model.User; +import com.liferay.portal.util.Constants; +import com.liferay.portlet.ActionRequestImpl; +import com.liferay.util.servlet.SessionMessages; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.Iterator; import java.util.List; - import javax.servlet.http.HttpServletRequest; - -import com.liferay.portal.model.User; -import com.liferay.portal.util.Constants; -import com.liferay.portlet.ActionRequestImpl; -import com.liferay.util.servlet.SessionMessages; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * This Struts action provides users the ability to interact with Menu Links in diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/PublishLinksAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/PublishLinksAction.java index 5d31c0a58ad5..261c55bbbe61 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/PublishLinksAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/PublishLinksAction.java @@ -1,14 +1,8 @@ package com.dotmarketing.portlets.links.action; -import java.net.URLDecoder; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.exception.WebAssetException; import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.factories.PublishFactory; @@ -19,6 +13,9 @@ import com.liferay.portal.model.User; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/ViewLinksAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/ViewLinksAction.java index 3728a96b78ca..f658f6e6de50 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/ViewLinksAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/links/action/ViewLinksAction.java @@ -4,18 +4,16 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.links.model.Link; import com.dotmarketing.util.Logger; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source @@ -27,7 +25,7 @@ public class ViewLinksAction extends DotPortletAction { /* - * @see com.liferay.portal.struts.PortletAction#render(com.dotcms.repackage.org.apache.struts.action.ActionMapping, com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) + * @see com.liferay.portal.struts.PortletAction#render(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) */ public ActionForward render( ActionMapping mapping, ActionForm form, PortletConfig config, diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/links/struts/LinkForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/links/struts/LinkForm.java index 881a0df1fed9..f6629c8e5495 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/links/struts/LinkForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/links/struts/LinkForm.java @@ -1,15 +1,13 @@ package com.dotmarketing.portlets.links.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.portlets.links.model.Link.LinkType; import com.liferay.portal.util.Constants; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ public class LinkForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/EditReportAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/EditReportAction.java index a7bc0629debd..ce78fc144891 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/EditReportAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/EditReportAction.java @@ -6,22 +6,9 @@ package com.dotmarketing.portlets.report.action; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotcms.util.SecurityUtils; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.db.HibernateUtil; @@ -64,6 +51,8 @@ import net.sf.jasperreports.engine.JasperCompileManager; import net.sf.jasperreports.engine.JasperReport; import net.sf.jasperreports.engine.util.JRLoader; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * Class to manage actions related to the cms jasper reports diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/RunReportAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/RunReportAction.java index 903f4b70a5f1..4a216887af18 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/RunReportAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/RunReportAction.java @@ -22,36 +22,10 @@ package com.dotmarketing.portlets.report.action; -import java.io.File; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.dotcms.repackage.bsh.EvalError; import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.JRExporterParameter; -import net.sf.jasperreports.engine.JasperFillManager; -import net.sf.jasperreports.engine.JasperPrint; -import net.sf.jasperreports.engine.JasperReport; -import net.sf.jasperreports.engine.export.JRHtmlExporter; -import net.sf.jasperreports.engine.export.JRHtmlExporterParameter; -import net.sf.jasperreports.engine.util.JRLoader; -import net.sf.jasperreports.j2ee.servlets.BaseHttpServlet; -import net.sf.jasperreports.j2ee.servlets.ImageServlet; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - -import com.dotcms.repackage.bsh.EvalError; - import com.dotmarketing.business.Role; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.exception.DotHibernateException; @@ -71,6 +45,27 @@ import com.liferay.portlet.ActionRequestImpl; import com.liferay.portlet.ActionResponseImpl; import com.liferay.util.servlet.SessionMessages; +import java.io.File; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JRExporterParameter; +import net.sf.jasperreports.engine.JasperFillManager; +import net.sf.jasperreports.engine.JasperPrint; +import net.sf.jasperreports.engine.JasperReport; +import net.sf.jasperreports.engine.export.JRHtmlExporter; +import net.sf.jasperreports.engine.export.JRHtmlExporterParameter; +import net.sf.jasperreports.engine.util.JRLoader; +import net.sf.jasperreports.j2ee.servlets.BaseHttpServlet; +import net.sf.jasperreports.j2ee.servlets.ImageServlet; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/ViewReportsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/ViewReportsAction.java index 127136e5fd7f..4c5312f0f3eb 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/ViewReportsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/report/action/ViewReportsAction.java @@ -22,23 +22,12 @@ package com.dotmarketing.portlets.report.action; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Permission; import com.dotmarketing.beans.PermissionAsset; import com.dotmarketing.business.APILocator; @@ -60,6 +49,14 @@ import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.FileUtil; import com.liferay.util.servlet.SessionMessages; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * @@ -77,7 +74,7 @@ public class ViewReportsAction extends DotPortletAction { /* * Render View Report Portlet - * @see com.liferay.portal.struts.PortletAction#render(com.dotcms.repackage.org.apache.struts.action.ActionMapping, com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) + * @see com.liferay.portal.struts.PortletAction#render(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) */ public ActionForward render( ActionMapping mapping, ActionForm form, PortletConfig config, @@ -169,7 +166,7 @@ public ActionForward render( /* * Process View Portlet requested actions - * @see com.liferay.portal.struts.PortletAction#processAction(com.dotcms.repackage.org.apache.struts.action.ActionMapping, com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.ActionRequest, com.dotcms.repackage.javax.portlet.ActionResponse) + * @see com.liferay.portal.struts.PortletAction#processAction(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.ActionRequest, com.dotcms.repackage.javax.portlet.ActionResponse) */ @Override public void processAction(ActionMapping mapping, ActionForm form, PortletConfig config, ActionRequest req, ActionResponse res)throws DotHibernateException { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/report/struts/ReportForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/report/struts/ReportForm.java index 58160ef202bd..15c66414d3b4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/report/struts/ReportForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/report/struts/ReportForm.java @@ -1,16 +1,14 @@ package com.dotmarketing.portlets.report.struts; -import java.util.ArrayList; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.Constants; import com.dotmarketing.util.UtilMethods; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; +import java.util.ArrayList; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.validator.ValidatorForm; /** @author Jason Tesser */ public class ReportForm extends ValidatorForm { @@ -152,9 +150,9 @@ public void setWebFormReport(boolean webFormReport) { /* * Validator for the Report Form - * @see com.dotcms.repackage.org.apache.struts.validator.ValidatorForm#validate(com.dotcms.repackage.org.apache.struts.action.ActionMapping, javax.servlet.http.HttpServletRequest) + * @see org.apache.struts.validator.ValidatorForm#validate(org.apache.struts.action.ActionMapping, javax.servlet.http.HttpServletRequest) */ - public ActionErrors validate(com.dotcms.repackage.org.apache.struts.action.ActionMapping mapping, javax.servlet.http.HttpServletRequest request,User user)throws Exception { + public ActionErrors validate(org.apache.struts.action.ActionMapping mapping, javax.servlet.http.HttpServletRequest request,User user)throws Exception { ActionErrors errors = new ActionErrors(); if (!UtilMethods.isSet(reportName)) { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/roleadmin/action/ViewRolesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/roleadmin/action/ViewRolesAction.java index a631d5d61957..401820aa3e6b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/roleadmin/action/ViewRolesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/roleadmin/action/ViewRolesAction.java @@ -3,12 +3,10 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portal.struts.PortletAction; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewRolesAction extends PortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/PersonaActionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/PersonaActionlet.java index 68327577ec2c..8c0bb5f97a85 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/PersonaActionlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/PersonaActionlet.java @@ -2,7 +2,6 @@ import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.visitor.business.VisitorAPI; import com.dotcms.visitor.domain.Visitor; import com.dotmarketing.business.APILocator; @@ -20,6 +19,7 @@ import java.util.Optional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; /** * Actionlet to add Key/Value to the Request. diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetRequestAttributeActionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetRequestAttributeActionlet.java index c556dd70a443..065a733835cb 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetRequestAttributeActionlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetRequestAttributeActionlet.java @@ -1,7 +1,6 @@ package com.dotmarketing.portlets.rules.actionlet; import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.rules.RuleComponentInstance; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.portlets.rules.parameter.ParameterDefinition; @@ -10,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; /** * Actionlet to add Key/Value to the Request. diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetResponseHeaderActionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetResponseHeaderActionlet.java index 3ea4e392fd6c..94814cd9ac1c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetResponseHeaderActionlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetResponseHeaderActionlet.java @@ -1,7 +1,6 @@ package com.dotmarketing.portlets.rules.actionlet; import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.rules.RuleComponentInstance; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.portlets.rules.parameter.ParameterDefinition; @@ -10,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; /** * Actionlet to add Key/Value to the Response header. diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetSessionAttributeActionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetSessionAttributeActionlet.java index 26277607f8c7..ae43245b7b6a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetSessionAttributeActionlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/actionlet/SetSessionAttributeActionlet.java @@ -1,7 +1,6 @@ package com.dotmarketing.portlets.rules.actionlet; import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.rules.RuleComponentInstance; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.portlets.rules.parameter.ParameterDefinition; @@ -10,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; /** * Actionlet to add Key/Value to the Session. diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/PersonaConditionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/PersonaConditionlet.java index c38618d0a005..aece1206d24a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/PersonaConditionlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/PersonaConditionlet.java @@ -1,45 +1,33 @@ package com.dotmarketing.portlets.rules.conditionlet; +import static com.dotcms.repackage.com.google.common.base.Preconditions.checkState; +import static com.dotmarketing.portlets.rules.parameter.comparison.Comparison.IS; +import static com.dotmarketing.portlets.rules.parameter.comparison.Comparison.IS_NOT; + import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.dotcms.repackage.com.maxmind.geoip2.exception.GeoIp2Exception; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.util.GeoIp2CityDbUtil; -import com.dotcms.util.HttpRequestDataUtil; import com.dotcms.visitor.business.VisitorAPI; import com.dotcms.visitor.domain.Visitor; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.UserAPI; -import com.dotmarketing.exception.DotDataException; import com.dotmarketing.portlets.personas.business.PersonaAPI; import com.dotmarketing.portlets.personas.model.Persona; import com.dotmarketing.portlets.rules.RuleComponentInstance; import com.dotmarketing.portlets.rules.exception.ComparisonNotPresentException; import com.dotmarketing.portlets.rules.exception.ComparisonNotSupportedException; -import com.dotmarketing.portlets.rules.exception.RuleConstructionFailedException; import com.dotmarketing.portlets.rules.exception.RuleEvaluationFailedException; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.portlets.rules.parameter.ParameterDefinition; import com.dotmarketing.portlets.rules.parameter.comparison.Comparison; -import com.dotmarketing.portlets.rules.parameter.display.DropdownInput; -import com.dotmarketing.portlets.rules.parameter.display.NumericInput; import com.dotmarketing.portlets.rules.parameter.display.RestDropdownInput; -import com.dotmarketing.portlets.rules.parameter.display.TextInput; -import com.dotmarketing.portlets.rules.parameter.type.NumericType; import com.dotmarketing.portlets.rules.parameter.type.TextType; import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Map; import java.util.Optional; - -import static com.dotcms.repackage.com.google.common.base.Preconditions.checkState; -import static com.dotmarketing.portlets.rules.parameter.comparison.Comparison.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; public class PersonaConditionlet extends Conditionlet{ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/VisitedUrlConditionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/VisitedUrlConditionlet.java index 455e45dce809..cfa50dbfe10c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/VisitedUrlConditionlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/conditionlet/VisitedUrlConditionlet.java @@ -7,7 +7,6 @@ import static com.dotmarketing.portlets.rules.parameter.comparison.Comparison.REGEX; import static com.dotmarketing.portlets.rules.parameter.comparison.Comparison.STARTS_WITH; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.HttpRequestDataUtil; import com.dotmarketing.beans.Host; import com.dotmarketing.business.web.WebAPILocator; @@ -35,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; /** * This conditionlet will allow CMS users to check whether a user has already diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/ParameterDefinition.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/ParameterDefinition.java index 40cb8db8001f..13a54ed66734 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/ParameterDefinition.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/ParameterDefinition.java @@ -1,12 +1,12 @@ package com.dotmarketing.portlets.rules.parameter; import com.dotcms.repackage.com.google.common.base.Preconditions; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.rest.exception.InvalidRuleParameterException; import com.dotmarketing.portlets.rules.exception.RuleEngineException; import com.dotmarketing.portlets.rules.model.ParameterModel; import com.dotmarketing.portlets.rules.parameter.display.Input; import com.dotmarketing.portlets.rules.parameter.type.DataType; +import org.apache.commons.lang.StringUtils; public class ParameterDefinition { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/comparison/Comparison.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/comparison/Comparison.java index df569810b36e..43a0d013a5a4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/comparison/Comparison.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/comparison/Comparison.java @@ -1,11 +1,11 @@ package com.dotmarketing.portlets.rules.parameter.comparison; -import com.dotcms.repackage.com.google.common.base.Objects; -import com.dotcms.repackage.org.apache.commons.lang.NotImplementedException; -import com.dotmarketing.portlets.rules.conditionlet.Location; import static com.dotmarketing.portlets.rules.parameter.display.DropdownInput.Option; +import com.dotcms.repackage.com.google.common.base.Objects; +import com.dotmarketing.portlets.rules.conditionlet.Location; import java.util.Collection; +import org.apache.commons.lang.NotImplementedException; public class Comparison { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/display/DropdownInput.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/display/DropdownInput.java index 2c5a484779d0..83b226962efd 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/display/DropdownInput.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/display/DropdownInput.java @@ -1,12 +1,10 @@ package com.dotmarketing.portlets.rules.parameter.display; import com.dotcms.repackage.com.google.common.collect.Maps; -import com.dotcms.repackage.org.apache.commons.lang.NotImplementedException; import com.dotcms.rest.exception.InvalidRuleParameterException; import com.dotmarketing.portlets.rules.exception.RuleEngineException; import com.dotmarketing.portlets.rules.parameter.type.TextType; import com.dotmarketing.util.Logger; - import java.util.Map; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/DataType.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/DataType.java index 9b426c8810b9..41a6056ad011 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/DataType.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/DataType.java @@ -2,10 +2,10 @@ import com.dotcms.repackage.com.google.common.collect.ImmutableMap; import com.dotcms.repackage.com.google.common.collect.Maps; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.rules.parameter.type.constraint.TypeConstraint; import java.util.Collections; import java.util.Map; +import org.apache.commons.lang.StringUtils; /** * @author Geoff M. Granum diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/NumericType.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/NumericType.java index 49e4be5e3fe1..85778c9948c1 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/NumericType.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/NumericType.java @@ -1,8 +1,8 @@ package com.dotmarketing.portlets.rules.parameter.type; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.rules.parameter.type.constraint.StandardConstraints; import com.dotmarketing.portlets.rules.parameter.type.constraint.TypeConstraint; +import org.apache.commons.lang.StringUtils; /** * @author Geoff M. Granum diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/constraint/StandardConstraintFunctions.java b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/constraint/StandardConstraintFunctions.java index f1159182ca61..fec002648f81 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/constraint/StandardConstraintFunctions.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/rules/parameter/type/constraint/StandardConstraintFunctions.java @@ -1,8 +1,8 @@ package com.dotmarketing.portlets.rules.parameter.type.constraint; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotmarketing.portlets.rules.parameter.comparison.MatcherCheck; import java.util.function.Function; +import org.apache.commons.lang.StringUtils; import org.hamcrest.Matchers; /** diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/EditSchedulerAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/EditSchedulerAction.java index 7eafec9b8855..e52320083e2f 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/EditSchedulerAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/EditSchedulerAction.java @@ -1,19 +1,8 @@ package com.dotmarketing.portlets.scheduler.action; -import java.net.URLDecoder; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.portal.struts.DotPortletAction; @@ -27,6 +16,16 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Maria */ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/ViewSchedulersAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/ViewSchedulersAction.java index ec277f6e888d..78fe8370d043 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/ViewSchedulersAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/action/ViewSchedulersAction.java @@ -22,25 +22,23 @@ package com.dotmarketing.portlets.scheduler.action; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.jsp.PageContext; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.quartz.QuartzUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.WebKeys; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.util.Constants; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/struts/SchedulerForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/struts/SchedulerForm.java index d36f6146238d..adb522a05435 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/struts/SchedulerForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/scheduler/struts/SchedulerForm.java @@ -1,14 +1,11 @@ package com.dotmarketing.portlets.scheduler.struts; +import com.liferay.portal.util.Constants; import java.util.Map; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import com.liferay.portal.util.Constants; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ public class SchedulerForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditFieldAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditFieldAction.java index e582c5f1e5b0..d23902dad17e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditFieldAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditFieldAction.java @@ -11,10 +11,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; @@ -44,20 +40,20 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.Validator; import com.dotmarketing.util.WebKeys; - +import com.liferay.portal.model.User; +import com.liferay.portal.util.Constants; +import com.liferay.portlet.ActionRequestImpl; +import com.liferay.util.StringUtil; +import com.liferay.util.servlet.SessionMessages; import java.net.URLDecoder; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; - -import com.liferay.portal.model.User; -import com.liferay.portal.util.Constants; -import com.liferay.portlet.ActionRequestImpl; -import com.liferay.util.StringUtil; -import com.liferay.util.servlet.SessionMessages; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * This Struts action will handle all the requests related to adding, updating diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditRelationshipAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditRelationshipAction.java index ddcec627ba66..794f4dfeb1c4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditRelationshipAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditRelationshipAction.java @@ -1,16 +1,9 @@ package com.dotmarketing.portlets.structure.action; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.beans.Tree; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.FactoryLocator; @@ -21,7 +14,6 @@ import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.factories.TreeFactory; import com.dotmarketing.portal.struts.DotPortletAction; - import com.dotmarketing.portlets.structure.factories.StructureFactory; import com.dotmarketing.portlets.structure.model.Relationship; import com.dotmarketing.portlets.structure.model.Structure; @@ -34,6 +26,12 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portal.util.Constants; import com.liferay.util.servlet.SessionMessages; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; public class EditRelationshipAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditStructureAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditStructureAction.java index 7795033755cd..f459e5455507 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditStructureAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/EditStructureAction.java @@ -13,10 +13,6 @@ import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; @@ -45,20 +41,20 @@ import com.dotmarketing.util.Validator; import com.dotmarketing.util.VelocityUtil; import com.dotmarketing.util.WebKeys; - -import java.net.URLDecoder; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.http.HttpServletRequest; - import com.google.common.collect.ImmutableList; import com.liferay.portal.model.User; import com.liferay.portal.struts.ActionException; import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; public class EditStructureAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewRelationshipsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewRelationshipsAction.java index 8b3a5193b1a5..e73fef179f6e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewRelationshipsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewRelationshipsAction.java @@ -1,29 +1,26 @@ package com.dotmarketing.portlets.structure.action; -import java.util.List; - import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.contenttype.model.type.ContentTypeBuilder; import com.dotcms.contenttype.model.type.SimpleContentType; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.FactoryLocator; import com.dotmarketing.common.util.SQLUtil; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portal.struts.DotPortletAction; - import com.dotmarketing.portlets.structure.model.Relationship; import com.dotmarketing.util.StringUtils; import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; +import java.util.List; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewRelationshipsAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewStructureAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewStructureAction.java index eb2eaef199de..f39b5eefd16a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewStructureAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/action/ViewStructureAction.java @@ -1,20 +1,10 @@ package com.dotmarketing.portlets.structure.action; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.dotcms.contenttype.business.ContentTypeAPI; import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.portal.struts.DotPortletAction; @@ -24,6 +14,13 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * Struts action that retrieves the required information to display the "Content diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Field.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Field.java index eb13aaa9e980..02bd453e8b4c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Field.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Field.java @@ -1,18 +1,16 @@ package com.dotmarketing.portlets.structure.model; -import java.util.Date; - -import java.util.HashMap; -import java.util.Map; - import com.dotcms.contenttype.model.field.FieldIf; import com.dotcms.contenttype.model.field.LegacyFieldTypes; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.exception.DotHibernateException; import com.dotmarketing.portlets.structure.factories.FieldFactory; import com.dotmarketing.util.UtilMethods; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; /** * * @deprecated use {@link com.dotcms.contenttype.model.field.Field} diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Structure.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Structure.java index 6ce14f4a3d1f..c9aeacadc040 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Structure.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/model/Structure.java @@ -1,18 +1,10 @@ package com.dotmarketing.portlets.structure.model; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - import com.dotcms.contenttype.model.type.BaseContentType; import com.dotcms.contenttype.model.type.ContentTypeIf; import com.dotcms.repackage.com.fasterxml.jackson.annotation.JsonIgnore; -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - import com.dotmarketing.beans.Inode; import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.DotStateException; import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.business.PermissionSummary; import com.dotmarketing.business.Permissionable; @@ -26,6 +18,11 @@ import com.dotmarketing.portlets.structure.factories.StructureFactory; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/FieldForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/FieldForm.java index b77fdbcb4e88..b866c9bec433 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/FieldForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/FieldForm.java @@ -1,22 +1,15 @@ package com.dotmarketing.portlets.structure.struts; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.portlets.structure.business.FieldAPI; -import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.UtilMethods; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.validator.ValidatorForm; public class FieldForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/RelationshipForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/RelationshipForm.java index 44861ddcf9db..a766bd5d61ea 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/RelationshipForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/RelationshipForm.java @@ -1,15 +1,13 @@ package com.dotmarketing.portlets.structure.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.UtilMethods; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.validator.ValidatorForm; diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/StructureForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/StructureForm.java index 1b5ec8df7545..7516f6e55d44 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/StructureForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/structure/struts/StructureForm.java @@ -1,18 +1,16 @@ package com.dotmarketing.portlets.structure.struts; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; import com.dotmarketing.cache.FieldsCache; import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.portlets.structure.model.Structure; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.UtilMethods; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.validator.ValidatorForm; public class StructureForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/EditTemplateAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/EditTemplateAction.java index 3f4338ead240..ff7c9dec9174 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/EditTemplateAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/EditTemplateAction.java @@ -6,10 +6,6 @@ import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.WebAsset; @@ -40,14 +36,6 @@ import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.Validator; import com.dotmarketing.util.WebKeys; - -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.liferay.portal.language.LanguageException; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; @@ -56,6 +44,14 @@ import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionDialogMessage; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Maria @@ -74,8 +70,8 @@ public class EditTemplateAction extends DotPortletAction implements // } // }; // -// private static com.dotcms.repackage.org.apache.oro.text.regex.Pattern parseContainerPattern; -// private static com.dotcms.repackage.org.apache.oro.text.regex.Pattern oldContainerPattern; +// private static org.apache.oro.text.regex.Pattern parseContainerPattern; +// private static org.apache.oro.text.regex.Pattern oldContainerPattern; // public EditTemplateAction() { // Perl5Compiler c = new Perl5Compiler(); diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/PublishTemplatesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/PublishTemplatesAction.java index a5d2d4d9d5e1..4459f8722ae6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/PublishTemplatesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/PublishTemplatesAction.java @@ -3,9 +3,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.exception.WebAssetException; import com.dotmarketing.factories.InodeFactory; import com.dotmarketing.factories.PublishFactory; @@ -15,12 +12,12 @@ import com.dotmarketing.util.HostUtil; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; - -import java.net.URLDecoder; - import com.liferay.portal.model.User; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.net.URLDecoder; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/ViewTemplatesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/ViewTemplatesAction.java index 36eacb53a421..37ca0fad7067 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/ViewTemplatesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/action/ViewTemplatesAction.java @@ -1,5 +1,8 @@ package com.dotmarketing.portlets.templates.action; +import com.dotcms.repackage.javax.portlet.PortletConfig; +import com.dotcms.repackage.javax.portlet.RenderRequest; +import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.PermissionAPI; @@ -10,15 +13,11 @@ import com.dotmarketing.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - -import com.dotcms.repackage.javax.portlet.PortletConfig; -import com.dotcms.repackage.javax.portlet.RenderRequest; -import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.jsp.PageContext; import java.util.List; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateFactoryImpl.java index 4de06a754594..bc3dc231e83e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateFactoryImpl.java @@ -2,9 +2,7 @@ import com.dotcms.rendering.velocity.services.TemplateLoader; import com.dotcms.rendering.velocity.viewtools.DotTemplateTool; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotcms.util.transform.TransformerLocator; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode.Type; import com.dotmarketing.business.APILocator; @@ -20,13 +18,18 @@ import com.dotmarketing.exception.DotRuntimeException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portlets.containers.model.Container; -import com.dotmarketing.portlets.templates.design.bean.*; +import com.dotmarketing.portlets.templates.design.bean.Body; +import com.dotmarketing.portlets.templates.design.bean.ContainerUUID; +import com.dotmarketing.portlets.templates.design.bean.Sidebar; +import com.dotmarketing.portlets.templates.design.bean.TemplateLayout; +import com.dotmarketing.portlets.templates.design.bean.TemplateLayoutColumn; +import com.dotmarketing.portlets.templates.design.bean.TemplateLayoutRow; import com.dotmarketing.portlets.templates.model.Template; import com.dotmarketing.util.Logger; import com.dotmarketing.util.PaginatedArrayList; import com.dotmarketing.util.RegEX; import com.dotmarketing.util.UtilMethods; - +import com.liferay.portal.model.User; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -40,8 +43,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - -import com.liferay.portal.model.User; +import org.apache.commons.beanutils.BeanUtils; public class TemplateFactoryImpl implements TemplateFactory { static TemplateCache templateCache = CacheLocator.getTemplateCache(); diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/model/TemplateWrapper.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/model/TemplateWrapper.java index 02274f637e4e..a28343b95ad3 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/model/TemplateWrapper.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/model/TemplateWrapper.java @@ -1,14 +1,12 @@ package com.dotmarketing.portlets.templates.model; -import java.lang.reflect.InvocationTargetException; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.util.UtilMethods; +import java.lang.reflect.InvocationTargetException; +import org.apache.commons.beanutils.BeanUtils; public class TemplateWrapper extends Template{ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/struts/TemplateForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/struts/TemplateForm.java index d643b1ee43cd..1a1bd9b7104b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/struts/TemplateForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/struts/TemplateForm.java @@ -1,16 +1,15 @@ package com.dotmarketing.portlets.templates.struts; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import static com.dotmarketing.portlets.templates.design.util.DesignTemplateHtmlCssConstants.START_COMMENT; import static com.dotmarketing.portlets.templates.design.util.DesignTemplateHtmlCssConstants.END_COMMENT; +import static com.dotmarketing.portlets.templates.design.util.DesignTemplateHtmlCssConstants.START_COMMENT; + import com.liferay.portal.util.Constants; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ public class TemplateForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserAdditionalInfoAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserAdditionalInfoAction.java index 61a6a77d7a19..375c46e28d79 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserAdditionalInfoAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserAdditionalInfoAction.java @@ -3,10 +3,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.HibernateUtil; @@ -17,6 +13,8 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; import com.liferay.util.servlet.SessionMessages; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Martin Amaris diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCategoriesAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCategoriesAction.java index 579daa631449..e5a33dc7d5ad 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCategoriesAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCategoriesAction.java @@ -1,14 +1,8 @@ package com.dotmarketing.portlets.user.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.HibernateUtil; @@ -20,6 +14,9 @@ import com.dotmarketing.util.Logger; import com.liferay.portal.model.User; import com.liferay.util.servlet.SessionMessages; +import java.util.List; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; public class EditUserCategoriesAction extends DotPortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCommentAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCommentAction.java index 1edd4afa423f..188b682a9d53 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCommentAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserCommentAction.java @@ -1,16 +1,8 @@ package com.dotmarketing.portlets.user.action; -import java.util.Date; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.HibernateUtil; @@ -23,6 +15,11 @@ import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.util.Date; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Maria Ahues diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserPreferenceAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserPreferenceAction.java index 668c3f6690c6..7d451c87c2e5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserPreferenceAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserPreferenceAction.java @@ -1,14 +1,8 @@ package com.dotmarketing.portlets.user.action; -import java.net.URLDecoder; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.db.HibernateUtil; import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.portlets.user.factories.UserPreferencesFactory; @@ -18,6 +12,9 @@ import com.liferay.portal.model.User; import com.liferay.portal.struts.ActionException; import com.liferay.portal.util.Constants; +import java.net.URLDecoder; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author David Torres diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserProxyAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserProxyAction.java index 4365b0d4aa75..7b15b96267da 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserProxyAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/EditUserProxyAction.java @@ -1,15 +1,8 @@ package com.dotmarketing.portlets.user.action; -import java.lang.reflect.InvocationTargetException; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.HibernateUtil; @@ -17,6 +10,10 @@ import com.dotmarketing.portlets.usermanager.struts.UserManagerForm; import com.dotmarketing.util.Logger; import com.dotmarketing.util.WebKeys; +import java.lang.reflect.InvocationTargetException; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /* * @author Oswaldo Gallango diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/ViewUserCommentsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/ViewUserCommentsAction.java index 0ac651a5efca..27f57372cc78 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/ViewUserCommentsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/action/ViewUserCommentsAction.java @@ -1,17 +1,9 @@ package com.dotmarketing.portlets.user.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.UserProxy; import com.dotmarketing.business.APILocator; import com.dotmarketing.portal.struts.DotPortletAction; @@ -22,6 +14,11 @@ import com.liferay.portal.struts.ActionException; import com.liferay.portal.util.Constants; import com.liferay.util.servlet.SessionMessages; +import java.util.List; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source @@ -33,7 +30,7 @@ public class ViewUserCommentsAction extends DotPortletAction { /* - * @see com.liferay.portal.struts.PortletAction#render(com.dotcms.repackage.org.apache.struts.action.ActionMapping, com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) + * @see com.liferay.portal.struts.PortletAction#render(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) */ public ActionForward render( ActionMapping mapping, ActionForm form, PortletConfig config, diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserAdditionalInfoForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserAdditionalInfoForm.java index 2d3b51ee0d97..dc55938fe26a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserAdditionalInfoForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserAdditionalInfoForm.java @@ -1,8 +1,7 @@ package com.dotmarketing.portlets.user.struts; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.InodeUtils; +import org.apache.struts.validator.ValidatorForm; public class UserAdditionalInfoForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCategoriesForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCategoriesForm.java index 5a2f1507e4b8..eb2fec07cba5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCategoriesForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCategoriesForm.java @@ -1,6 +1,6 @@ package com.dotmarketing.portlets.user.struts; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; +import org.apache.struts.validator.ValidatorForm; public class UserCategoriesForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCommentsForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCommentsForm.java index 83b5bba1b0cc..d78e2f903df9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCommentsForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/struts/UserCommentsForm.java @@ -1,10 +1,8 @@ package com.dotmarketing.portlets.user.struts; -import java.sql.Date; - -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.InodeUtils; +import java.sql.Date; +import org.apache.struts.validator.ValidatorForm; public class UserCommentsForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/useradmin/action/ViewUsersAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/useradmin/action/ViewUsersAction.java index 321f229abbe6..0dd4763fcc89 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/useradmin/action/ViewUsersAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/useradmin/action/ViewUsersAction.java @@ -3,12 +3,10 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portal.struts.PortletAction; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewUsersAction extends PortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/userclicks/action/ViewUserClicksAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/userclicks/action/ViewUserClicksAction.java index d3f7b1083b0e..91f6ec615fdb 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/userclicks/action/ViewUserClicksAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/userclicks/action/ViewUserClicksAction.java @@ -1,19 +1,9 @@ package com.dotmarketing.portlets.userclicks.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Clickstream; import com.dotmarketing.business.APILocator; import com.dotmarketing.factories.ClickstreamFactory; @@ -24,6 +14,13 @@ import com.liferay.portal.model.User; import com.liferay.portal.struts.ActionException; import com.liferay.portal.util.Constants; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source @@ -35,7 +32,7 @@ public class ViewUserClicksAction extends DotPortletAction { /* - * @see com.liferay.portal.struts.PortletAction#render(com.dotcms.repackage.org.apache.struts.action.ActionMapping, com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) + * @see com.liferay.portal.struts.PortletAction#render(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) */ public ActionForward render( ActionMapping mapping, ActionForm form, PortletConfig config, diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/action/EditUserManagerAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/action/EditUserManagerAction.java index 208bf39a9d4b..19dae48fb9b0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/action/EditUserManagerAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/action/EditUserManagerAction.java @@ -3,27 +3,11 @@ import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ; import static com.dotmarketing.business.PermissionAPI.PERMISSION_WRITE; -import java.lang.reflect.InvocationTargetException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.dotcms.enterprise.PasswordFactoryProxy; import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Permission; import com.dotmarketing.beans.UserProxy; @@ -52,6 +36,20 @@ import com.liferay.portal.model.User; import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.servlet.SessionMessages; +import java.lang.reflect.InvocationTargetException; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; /* * @author Oswaldo Gallango diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/factories/UserManagerPropertiesFactory.java b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/factories/UserManagerPropertiesFactory.java index 8f309f3d338f..c2fb560958d2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/factories/UserManagerPropertiesFactory.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/factories/UserManagerPropertiesFactory.java @@ -7,7 +7,6 @@ import com.dotcms.repackage.javax.portlet.PortletResponse; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; import com.dotmarketing.cms.factories.PublicCompanyFactory; import com.dotmarketing.util.Config; import com.dotmarketing.util.Logger; @@ -32,6 +31,7 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionForm; public class UserManagerPropertiesFactory { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerForm.java index 7e4649499b80..1e6a02e751d7 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerForm.java @@ -1,18 +1,15 @@ package com.dotmarketing.portlets.usermanager.struts; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; import java.util.Date; import java.util.GregorianCalendar; import java.util.StringTokenizer; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; - -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.UtilMethods; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerListSearchForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerListSearchForm.java index 08a853dc9e06..f2f8beb569e0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerListSearchForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/usermanager/struts/UserManagerListSearchForm.java @@ -1,19 +1,16 @@ package com.dotmarketing.portlets.usermanager.struts; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.UtilMethods; +import com.liferay.portal.util.Constants; import java.util.Date; import java.util.GregorianCalendar; import java.util.StringTokenizer; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import com.dotmarketing.util.Config; -import com.dotmarketing.util.UtilMethods; -import com.liferay.portal.util.Constants; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.validator.ValidatorForm; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/GenerateWebFormsReportAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/GenerateWebFormsReportAction.java index 14c07a4d2f02..7e596ada0d32 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/GenerateWebFormsReportAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/GenerateWebFormsReportAction.java @@ -1,19 +1,8 @@ package com.dotmarketing.portlets.webforms.action; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.portlets.webforms.factories.WebFormFactory; import com.dotmarketing.portlets.webforms.model.WebForm; import com.dotmarketing.util.Logger; @@ -21,6 +10,14 @@ import com.liferay.portal.struts.PortletAction; import com.liferay.portlet.ActionResponseImpl; import com.liferay.util.servlet.SessionMessages; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; public class GenerateWebFormsReportAction extends PortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/ViewWebFormsAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/ViewWebFormsAction.java index 1ad42bc8bfd4..39a1264ab048 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/ViewWebFormsAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/webforms/action/ViewWebFormsAction.java @@ -3,13 +3,11 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.util.Logger; import com.liferay.portal.struts.PortletAction; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class ViewWebFormsAction extends PortletAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflowmessages/struts/WorkflowMessageForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflowmessages/struts/WorkflowMessageForm.java index aac2fdc50b9b..8fa7aca1b851 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflowmessages/struts/WorkflowMessageForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflowmessages/struts/WorkflowMessageForm.java @@ -1,17 +1,14 @@ package com.dotmarketing.portlets.workflowmessages.struts; -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - import com.dotmarketing.util.Logger; import com.liferay.portal.util.Constants; +import java.util.Date; +import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; /** @author Hibernate CodeGenerator */ public class WorkflowMessageForm extends ValidatorForm { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/EditWorkflowTaskAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/EditWorkflowTaskAction.java index 2df1ee222db3..6b93ff1ffd6d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/EditWorkflowTaskAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/EditWorkflowTaskAction.java @@ -1,19 +1,8 @@ package com.dotmarketing.portlets.workflows.action; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.business.APILocator; import com.dotmarketing.business.PermissionAPI; import com.dotmarketing.db.HibernateUtil; @@ -32,6 +21,14 @@ import com.liferay.portal.util.Constants; import com.liferay.portlet.ActionRequestImpl; import com.liferay.portlet.ActionResponseImpl; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author David */ diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/ViewWorkflowTasksAction.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/ViewWorkflowTasksAction.java index 1916c4f7d551..e6d6fa6fbf42 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/ViewWorkflowTasksAction.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/action/ViewWorkflowTasksAction.java @@ -3,14 +3,12 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.portal.struts.DotPortletAction; import com.dotmarketing.util.Logger; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * @@ -21,8 +19,8 @@ public class ViewWorkflowTasksAction extends DotPortletAction { /* - * @see com.liferay.portal.struts.PortletAction#render(com.dotcms.repackage.org.apache.struts.action.ActionMapping, - * com.dotcms.repackage.org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, + * @see com.liferay.portal.struts.PortletAction#render(org.apache.struts.action.ActionMapping, + * org.apache.struts.action.ActionForm, com.dotcms.repackage.javax.portlet.PortletConfig, * com.dotcms.repackage.javax.portlet.RenderRequest, com.dotcms.repackage.javax.portlet.RenderResponse) */ public ActionForward render(ActionMapping mapping, ActionForm form, PortletConfig config, RenderRequest req, diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfRoleStoreAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfRoleStoreAjax.java index 1773cd1b8838..170a24ec12dd 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfRoleStoreAjax.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfRoleStoreAjax.java @@ -2,8 +2,6 @@ import com.dotcms.repackage.com.fasterxml.jackson.databind.DeserializationFeature; import com.dotcms.repackage.com.fasterxml.jackson.databind.ObjectMapper; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.dotmarketing.business.APILocator; import com.dotmarketing.business.Role; import com.dotmarketing.business.RoleAPI; @@ -15,12 +13,16 @@ import com.liferay.portal.language.LanguageException; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; - +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.*; +import org.apache.commons.beanutils.BeanUtils; public class WfRoleStoreAjax extends WfBaseAction { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfSchemeAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfSchemeAjax.java index 8e079407a0e5..a312f74e89bd 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfSchemeAjax.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/ajax/WfSchemeAjax.java @@ -1,18 +1,15 @@ package com.dotmarketing.portlets.workflows.ajax; -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.dotmarketing.business.APILocator; import com.dotmarketing.portlets.workflows.business.WorkflowAPI; import com.dotmarketing.portlets.workflows.model.WorkflowScheme; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.beanutils.BeanUtils; public class WfSchemeAjax extends WfBaseAction { public void action(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{}; diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java index c65e698d9ecc..fe6bdd7d0c3e 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java @@ -2,8 +2,11 @@ import com.dotcms.enterprise.LicenseUtil; import com.dotcms.enterprise.license.LicenseLevel; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; -import com.dotmarketing.business.*; +import com.dotmarketing.business.APILocator; +import com.dotmarketing.business.CacheLocator; +import com.dotmarketing.business.DotStateException; +import com.dotmarketing.business.Role; +import com.dotmarketing.business.RoleAPI; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.db.HibernateUtil; @@ -11,19 +14,33 @@ import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.dotmarketing.portlets.contentlet.model.Contentlet; -import com.dotmarketing.portlets.workflows.model.*; +import com.dotmarketing.portlets.workflows.model.WorkFlowTaskFiles; +import com.dotmarketing.portlets.workflows.model.WorkflowAction; +import com.dotmarketing.portlets.workflows.model.WorkflowActionClass; +import com.dotmarketing.portlets.workflows.model.WorkflowActionClassParameter; +import com.dotmarketing.portlets.workflows.model.WorkflowComment; +import com.dotmarketing.portlets.workflows.model.WorkflowHistory; +import com.dotmarketing.portlets.workflows.model.WorkflowScheme; +import com.dotmarketing.portlets.workflows.model.WorkflowSearcher; +import com.dotmarketing.portlets.workflows.model.WorkflowStatus; +import com.dotmarketing.portlets.workflows.model.WorkflowStep; +import com.dotmarketing.portlets.workflows.model.WorkflowTask; import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UUIDGenerator; import com.dotmarketing.util.UtilMethods; import com.google.common.collect.ImmutableList; import com.liferay.portal.model.User; -import com.liferay.util.StringPool; - import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; +import org.apache.commons.beanutils.BeanUtils; public class WorkflowFactoryImpl implements WorkFlowFactory { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowComment.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowComment.java index 4d8c229fb9c6..276545f58ef2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowComment.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowComment.java @@ -1,13 +1,11 @@ package com.dotmarketing.portlets.workflows.model; +import com.dotmarketing.util.UtilMethods; import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.builder.ToStringBuilder; public class WorkflowComment implements Serializable diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowHistory.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowHistory.java index 5731fc9b9a85..7ee8b3610272 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowHistory.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowHistory.java @@ -1,13 +1,11 @@ package com.dotmarketing.portlets.workflows.model; +import com.dotmarketing.util.UtilMethods; import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.builder.ToStringBuilder; public class WorkflowHistory implements Serializable { diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowTask.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowTask.java index ea24314a4ec9..100bd5ea9b40 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowTask.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowTask.java @@ -1,13 +1,11 @@ package com.dotmarketing.portlets.workflows.model; +import com.dotmarketing.util.UtilMethods; import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; - -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.builder.ToStringBuilder; public class WorkflowTask implements Serializable diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowCommentForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowCommentForm.java index 822fbcaedfb3..68cb6cf69760 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowCommentForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowCommentForm.java @@ -1,15 +1,12 @@ package com.dotmarketing.portlets.workflows.struts; +import com.dotmarketing.util.InodeUtils; import java.util.Date; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import com.dotmarketing.util.InodeUtils; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowHistoryForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowHistoryForm.java index 2dbe1076ec5c..695592edce19 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowHistoryForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowHistoryForm.java @@ -1,15 +1,12 @@ package com.dotmarketing.portlets.workflows.struts; +import com.dotmarketing.util.InodeUtils; import java.util.Date; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import com.dotmarketing.util.InodeUtils; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowTaskForm.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowTaskForm.java index 7584ff903fab..14fd903fc982 100644 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowTaskForm.java +++ b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/struts/WorkflowTaskForm.java @@ -1,15 +1,12 @@ package com.dotmarketing.portlets.workflows.struts; +import com.dotmarketing.util.InodeUtils; import java.util.Date; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorForm; - -import com.dotmarketing.util.InodeUtils; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.validator.ValidatorForm; diff --git a/dotCMS/src/main/java/com/dotmarketing/servlets/BinaryExporterServlet.java b/dotCMS/src/main/java/com/dotmarketing/servlets/BinaryExporterServlet.java index cc7e13e2c6b6..b735b88ae309 100644 --- a/dotCMS/src/main/java/com/dotmarketing/servlets/BinaryExporterServlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/servlets/BinaryExporterServlet.java @@ -1,9 +1,11 @@ package com.dotmarketing.servlets; +import static com.liferay.util.HttpHeaders.CACHE_CONTROL; +import static com.liferay.util.HttpHeaders.EXPIRES; + import com.dotcms.contenttype.exception.NotFoundInDbException; import com.dotcms.contenttype.model.type.ContentType; import com.dotcms.repackage.com.google.common.io.Files; -import com.dotcms.repackage.org.apache.commons.collections.LRUMap; import com.dotcms.util.DownloadUtil; import com.dotcms.uuid.shorty.ShortType; import com.dotcms.uuid.shorty.ShortyId; @@ -25,12 +27,34 @@ import com.dotmarketing.portlets.contentlet.business.DotContentletStateException; import com.dotmarketing.portlets.contentlet.model.Contentlet; import com.dotmarketing.portlets.fileassets.business.FileAssetAPI; -import com.dotmarketing.util.*; +import com.dotmarketing.util.Config; +import com.dotmarketing.util.Constants; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.PageMode; +import com.dotmarketing.util.UtilMethods; +import com.dotmarketing.util.WebKeys; import com.liferay.portal.PortalException; import com.liferay.portal.SystemException; import com.liferay.portal.model.User; import com.liferay.util.FileUtil; - +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.RandomAccessFile; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.TimeZone; import javax.imageio.ImageIO; import javax.imageio.spi.IIORegistry; import javax.servlet.ServletException; @@ -39,12 +63,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.io.*; -import java.text.SimpleDateFormat; -import java.util.*; - -import static com.liferay.util.HttpHeaders.CACHE_CONTROL; -import static com.liferay.util.HttpHeaders.EXPIRES; +import org.apache.commons.collections.LRUMap; /** * diff --git a/dotCMS/src/main/java/com/dotmarketing/servlets/InitServlet.java b/dotCMS/src/main/java/com/dotmarketing/servlets/InitServlet.java index 297b1fa5164a..751960b9e3c9 100644 --- a/dotCMS/src/main/java/com/dotmarketing/servlets/InitServlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/servlets/InitServlet.java @@ -1,36 +1,9 @@ package com.dotmarketing.servlets; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.net.HttpURLConnection; -import java.net.InetAddress; -import java.net.URL; -import java.net.URLEncoder; -import java.net.UnknownHostException; -import java.util.Date; -import java.util.List; - -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; - -import org.apache.lucene.search.BooleanQuery; -import org.quartz.SchedulerException; - import com.dotcms.cluster.business.HazelcastUtil; import com.dotcms.content.elasticsearch.util.ESClient; import com.dotcms.enterprise.LicenseUtil; import com.dotcms.repackage.com.maxmind.geoip2.exception.GeoIp2Exception; -import com.dotcms.repackage.org.apache.commons.lang.SystemUtils; import com.dotcms.services.VanityUrlServices; import com.dotcms.util.GeoIp2CityDbUtil; import com.dotmarketing.beans.Host; @@ -60,6 +33,30 @@ import com.dotmarketing.util.VelocityUtil; import com.dotmarketing.util.WebKeys; import com.liferay.portal.util.ReleaseInfo; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.URL; +import java.net.URLEncoder; +import java.net.UnknownHostException; +import java.util.Date; +import java.util.List; +import javax.management.InstanceAlreadyExistsException; +import javax.management.MBeanRegistrationException; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.NotCompliantMBeanException; +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import org.apache.commons.lang.SystemUtils; +import org.apache.lucene.search.BooleanQuery; +import org.quartz.SchedulerException; /** * Initialization servlet for specific dotCMS components and features. diff --git a/dotCMS/src/main/java/com/dotmarketing/servlets/JSONCategoriesServlet.java b/dotCMS/src/main/java/com/dotmarketing/servlets/JSONCategoriesServlet.java index 0ccc56414dc4..c78b77e44118 100644 --- a/dotCMS/src/main/java/com/dotmarketing/servlets/JSONCategoriesServlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/servlets/JSONCategoriesServlet.java @@ -1,25 +1,7 @@ package com.dotmarketing.servlets; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.com.fasterxml.jackson.databind.DeserializationConfig; import com.dotcms.repackage.com.fasterxml.jackson.databind.DeserializationFeature; import com.dotcms.repackage.com.fasterxml.jackson.databind.ObjectMapper; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; - import com.dotmarketing.business.APILocator; import com.dotmarketing.business.web.UserWebAPI; import com.dotmarketing.business.web.WebAPILocator; @@ -34,6 +16,20 @@ import com.liferay.portal.PortalException; import com.liferay.portal.SystemException; import com.liferay.portal.model.User; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringEscapeUtils; public class JSONCategoriesServlet extends HttpServlet implements Servlet { diff --git a/dotCMS/src/main/java/com/dotmarketing/servlets/JSONTagsServlet.java b/dotCMS/src/main/java/com/dotmarketing/servlets/JSONTagsServlet.java index 3e5286d1c24f..ed27b36572bc 100644 --- a/dotCMS/src/main/java/com/dotmarketing/servlets/JSONTagsServlet.java +++ b/dotCMS/src/main/java/com/dotmarketing/servlets/JSONTagsServlet.java @@ -1,23 +1,7 @@ package com.dotmarketing.servlets; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.dotcms.repackage.com.fasterxml.jackson.databind.DeserializationFeature; import com.dotcms.repackage.com.fasterxml.jackson.databind.ObjectMapper; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.web.UserWebAPI; @@ -34,6 +18,19 @@ import com.liferay.portal.SystemException; import com.liferay.portal.language.LanguageUtil; import com.liferay.portal.model.User; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringEscapeUtils; public class JSONTagsServlet extends HttpServlet implements Servlet { diff --git a/dotCMS/src/main/java/com/dotmarketing/startup/AbstractJDBCStartupTask.java b/dotCMS/src/main/java/com/dotmarketing/startup/AbstractJDBCStartupTask.java index 874937891442..3e2cfd407c8b 100644 --- a/dotCMS/src/main/java/com/dotmarketing/startup/AbstractJDBCStartupTask.java +++ b/dotCMS/src/main/java/com/dotmarketing/startup/AbstractJDBCStartupTask.java @@ -3,6 +3,14 @@ import static com.dotcms.util.CollectionsUtils.getMapValue; import static com.dotcms.util.CollectionsUtils.map; +import com.dotmarketing.common.db.DotConnect; +import com.dotmarketing.common.util.SQLUtil; +import com.dotmarketing.db.DbConnectionFactory; +import com.dotmarketing.db.HibernateUtil; +import com.dotmarketing.exception.DotDataException; +import com.dotmarketing.exception.DotRuntimeException; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.UtilMethods; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; @@ -14,16 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotmarketing.common.db.DotConnect; -import com.dotmarketing.common.util.SQLUtil; -import com.dotmarketing.db.DbConnectionFactory; -import com.dotmarketing.db.HibernateUtil; -import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.exception.DotRuntimeException; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.StringUtils; /** * Derived classes should avoid use of transactions. MSSQL might have problems diff --git a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task03540UpdateTagInodesReferences.java b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task03540UpdateTagInodesReferences.java index 186033847410..35aa0a672359 100644 --- a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task03540UpdateTagInodesReferences.java +++ b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task03540UpdateTagInodesReferences.java @@ -1,6 +1,5 @@ package com.dotmarketing.startup.runonce; -import com.dotcms.repackage.org.apache.commons.collections.map.MultiKeyMap; import com.dotmarketing.beans.Host; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -12,12 +11,12 @@ import com.dotmarketing.startup.AbstractJDBCStartupTask; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; - import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.collections.map.MultiKeyMap; /** * This class updates the contentlets tag fields references diff --git a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04220RemoveDeleteInactiveClusterServersJob.java b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04220RemoveDeleteInactiveClusterServersJob.java index 17a27adea201..4952cd725867 100644 --- a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04220RemoveDeleteInactiveClusterServersJob.java +++ b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04220RemoveDeleteInactiveClusterServersJob.java @@ -1,10 +1,9 @@ package com.dotmarketing.startup.runonce; -import java.util.List; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.CollectionsUtils; import com.dotmarketing.startup.AbstractJDBCStartupTask; +import java.util.List; +import org.apache.commons.lang.StringUtils; /** * This task removes the database information associated to the diff --git a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04305UpdateWorkflowActionTable.java b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04305UpdateWorkflowActionTable.java index 1de5f47f7a71..9ce44bcf97ba 100644 --- a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04305UpdateWorkflowActionTable.java +++ b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04305UpdateWorkflowActionTable.java @@ -1,6 +1,5 @@ package com.dotmarketing.startup.runonce; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.ConversionUtils; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.common.db.DotDatabaseMetaData; @@ -13,11 +12,11 @@ import com.dotmarketing.portlets.workflows.model.WorkflowStatus; import com.dotmarketing.startup.StartupTask; import com.dotmarketing.util.Logger; - import java.sql.SQLException; import java.util.Arrays; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; /** * This task updates the definition of the {@code workflow_action} table, creates the new diff --git a/dotCMS/src/main/java/com/dotmarketing/struts/PortalRequestProcessor.java b/dotCMS/src/main/java/com/dotmarketing/struts/PortalRequestProcessor.java index 5c365c9f9484..a93fac96cdfa 100644 --- a/dotCMS/src/main/java/com/dotmarketing/struts/PortalRequestProcessor.java +++ b/dotCMS/src/main/java/com/dotmarketing/struts/PortalRequestProcessor.java @@ -4,13 +4,13 @@ */ package com.dotmarketing.struts; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.filters.Constants; import com.dotmarketing.util.Config; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionMapping; /** * @author will diff --git a/dotCMS/src/main/java/com/dotmarketing/util/Config.java b/dotCMS/src/main/java/com/dotmarketing/util/Config.java index 60e9fd6abcf2..4b87c3d095e2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/Config.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/Config.java @@ -1,10 +1,7 @@ package com.dotmarketing.util; import com.dotcms.repackage.com.google.common.base.Supplier; -import com.dotcms.repackage.org.apache.commons.configuration.Configuration; -import com.dotcms.repackage.org.apache.commons.configuration.PropertiesConfiguration; import com.dotcms.repackage.org.apache.commons.io.IOUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; import com.dotcms.util.ConfigurationInterpolator; import com.dotcms.util.FileWatcherAPI; import com.dotcms.util.ReflectionUtils; @@ -22,6 +19,9 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.lang.StringUtils; /** * This class provides access to the system configuration parameters that are diff --git a/dotCMS/src/main/java/com/dotmarketing/util/DateUtil.java b/dotCMS/src/main/java/com/dotmarketing/util/DateUtil.java index 09bcdc5b128d..e6028f45cc23 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/DateUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/DateUtil.java @@ -2,6 +2,9 @@ import static com.dotcms.util.DotPreconditions.checkNotNull; +import com.dotmarketing.cms.factories.PublicCompanyFactory; +import com.liferay.portal.language.LanguageUtil; +import com.liferay.portal.model.Company; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.Instant; @@ -15,11 +18,7 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotmarketing.cms.factories.PublicCompanyFactory; -import com.liferay.portal.language.LanguageUtil; -import com.liferay.portal.model.Company; +import org.apache.commons.lang.StringUtils; /** * Provides utility methods to interact with {@link Date} objects, date formats, diff --git a/dotCMS/src/main/java/com/dotmarketing/util/HibernateCollectionConverter.java b/dotCMS/src/main/java/com/dotmarketing/util/HibernateCollectionConverter.java index 70d48fcd85a7..5088d4eebdc0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/HibernateCollectionConverter.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/HibernateCollectionConverter.java @@ -1,9 +1,9 @@ package com.dotmarketing.util; -import com.dotcms.repackage.net.sf.hibernate.collection.List; -import com.dotcms.repackage.net.sf.hibernate.collection.Set; -import com.dotcms.repackage.com.thoughtworks.xstream.converters.collections.CollectionConverter; -import com.dotcms.repackage.com.thoughtworks.xstream.mapper.Mapper; +import com.thoughtworks.xstream.converters.collections.CollectionConverter; +import com.thoughtworks.xstream.mapper.Mapper; +import net.sf.hibernate.collection.List; +import net.sf.hibernate.collection.Set; public class HibernateCollectionConverter extends CollectionConverter { public HibernateCollectionConverter(Mapper mapper) { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/HibernateMapConverter.java b/dotCMS/src/main/java/com/dotmarketing/util/HibernateMapConverter.java index 65436356f5ba..a0f38bdffd70 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/HibernateMapConverter.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/HibernateMapConverter.java @@ -1,8 +1,8 @@ package com.dotmarketing.util; -import com.dotcms.repackage.net.sf.hibernate.collection.Map; -import com.dotcms.repackage.com.thoughtworks.xstream.converters.collections.MapConverter; -import com.dotcms.repackage.com.thoughtworks.xstream.mapper.Mapper; +import com.thoughtworks.xstream.converters.collections.MapConverter; +import com.thoughtworks.xstream.mapper.Mapper; +import net.sf.hibernate.collection.Map; public class HibernateMapConverter extends MapConverter { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/ImportExportUtil.java b/dotCMS/src/main/java/com/dotmarketing/util/ImportExportUtil.java index a2965c75a5ab..7fb366bfd206 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/ImportExportUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/ImportExportUtil.java @@ -2,11 +2,6 @@ import com.dotcms.business.WrapInTransaction; import com.dotcms.contenttype.util.ContentTypeImportExportUtil; -import com.dotcms.repackage.com.thoughtworks.xstream.XStream; -import com.dotcms.repackage.com.thoughtworks.xstream.io.xml.DomDriver; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister; -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; import com.dotcms.util.CloseUtils; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.MultiTree; @@ -38,6 +33,8 @@ import com.liferay.portal.model.PortletPreferences; import com.liferay.portal.model.User; import com.liferay.util.FileUtil; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -63,6 +60,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.ZipFile; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.persister.AbstractEntityPersister; +import org.apache.commons.beanutils.BeanUtils; /** * This utility is part of the {@link Task00004LoadStarter} task, which fills diff --git a/dotCMS/src/main/java/com/dotmarketing/util/MaintenanceUtil.java b/dotCMS/src/main/java/com/dotmarketing/util/MaintenanceUtil.java index 42612a1d4af4..b416f8ebc1ab 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/MaintenanceUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/MaintenanceUtil.java @@ -1,17 +1,7 @@ package com.dotmarketing.util; -import com.dotmarketing.beans.Identifier; -import java.io.File; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import com.dotcms.business.WrapInTransaction; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.org.apache.commons.io.FileUtils; +import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; @@ -26,6 +16,14 @@ import com.dotmarketing.portlets.structure.model.Field; import com.dotmarketing.portlets.structure.model.Structure; import com.liferay.util.FileUtil; +import java.io.File; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import net.sf.hibernate.HibernateException; /** * This class provides access to utility methods that will search the database @@ -147,7 +145,7 @@ public static void cleanInodeTableData()throws DotDataException{ if(o instanceof Inode){ Inode i = (Inode)o; String type = i.getType(); - String tableName = ((com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); + String tableName = ((net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); cleanInodeTableData(tableName, type); } } @@ -168,7 +166,7 @@ public static void cleanInodeTableData()throws DotDataException{ if(o instanceof Inode){ Inode i = (Inode)o; String type = i.getType(); - String tableName = ((com.dotcms.repackage.net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); + String tableName = ((net.sf.hibernate.persister.AbstractEntityPersister)map.get(x)).getTableName(); removeOphanedInodes(tableName, type); } } diff --git a/dotCMS/src/main/java/com/dotmarketing/util/MenuItem.java b/dotCMS/src/main/java/com/dotmarketing/util/MenuItem.java index 75001ff807f8..b82e426594bd 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/MenuItem.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/MenuItem.java @@ -91,7 +91,7 @@ public void setSubMenu(List items) { } public String toString() { - return com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder.reflectionToString(this); + return org.apache.commons.lang.builder.ToStringBuilder.reflectionToString(this); } public boolean equals(Object o) { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java b/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java index 3ddd30bb00aa..f4f155f68631 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/OSGIUtil.java @@ -238,6 +238,10 @@ public BundleContext getBundleContext() { return felixFramework.getBundleContext(); } + public Boolean isInitialized() { + return null != felixFramework; + } + /** * Gets the OSGi framework factory * diff --git a/dotCMS/src/main/java/com/dotmarketing/util/RegEX.java b/dotCMS/src/main/java/com/dotmarketing/util/RegEX.java index 13479fd723f0..aeab7ef06f48 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/RegEX.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/RegEX.java @@ -1,20 +1,18 @@ package com.dotmarketing.util; +import com.dotmarketing.exception.DotRuntimeException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import com.dotcms.repackage.org.apache.oro.text.regex.MalformedPatternException; -import com.dotcms.repackage.org.apache.oro.text.regex.MatchResult; -import com.dotcms.repackage.org.apache.oro.text.regex.Pattern; -import com.dotcms.repackage.org.apache.oro.text.regex.PatternMatcherInput; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Compiler; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Matcher; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Substitution; -import com.dotcms.repackage.org.apache.oro.text.regex.Util; - -import com.dotmarketing.exception.DotRuntimeException; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.MatchResult; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcherInput; +import org.apache.oro.text.regex.Perl5Compiler; +import org.apache.oro.text.regex.Perl5Matcher; +import org.apache.oro.text.regex.Perl5Substitution; +import org.apache.oro.text.regex.Util; public class RegEX { @@ -33,7 +31,7 @@ protected Perl5Substitution initialValue() { private static RegEX instance; private Perl5Compiler compiler; - private Map patterns = new HashMap(); + private Map patterns = new HashMap(); private RegEX() { compiler = new Perl5Compiler(); diff --git a/dotCMS/src/main/java/com/dotmarketing/util/StringUtils.java b/dotCMS/src/main/java/com/dotmarketing/util/StringUtils.java index 7754da17fc5f..2a95dfec809a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/StringUtils.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/StringUtils.java @@ -1,19 +1,18 @@ package com.dotmarketing.util; -import java.util.function.Supplier; -import java.util.concurrent.ConcurrentHashMap; -import java.util.regex.Pattern; -import java.util.List; -import java.util.Map; -import java.util.Collections; -import java.util.HashMap; +import static org.apache.commons.lang.StringUtils.split; import com.dotcms.repackage.com.google.common.base.CaseFormat; import com.dotcms.repackage.org.codehaus.jettison.json.JSONArray; import com.dotcms.repackage.org.codehaus.jettison.json.JSONObject; import com.liferay.util.StringPool; - -import static com.dotcms.repackage.org.apache.commons.lang.StringUtils.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.regex.Pattern; public class StringUtils { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/UUIDGenerator.java b/dotCMS/src/main/java/com/dotmarketing/util/UUIDGenerator.java index 7f45c4e6ec79..14097bf3b10c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/UUIDGenerator.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/UUIDGenerator.java @@ -1,14 +1,12 @@ package com.dotmarketing.util; +import com.dotmarketing.common.db.DotConnect; import java.io.Serializable; import java.sql.SQLException; import java.util.UUID; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.engine.SessionImplementor; -import com.dotcms.repackage.net.sf.hibernate.id.IdentifierGenerator; - -import com.dotmarketing.common.db.DotConnect; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.engine.SessionImplementor; +import net.sf.hibernate.id.IdentifierGenerator; public class UUIDGenerator implements IdentifierGenerator { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/UtilMethods.java b/dotCMS/src/main/java/com/dotmarketing/util/UtilMethods.java index 882446dfaffe..410608e7792c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/UtilMethods.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/UtilMethods.java @@ -1,9 +1,6 @@ package com.dotmarketing.util; import com.dotcms.repackage.com.csvreader.CsvReader; -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; -import com.dotcms.repackage.org.apache.struts.Globals; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -23,7 +20,8 @@ import com.dotmarketing.portlets.links.model.Link; import com.dotmarketing.portlets.links.model.LinkVersionInfo; import com.dotmarketing.portlets.templates.model.TemplateVersionInfo; - +import com.liferay.portal.model.Company; +import com.liferay.portal.model.User; import java.beans.PropertyDescriptor; import java.io.BufferedReader; import java.io.File; @@ -59,21 +57,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Stream; - import javax.imageio.ImageIO; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; - +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.struts.Globals; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import com.liferay.portal.model.Company; -import com.liferay.portal.model.User; - /** * Provides several widely used routines that handle, verify or format many data structures, such as * date/time handling and conversion, array handling, collection handling and verification, HTTP diff --git a/dotCMS/src/main/java/com/dotmarketing/util/Validator.java b/dotCMS/src/main/java/com/dotmarketing/util/Validator.java index 750d403d8da4..6a060bdcf831 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/Validator.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/Validator.java @@ -5,13 +5,11 @@ package com.dotmarketing.util; import com.dotcms.repackage.javax.portlet.ActionRequest; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portlet.ActionRequestImpl; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** @@ -26,7 +24,7 @@ public static boolean validate(ActionRequest request, ActionForm form, ActionMap ActionRequestImpl reqImpl = (ActionRequestImpl) request; HttpServletRequest httpReq = reqImpl.getHttpServletRequest(); - com.dotcms.repackage.org.apache.struts.action.ActionErrors errors = form.validate(mapping, httpReq); + org.apache.struts.action.ActionErrors errors = form.validate(mapping, httpReq); if ((errors != null) && !errors.isEmpty()) { @@ -42,7 +40,7 @@ public static boolean validate(HttpServletRequest httpReq, ActionForm form, Acti return false; } - com.dotcms.repackage.org.apache.struts.action.ActionErrors errors = form.validate(mapping, httpReq); + org.apache.struts.action.ActionErrors errors = form.validate(mapping, httpReq); if ((errors != null) && !errors.isEmpty()) { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/XMLUtils.java b/dotCMS/src/main/java/com/dotmarketing/util/XMLUtils.java index 87e88c7905d4..6a1db74a5fa4 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/XMLUtils.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/XMLUtils.java @@ -14,7 +14,7 @@ public class XMLUtils { */ public static String xmlEscape(String str) { - return com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils.escapeXml(str); + return org.apache.commons.lang.StringEscapeUtils.escapeXml(str); } } diff --git a/dotCMS/src/main/java/com/dotmarketing/util/json/JSONObject.java b/dotCMS/src/main/java/com/dotmarketing/util/json/JSONObject.java index 32b49aa22326..6c2e3e564379 100755 --- a/dotCMS/src/main/java/com/dotmarketing/util/json/JSONObject.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/json/JSONObject.java @@ -3,21 +3,14 @@ import java.io.IOException; import java.io.Writer; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.TreeSet; - -import com.dotcms.repackage.org.apache.commons.lang.WordUtils; -import com.dotmarketing.portlets.rules.model.Rule; -import org.apache.velocity.tools.view.ImportSupport; -import org.apache.velocity.tools.view.tools.ViewTool; -import org.apache.velocity.tools.view.tools.ImportTool; - -import com.dotmarketing.util.Logger; +import org.apache.commons.lang.WordUtils; /** * A JSONObject is an unordered collection of name/value pairs. Its diff --git a/dotCMS/src/main/java/com/dotmarketing/webdav/DotWebdavHelper.java b/dotCMS/src/main/java/com/dotmarketing/webdav/DotWebdavHelper.java index 8a4d5a87ecec..7b2e93f1b5ac 100644 --- a/dotCMS/src/main/java/com/dotmarketing/webdav/DotWebdavHelper.java +++ b/dotCMS/src/main/java/com/dotmarketing/webdav/DotWebdavHelper.java @@ -11,11 +11,6 @@ import com.dotcms.repackage.com.bradmcevoy.http.LockTimeout; import com.dotcms.repackage.com.bradmcevoy.http.LockToken; import com.dotcms.repackage.com.bradmcevoy.http.Resource; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.oro.text.regex.MalformedPatternException; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Compiler; -import com.dotcms.repackage.org.apache.oro.text.regex.Perl5Matcher; - import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Permission; @@ -49,7 +44,12 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UUIDGenerator; import com.dotmarketing.util.UtilMethods; - +import com.liferay.portal.auth.AuthException; +import com.liferay.portal.auth.Authenticator; +import com.liferay.portal.model.Company; +import com.liferay.portal.model.User; +import com.liferay.portal.util.PropsUtil; +import com.liferay.util.FileUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -67,16 +67,12 @@ import java.util.List; import java.util.Map; import java.util.Timer; - +import org.apache.commons.lang.StringUtils; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Perl5Compiler; +import org.apache.oro.text.regex.Perl5Matcher; import org.apache.velocity.runtime.resource.ResourceManager; -import com.liferay.portal.auth.AuthException; -import com.liferay.portal.auth.Authenticator; -import com.liferay.portal.model.Company; -import com.liferay.portal.model.User; -import com.liferay.portal.util.PropsUtil; -import com.liferay.util.FileUtil; - public class DotWebdavHelper { private static String PRE_AUTHENTICATOR = PropsUtil.get("auth.pipeline.pre"); @@ -85,7 +81,7 @@ protected Perl5Matcher initialValue() { return new Perl5Matcher(); } }; - private com.dotcms.repackage.org.apache.oro.text.regex.Pattern tempResourcePattern; + private org.apache.oro.text.regex.Pattern tempResourcePattern; private File tempHolderDir; private String tempFolderPath = "dotwebdav"; diff --git a/dotCMS/src/main/java/com/liferay/portal/PortalException.java b/dotCMS/src/main/java/com/liferay/portal/PortalException.java index 3eccf5c91a4a..5cd0dcfae0c9 100644 --- a/dotCMS/src/main/java/com/liferay/portal/PortalException.java +++ b/dotCMS/src/main/java/com/liferay/portal/PortalException.java @@ -22,7 +22,7 @@ package com.liferay.portal; -import com.dotcms.repackage.org.apache.commons.lang.exception.NestableException; +import org.apache.commons.lang.exception.NestableException; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/SystemException.java b/dotCMS/src/main/java/com/liferay/portal/SystemException.java index d8dd74b78406..34302609cab7 100644 --- a/dotCMS/src/main/java/com/liferay/portal/SystemException.java +++ b/dotCMS/src/main/java/com/liferay/portal/SystemException.java @@ -22,7 +22,7 @@ package com.liferay.portal; -import com.dotcms.repackage.org.apache.commons.lang.exception.NestableException; +import org.apache.commons.lang.exception.NestableException; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/action/ChangePasswordAction.java b/dotCMS/src/main/java/com/liferay/portal/action/ChangePasswordAction.java index ab6c9537b4e1..a5e9f5fce27d 100644 --- a/dotCMS/src/main/java/com/liferay/portal/action/ChangePasswordAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/action/ChangePasswordAction.java @@ -22,16 +22,6 @@ package com.liferay.portal.action; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portal.NoSuchUserException; import com.liferay.portal.UserPasswordException; import com.liferay.portal.auth.PrincipalException; @@ -42,6 +32,14 @@ import com.liferay.util.ParamUtil; import com.liferay.util.servlet.SessionErrors; import com.liferay.util.servlet.SessionMessages; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/action/LayoutAction.java b/dotCMS/src/main/java/com/liferay/portal/action/LayoutAction.java index ead5e453d94c..b2daf2ee2b40 100644 --- a/dotCMS/src/main/java/com/liferay/portal/action/LayoutAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/action/LayoutAction.java @@ -22,30 +22,16 @@ package com.liferay.portal.action; -import java.util.List; - import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.PortletContext; import com.dotcms.repackage.javax.portlet.PortletMode; import com.dotcms.repackage.javax.portlet.PortletPreferences; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotcms.util.SecurityUtils; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.Layout; import com.dotmarketing.util.InodeUtils; import com.liferay.portal.ejb.PortletManagerUtil; -import com.liferay.portal.ejb.PortletPreferencesManagerUtil; import com.liferay.portal.model.Portlet; import com.liferay.portal.model.User; import com.liferay.portal.util.Constants; @@ -59,6 +45,16 @@ import com.liferay.util.ParamUtil; import com.liferay.util.Validator; import com.liferay.util.servlet.UploadServletRequest; +import java.util.List; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/action/LoginAction.java b/dotCMS/src/main/java/com/liferay/portal/action/LoginAction.java index 229628ca5152..b3654210da73 100644 --- a/dotCMS/src/main/java/com/liferay/portal/action/LoginAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/action/LoginAction.java @@ -26,11 +26,6 @@ import com.dotcms.auth.providers.jwt.factories.JsonWebTokenFactory; import com.dotcms.cms.login.LoginServiceAPI; import com.dotcms.repackage.javax.portlet.WindowState; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotcms.rest.api.v1.authentication.DotInvalidTokenException; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotInvalidPasswordException; @@ -39,7 +34,13 @@ import com.dotmarketing.util.Config; import com.dotmarketing.util.SecurityLogger; import com.dotmarketing.util.UtilMethods; -import com.liferay.portal.*; +import com.liferay.portal.NoSuchUserException; +import com.liferay.portal.RequiredLayoutException; +import com.liferay.portal.SendPasswordException; +import com.liferay.portal.UserActiveException; +import com.liferay.portal.UserEmailAddressException; +import com.liferay.portal.UserIdException; +import com.liferay.portal.UserPasswordException; import com.liferay.portal.auth.AuthException; import com.liferay.portal.ejb.UserLocalManagerUtil; import com.liferay.portal.ejb.UserManagerFactory; @@ -54,13 +55,17 @@ import com.liferay.util.Validator; import com.liferay.util.servlet.SessionErrors; import com.liferay.util.servlet.SessionMessages; - +import java.util.List; +import java.util.Locale; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.jsp.PageContext; -import java.util.List; -import java.util.Locale; +import org.apache.struts.Globals; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/action/LoginAsAction.java b/dotCMS/src/main/java/com/liferay/portal/action/LoginAsAction.java index 6b5f3b538acf..fd2469706937 100644 --- a/dotCMS/src/main/java/com/liferay/portal/action/LoginAsAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/action/LoginAsAction.java @@ -1,14 +1,5 @@ package com.liferay.portal.action; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; @@ -27,6 +18,13 @@ import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.WebKeys; import com.liferay.portlet.PortletURLImpl; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class LoginAsAction extends Action { diff --git a/dotCMS/src/main/java/com/liferay/portal/action/LogoutAction.java b/dotCMS/src/main/java/com/liferay/portal/action/LogoutAction.java index f8794706cd1b..2b1b7c30b738 100644 --- a/dotCMS/src/main/java/com/liferay/portal/action/LogoutAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/action/LogoutAction.java @@ -23,20 +23,19 @@ package com.liferay.portal.action; import com.dotcms.cms.login.LoginServiceAPI; -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.business.APILocator; import com.dotmarketing.util.SecurityLogger; import com.liferay.portal.util.Constants; import com.liferay.portal.util.PortalUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/action/LogoutAsAction.java b/dotCMS/src/main/java/com/liferay/portal/action/LogoutAsAction.java index 2722629b55f8..53e3ebe173ee 100644 --- a/dotCMS/src/main/java/com/liferay/portal/action/LogoutAsAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/action/LogoutAsAction.java @@ -1,13 +1,5 @@ package com.liferay.portal.action; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.beans.Host; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.web.HostWebAPI; @@ -20,6 +12,12 @@ import com.liferay.portal.util.Constants; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.WebKeys; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; public class LogoutAsAction extends Action { diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/AddressPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/AddressPersistence.java index 1deb441a6bce..2323a8dc68f0 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/AddressPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/AddressPersistence.java @@ -22,20 +22,18 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchAddressException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/BasePersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/BasePersistence.java index 4cbfbe85e90e..b20b815bddd0 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/BasePersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/BasePersistence.java @@ -22,12 +22,11 @@ package com.liferay.portal.ejb; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.Session; -import com.dotcms.repackage.net.sf.hibernate.dialect.Dialect; - import com.liferay.portal.util.HibernateConfiguration; import com.liferay.portal.util.HibernateUtil; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.Session; +import net.sf.hibernate.dialect.Dialect; /** diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/CompanyPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/CompanyPersistence.java index 5395aadbd2f0..02c34471261a 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/CompanyPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/CompanyPersistence.java @@ -22,17 +22,15 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchCompanyException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/ImageLocalUtil.java b/dotCMS/src/main/java/com/liferay/portal/ejb/ImageLocalUtil.java index e7528abf354e..7ad10b199edd 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/ImageLocalUtil.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/ImageLocalUtil.java @@ -22,20 +22,17 @@ package com.liferay.portal.ejb; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; - import com.dotcms.repackage.EDU.oswego.cs.dl.util.concurrent.SyncMap; import com.dotcms.repackage.EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock; - import com.dotmarketing.util.Logger; import com.liferay.portal.model.Image; import com.liferay.portal.util.ImageKey; import com.liferay.portal.util.PropsUtil; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; +import org.apache.commons.collections.map.LRUMap; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/ImagePersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/ImagePersistence.java index b0c92179bc01..6c1669a13cab 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/ImagePersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/ImagePersistence.java @@ -22,17 +22,15 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchImageException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/PasswordTrackerPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/PasswordTrackerPersistence.java index 1883f01105cb..0591f791437c 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/PasswordTrackerPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/PasswordTrackerPersistence.java @@ -22,20 +22,18 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchPasswordTrackerException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPersistence.java index 4ff0ee58ea27..364405ebb67b 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPersistence.java @@ -22,20 +22,18 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchPortletException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPreferencesPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPreferencesPersistence.java index 27fb0402600a..370b4738623f 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPreferencesPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/PortletPreferencesPersistence.java @@ -22,20 +22,18 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchPortletPreferencesException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/ReleasePersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/ReleasePersistence.java index 99c737fcd778..eaf91149fe3c 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/ReleasePersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/ReleasePersistence.java @@ -22,17 +22,15 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchReleaseException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/UserPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/UserPersistence.java index 044974ce5aa0..b2af23bb7798 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/UserPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/UserPersistence.java @@ -25,18 +25,8 @@ import com.dotcms.business.CloseDBIfOpened; import com.dotcms.util.user.LiferayUserTransformer; import com.dotcms.util.user.UserTransformer; -import com.dotmarketing.common.db.DotConnect; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.dotmarketing.business.APILocator; +import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.exception.DotDataException; import com.liferay.portal.NoSuchUserException; @@ -44,7 +34,15 @@ import com.liferay.portal.model.User; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import java.util.Map; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPathPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPathPersistence.java index 3948bcf81fea..ae99a3991a0b 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPathPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPathPersistence.java @@ -22,20 +22,18 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchUserTrackerPathException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPersistence.java b/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPersistence.java index 50cb7c9a17e9..9f026980bf66 100644 --- a/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portal/ejb/UserTrackerPersistence.java @@ -22,20 +22,18 @@ package com.liferay.portal.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.NoSuchUserTrackerException; import com.liferay.portal.SystemException; import com.liferay.portal.util.HibernateUtil; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/events/LoginPostAction.java b/dotCMS/src/main/java/com/liferay/portal/events/LoginPostAction.java index 423bea5fa013..708424a84f08 100644 --- a/dotCMS/src/main/java/com/liferay/portal/events/LoginPostAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/events/LoginPostAction.java @@ -22,16 +22,6 @@ package com.liferay.portal.events; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.Globals; - import com.liferay.portal.model.User; import com.liferay.portal.model.UserTracker; import com.liferay.portal.struts.Action; @@ -42,6 +32,13 @@ import com.liferay.portal.util.WebKeys; import com.liferay.util.BrowserSniffer; import com.liferay.util.GetterUtil; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/events/ServicePreAction.java b/dotCMS/src/main/java/com/liferay/portal/events/ServicePreAction.java index 5ad395eda33d..e812f2a5fb36 100644 --- a/dotCMS/src/main/java/com/liferay/portal/events/ServicePreAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/events/ServicePreAction.java @@ -22,16 +22,6 @@ package com.liferay.portal.events; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.Globals; - import com.dotmarketing.business.APILocator; import com.dotmarketing.business.Layout; import com.liferay.portal.NoSuchUserException; @@ -46,6 +36,13 @@ import com.liferay.util.ListUtil; import com.liferay.util.ParamUtil; import com.liferay.util.Validator; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/form/LayoutForm.java b/dotCMS/src/main/java/com/liferay/portal/form/LayoutForm.java index d256f6268b83..2ba517a0e2b9 100644 --- a/dotCMS/src/main/java/com/liferay/portal/form/LayoutForm.java +++ b/dotCMS/src/main/java/com/liferay/portal/form/LayoutForm.java @@ -22,11 +22,9 @@ package com.liferay.portal.form; -import java.util.Properties; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; - import com.liferay.util.NullSafeProperties; +import java.util.Properties; +import org.apache.struts.action.ActionForm; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/language/LanguageUtil.java b/dotCMS/src/main/java/com/liferay/portal/language/LanguageUtil.java index 94a2b176a9fa..962c6edde14f 100644 --- a/dotCMS/src/main/java/com/liferay/portal/language/LanguageUtil.java +++ b/dotCMS/src/main/java/com/liferay/portal/language/LanguageUtil.java @@ -22,9 +22,6 @@ package com.liferay.portal.language; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.taglib.TagUtils; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; import com.dotmarketing.business.APILocator; import com.dotmarketing.cms.factories.PublicCompanyFactory; import com.dotmarketing.portlets.languagesmanager.model.Language; @@ -39,7 +36,6 @@ import com.liferay.util.StringPool; import com.liferay.util.StringUtil; import com.liferay.util.Time; - import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -49,9 +45,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.servlet.jsp.PageContext; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts.Globals; +import org.apache.struts.taglib.TagUtils; +import org.apache.struts.util.MessageResources; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/model/AddressModel.java b/dotCMS/src/main/java/com/liferay/portal/model/AddressModel.java index ff92a9b5d7ba..1d722a8fc604 100644 --- a/dotCMS/src/main/java/com/liferay/portal/model/AddressModel.java +++ b/dotCMS/src/main/java/com/liferay/portal/model/AddressModel.java @@ -22,15 +22,13 @@ package com.liferay.portal.model; -import java.lang.reflect.InvocationTargetException; -import java.util.Date; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils; - import com.liferay.portal.util.PropsUtil; import com.liferay.util.GetterUtil; import com.liferay.util.Xss; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; +import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/pwd/RegExpToolkit.java b/dotCMS/src/main/java/com/liferay/portal/pwd/RegExpToolkit.java index 6f3bfc2fe498..c6af7fc19925 100644 --- a/dotCMS/src/main/java/com/liferay/portal/pwd/RegExpToolkit.java +++ b/dotCMS/src/main/java/com/liferay/portal/pwd/RegExpToolkit.java @@ -22,13 +22,7 @@ package com.liferay.portal.pwd; -import java.util.Locale; - -import javax.servlet.http.HttpServletRequest; - import com.dotcms.api.web.HttpServletRequestThreadLocal; -import com.dotcms.repackage.org.apache.oro.text.perl.Perl5Util; -import com.dotcms.repackage.uk.ltd.getahead.dwr.WebContextFactory; import com.dotmarketing.business.APILocator; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.util.UtilMethods; @@ -38,6 +32,9 @@ import com.liferay.portal.util.PropsUtil; import com.liferay.util.LocaleUtil; import com.liferay.util.PwdGenerator; +import java.util.Locale; +import javax.servlet.http.HttpServletRequest; +import org.apache.oro.text.perl.Perl5Util; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java b/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java index 8826e6c406f9..a7d7c7da2cc7 100644 --- a/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java +++ b/dotCMS/src/main/java/com/liferay/portal/servlet/MainServlet.java @@ -24,9 +24,6 @@ import com.dotcms.config.DotInitializationService; import com.dotcms.repackage.com.httpbridge.webproxy.http.TaskController; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionServlet; -import com.dotcms.repackage.org.apache.struts.tiles.TilesUtilImpl; import com.dotmarketing.business.APILocator; import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.exception.DotDataException; @@ -75,6 +72,9 @@ import javax.servlet.jsp.PageContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionServlet; +import org.apache.struts.tiles.TilesUtilImpl; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/Handler.java b/dotCMS/src/main/java/com/liferay/portal/struts/Handler.java index 5fe81fca644a..d74c421b456b 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/Handler.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/Handler.java @@ -24,11 +24,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/InitializableActionForm.java b/dotCMS/src/main/java/com/liferay/portal/struts/InitializableActionForm.java index 622489e9cf0c..60b7c22c2d43 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/InitializableActionForm.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/InitializableActionForm.java @@ -24,8 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResources.java b/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResources.java index 818e34e3f484..b4fc571ab409 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResources.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResources.java @@ -23,8 +23,6 @@ package com.liferay.portal.struts; import com.dotcms.repackage.com.google.common.collect.ImmutableMap; -import com.dotcms.repackage.org.apache.struts.util.MessageResourcesFactory; -import com.dotcms.repackage.com.oroad.stxx.util.PropertyMessageResources; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.business.ChainableCacheAdministratorImpl; @@ -33,15 +31,20 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.liferay.util.StringUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.servlet.ServletContext; +import com.oroad.stxx.util.PropertyMessageResources; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; -import java.util.*; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import javax.servlet.ServletContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.util.MessageResourcesFactory; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResourcesFactory.java b/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResourcesFactory.java index 1a97b8785aa9..605d5d8c8e35 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResourcesFactory.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/MultiMessageResourcesFactory.java @@ -22,8 +22,8 @@ package com.liferay.portal.struts; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; -import com.dotcms.repackage.org.apache.struts.util.MessageResourcesFactory; +import org.apache.struts.util.MessageResources; +import org.apache.struts.util.MessageResourcesFactory; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/PortalRequestProcessor.java b/dotCMS/src/main/java/com/liferay/portal/struts/PortalRequestProcessor.java index 8cfc8ee03bf7..c4efbfee17d2 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/PortalRequestProcessor.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/PortalRequestProcessor.java @@ -22,10 +22,12 @@ package com.liferay.portal.struts; -import com.dotcms.repackage.com.oroad.stxx.plugin.StxxTilesRequestProcessor; -import com.dotcms.repackage.javax.portlet.*; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.config.ForwardConfig; +import com.dotcms.repackage.javax.portlet.PortletConfig; +import com.dotcms.repackage.javax.portlet.PortletContext; +import com.dotcms.repackage.javax.portlet.PortletException; +import com.dotcms.repackage.javax.portlet.PortletMode; +import com.dotcms.repackage.javax.portlet.PortletPreferences; +import com.dotcms.repackage.javax.portlet.WindowState; import com.dotcms.util.SecurityUtils; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; @@ -40,7 +42,11 @@ import com.dotmarketing.util.Logger; import com.dotmarketing.util.PageMode; import com.dotmarketing.util.UtilMethods; -import com.liferay.portal.*; +import com.liferay.portal.PortalException; +import com.liferay.portal.PortletActiveException; +import com.liferay.portal.RequiredRoleException; +import com.liferay.portal.SystemException; +import com.liferay.portal.UserActiveException; import com.liferay.portal.auth.PrincipalException; import com.liferay.portal.ejb.PortletManagerUtil; import com.liferay.portal.ejb.PortletPreferencesManagerUtil; @@ -48,22 +54,38 @@ import com.liferay.portal.model.User; import com.liferay.portal.model.UserTracker; import com.liferay.portal.model.UserTrackerPath; -import com.liferay.portal.util.*; +import com.liferay.portal.util.Constants; +import com.liferay.portal.util.PortalUtil; +import com.liferay.portal.util.PropsUtil; +import com.liferay.portal.util.WebAppPool; +import com.liferay.portal.util.WebKeys; import com.liferay.portlet.CachePortlet; import com.liferay.portlet.RenderRequestImpl; import com.liferay.portlet.RenderResponseImpl; -import com.liferay.util.*; +import com.liferay.util.CollectionFactory; +import com.liferay.util.GetterUtil; +import com.liferay.util.Http; +import com.liferay.util.ObjectValuePair; +import com.liferay.util.StringPool; +import com.liferay.util.StringUtil; import com.liferay.util.servlet.SessionErrors; import com.liferay.util.servlet.UploadServletRequest; - +import com.oroad.stxx.plugin.StxxTilesRequestProcessor; +import java.io.IOException; +import java.util.Date; +import java.util.Enumeration; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.jsp.PageContext; -import java.io.IOException; -import java.util.*; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.config.ForwardConfig; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/PortletAction.java b/dotCMS/src/main/java/com/liferay/portal/struts/PortletAction.java index 2cecee6b776e..140ddc61aec8 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/PortletAction.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/PortletAction.java @@ -27,18 +27,16 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; +import com.liferay.portal.util.WebKeys; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; - -import com.liferay.portal.util.WebKeys; +import org.apache.struts.Globals; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.util.MessageResources; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/PortletActionServlet.java b/dotCMS/src/main/java/com/liferay/portal/struts/PortletActionServlet.java index 00191ca4f1b4..1e749ce5e009 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/PortletActionServlet.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/PortletActionServlet.java @@ -22,15 +22,13 @@ package com.liferay.portal.struts; +import com.liferay.portal.util.WebKeys; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionServlet; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; - -import com.liferay.portal.util.WebKeys; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionServlet; +import org.apache.struts.config.ModuleConfig; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/PortletRequestProcessor.java b/dotCMS/src/main/java/com/liferay/portal/struts/PortletRequestProcessor.java index 25dd9290fc5b..a48a7a76a08a 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/PortletRequestProcessor.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/PortletRequestProcessor.java @@ -22,29 +22,11 @@ package com.liferay.portal.struts; -import java.io.IOException; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletException; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.Action; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; -import com.dotcms.repackage.org.apache.struts.action.ActionServlet; -import com.dotcms.repackage.org.apache.struts.config.ForwardConfig; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; - import com.dotcms.util.SecurityUtils; import com.dotmarketing.util.Logger; import com.liferay.portal.ejb.PortletManagerUtil; @@ -62,7 +44,22 @@ import com.liferay.portlet.RenderResponseImpl; import com.liferay.util.StringPool; import com.liferay.util.Validator; -import com.dotcms.repackage.com.oroad.stxx.plugin.StxxTilesRequestProcessor; +import com.oroad.stxx.plugin.StxxTilesRequestProcessor; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.Globals; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionServlet; +import org.apache.struts.config.ForwardConfig; +import org.apache.struts.config.ModuleConfig; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/StrutsURLEncoder.java b/dotCMS/src/main/java/com/liferay/portal/struts/StrutsURLEncoder.java index b28c465d58ea..a88a530e640e 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/StrutsURLEncoder.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/StrutsURLEncoder.java @@ -22,16 +22,10 @@ package com.liferay.portal.struts; -import java.util.HashMap; - import com.dotcms.repackage.javax.portlet.PortletMode; import com.dotcms.repackage.javax.portlet.PortletModeException; import com.dotcms.repackage.javax.portlet.WindowState; import com.dotcms.repackage.javax.portlet.WindowStateException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.dotmarketing.util.Logger; import com.liferay.portlet.PortletURLImpl; import com.liferay.util.GetterUtil; @@ -40,6 +34,9 @@ import com.liferay.util.StringUtil; import com.liferay.util.Validator; import com.liferay.util.servlet.URLEncoder; +import java.util.HashMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * View Source @@ -169,7 +166,7 @@ public String encodeURL(String path) { private void _setServletMapping(String servletMapping) { if (servletMapping != null) { - // See com.dotcms.repackage.org.apache.struts.util.RequestUtils.getActionMappingURL + // See org.apache.struts.util.RequestUtils.getActionMappingURL if (servletMapping.endsWith("/*")) { _servletMapping = servletMapping.substring( diff --git a/dotCMS/src/main/java/com/liferay/portal/struts/StxxPlugin.java b/dotCMS/src/main/java/com/liferay/portal/struts/StxxPlugin.java index c6553161a889..69cdec846ad9 100644 --- a/dotCMS/src/main/java/com/liferay/portal/struts/StxxPlugin.java +++ b/dotCMS/src/main/java/com/liferay/portal/struts/StxxPlugin.java @@ -23,9 +23,8 @@ package com.liferay.portal.struts; import javax.servlet.ServletException; - -import com.dotcms.repackage.org.apache.struts.action.ActionServlet; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; +import org.apache.struts.action.ActionServlet; +import org.apache.struts.config.ModuleConfig; /** * View Source @@ -34,7 +33,7 @@ * @version $Revision: 1.4 $ * */ -public class StxxPlugin extends com.dotcms.repackage.com.oroad.stxx.plugin.StxxPlugin { +public class StxxPlugin extends com.oroad.stxx.plugin.StxxPlugin { public void init(ActionServlet servlet, ModuleConfig config) throws ServletException { diff --git a/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration.java b/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration.java index 6633b8d7e33b..b0c8e256ee48 100644 --- a/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration.java +++ b/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration.java @@ -22,17 +22,15 @@ package com.liferay.portal.util; -import java.io.InputStream; - -import com.dotcms.repackage.net.sf.hibernate.cfg.Configuration; -import com.dotcms.repackage.net.sf.hibernate.mapping.Table; - import com.dotmarketing.db.DbConnectionFactory; import com.dotmarketing.db.LowercaseNamingStrategy; import com.dotmarketing.util.Logger; import com.liferay.util.StringUtil; import com.liferay.util.SystemProperties; import com.liferay.util.dao.hibernate.SessionConfiguration; +import java.io.InputStream; +import net.sf.hibernate.cfg.Configuration; +import net.sf.hibernate.mapping.Table; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration2.java b/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration2.java index fd39129d29ac..a77de0b6a1e7 100644 --- a/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration2.java +++ b/dotCMS/src/main/java/com/liferay/portal/util/HibernateConfiguration2.java @@ -22,12 +22,10 @@ package com.liferay.portal.util; -import java.io.InputStream; - -import com.dotcms.repackage.net.sf.hibernate.cfg.Configuration; - import com.dotmarketing.util.Logger; import com.liferay.util.dao.hibernate.SessionConfiguration; +import java.io.InputStream; +import net.sf.hibernate.cfg.Configuration; /** * View Source @@ -83,7 +81,7 @@ public void init() { cfg.setProperty( "hibernate.cache.provider_class", - "com.dotcms.repackage.net.sf.hibernate.cache.EhCacheProvider"); + "net.sf.hibernate.cache.EhCacheProvider"); cfg.setProperty( "hibernate.show_sql", diff --git a/dotCMS/src/main/java/com/liferay/portal/util/HibernateUtil.java b/dotCMS/src/main/java/com/liferay/portal/util/HibernateUtil.java index 804180ff778b..d337a5cc980e 100644 --- a/dotCMS/src/main/java/com/liferay/portal/util/HibernateUtil.java +++ b/dotCMS/src/main/java/com/liferay/portal/util/HibernateUtil.java @@ -22,13 +22,12 @@ package com.liferay.portal.util; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.Session; -import com.dotcms.repackage.net.sf.hibernate.dialect.Dialect; - import com.dotmarketing.util.Logger; import com.liferay.util.InstancePool; import com.liferay.util.dao.hibernate.SessionConfiguration; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.Session; +import net.sf.hibernate.dialect.Dialect; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portal/util/PortalUtil.java b/dotCMS/src/main/java/com/liferay/portal/util/PortalUtil.java index c57fc47b98cc..74b1a3e4f8b2 100644 --- a/dotCMS/src/main/java/com/liferay/portal/util/PortalUtil.java +++ b/dotCMS/src/main/java/com/liferay/portal/util/PortalUtil.java @@ -22,20 +22,6 @@ package com.liferay.portal.util; -import java.io.IOException; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.Enumeration; -import java.util.GregorianCalendar; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.TimeZone; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; @@ -47,14 +33,6 @@ import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.ValidatorException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.struts.Globals; - import com.dotmarketing.business.Role; import com.dotmarketing.business.web.WebAPILocator; import com.dotmarketing.cms.factories.PublicCompanyFactory; @@ -91,6 +69,25 @@ import com.liferay.util.servlet.DynamicServletRequest; import com.liferay.util.servlet.UploadPortletRequest; import com.liferay.util.servlet.UploadServletRequest; +import java.io.IOException; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.Enumeration; +import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.Globals; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/PortletRequestDispatcherImpl.java b/dotCMS/src/main/java/com/liferay/portlet/PortletRequestDispatcherImpl.java index f07a6652c0e0..fbcbabd92ec4 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/PortletRequestDispatcherImpl.java +++ b/dotCMS/src/main/java/com/liferay/portlet/PortletRequestDispatcherImpl.java @@ -22,28 +22,25 @@ package com.liferay.portlet; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - import com.dotcms.repackage.javax.portlet.PortletContext; import com.dotcms.repackage.javax.portlet.PortletException; import com.dotcms.repackage.javax.portlet.PortletRequestDispatcher; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.struts.Globals; - import com.dotmarketing.util.Logger; import com.liferay.portal.struts.StrutsURLEncoder; import com.liferay.util.ServerDetector; import com.liferay.util.StringPool; import com.liferay.util.StringUtil; import com.liferay.util.servlet.DynamicServletRequest; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import org.apache.struts.Globals; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/RenderRequestImpl.java b/dotCMS/src/main/java/com/liferay/portlet/RenderRequestImpl.java index 6c43bd1b5b71..5297450d3dd2 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/RenderRequestImpl.java +++ b/dotCMS/src/main/java/com/liferay/portlet/RenderRequestImpl.java @@ -22,16 +22,6 @@ package com.liferay.portlet; -import java.security.Principal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - import com.dotcms.repackage.javax.portlet.PortalContext; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.PortletContext; @@ -41,11 +31,6 @@ import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; import com.dotcms.repackage.javax.portlet.WindowState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.Globals; - import com.dotmarketing.util.Logger; import com.liferay.portal.model.Portlet; import com.liferay.portal.model.User; @@ -60,6 +45,18 @@ import com.liferay.util.Validator; import com.liferay.util.servlet.DynamicServletRequest; import com.liferay.util.servlet.UploadServletRequest; +import java.security.Principal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/StrutsPortlet.java b/dotCMS/src/main/java/com/liferay/portlet/StrutsPortlet.java index 81d94af12695..8e35baa3c029 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/StrutsPortlet.java +++ b/dotCMS/src/main/java/com/liferay/portlet/StrutsPortlet.java @@ -22,12 +22,6 @@ package com.liferay.portlet; -import java.io.IOException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.GenericPortlet; @@ -36,18 +30,21 @@ import com.dotcms.repackage.javax.portlet.PortletRequest; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.ServletException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; - import com.liferay.portal.struts.PortletRequestProcessor; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.WebKeys; import com.liferay.util.GetterUtil; import com.liferay.util.Validator; +import java.io.IOException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import javax.servlet.ServletException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.Globals; +import org.apache.struts.config.ModuleConfig; /** * View Source @@ -225,7 +222,7 @@ private void _setStrutsAttributes( private static final Log _log = LogFactory.getLog(StrutsPortlet.class); - private static String _STRUTS_PACKAGE = "com.dotcms.repackage.org.apache.struts."; + private static String _STRUTS_PACKAGE = "org.apache.struts."; private PortletConfigImpl _portletConfig; private String _editAction; diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/CustomEditPortletAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/CustomEditPortletAction.java index 07a1ed5d4e77..1847a3aa4c2e 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/CustomEditPortletAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/CustomEditPortletAction.java @@ -6,10 +6,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotmarketing.cache.NavMenuCache; import com.liferay.portal.ejb.PortletManagerUtil; import com.liferay.portal.model.Portlet; @@ -17,6 +13,8 @@ import com.liferay.portal.util.PortalUtil; import com.liferay.util.ParamUtil; import com.liferay.util.servlet.SessionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * @author Carlos Rivas diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/DeleteUserAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/DeleteUserAction.java index 78978efab23a..2ba59133a9b7 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/DeleteUserAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/DeleteUserAction.java @@ -25,13 +25,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotcms.util.SecurityUtils; import com.liferay.portal.NoSuchUserException; import com.liferay.portal.RequiredUserException; @@ -45,6 +38,10 @@ import com.liferay.util.ParamUtil; import com.liferay.util.servlet.SessionErrors; import com.liferay.util.servlet.SessionMessages; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditPortletAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditPortletAction.java index e737a7c1c65a..84b82a137d7a 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditPortletAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditPortletAction.java @@ -26,13 +26,6 @@ import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.PreferencesValidator; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotcms.util.SecurityUtils; import com.liferay.portal.NoSuchPortletException; import com.liferay.portal.PortletActiveException; @@ -46,11 +39,13 @@ import com.liferay.portal.util.WebKeys; import com.liferay.portlet.ActionRequestImpl; import com.liferay.portlet.PortletPreferencesSerializer; -import com.liferay.util.InstancePool; import com.liferay.util.ParamUtil; -import com.liferay.util.Validator; import com.liferay.util.servlet.SessionErrors; import com.liferay.util.servlet.SessionMessages; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditUserProfileAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditUserProfileAction.java index d1dfc91ef88e..88eadf9ae15d 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditUserProfileAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/EditUserProfileAction.java @@ -25,16 +25,14 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portal.NoSuchUserException; import com.liferay.portal.model.User; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.util.PortalUtil; import com.liferay.util.servlet.SessionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/KillSessionAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/KillSessionAction.java index 168a8fbd2411..b266468955b7 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/KillSessionAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/KillSessionAction.java @@ -25,16 +25,6 @@ import com.dotcms.repackage.javax.portlet.ActionRequest; import com.dotcms.repackage.javax.portlet.ActionResponse; import com.dotcms.repackage.javax.portlet.PortletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import com.liferay.portlet.ActionRequestImpl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.dotcms.util.SecurityUtils; import com.liferay.portal.auth.PrincipalException; import com.liferay.portal.servlet.PortalSessionContext; @@ -43,9 +33,17 @@ import com.liferay.portal.util.OmniadminUtil; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.WebKeys; +import com.liferay.portlet.ActionRequestImpl; import com.liferay.util.ParamUtil; import com.liferay.util.StringUtil; import com.liferay.util.servlet.SessionErrors; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/NotifyNewUsersAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/NotifyNewUsersAction.java index 792afb6f0304..a896dd92077a 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/NotifyNewUsersAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/NotifyNewUsersAction.java @@ -25,17 +25,15 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portal.ejb.UserManagerUtil; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.util.Constants; import com.liferay.portal.util.WebKeys; import com.liferay.util.ParamUtil; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/ServerAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/ServerAction.java index 59959f80f81f..19b6b4af3c91 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/ServerAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/ServerAction.java @@ -28,8 +28,6 @@ import com.dotcms.repackage.org.apache.logging.log4j.Level; import com.dotcms.repackage.org.apache.logging.log4j.LogManager; import com.dotcms.repackage.org.apache.logging.log4j.core.Logger; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; import com.dotmarketing.loggers.Log4jUtil; import com.liferay.portal.auth.PrincipalException; import com.liferay.portal.struts.PortletAction; @@ -40,9 +38,10 @@ import com.liferay.util.ParamUtil; import com.liferay.util.Time; import com.liferay.util.servlet.SessionErrors; - -import javax.servlet.jsp.PageContext; import java.util.Enumeration; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/action/UpdateUserConfigAction.java b/dotCMS/src/main/java/com/liferay/portlet/admin/action/UpdateUserConfigAction.java index ff6b92afaa6f..75123ff7e52a 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/action/UpdateUserConfigAction.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/action/UpdateUserConfigAction.java @@ -25,12 +25,6 @@ import com.dotcms.repackage.javax.portlet.PortletConfig; import com.dotcms.repackage.javax.portlet.RenderRequest; import com.dotcms.repackage.javax.portlet.RenderResponse; -import javax.servlet.jsp.PageContext; - -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionForward; -import com.dotcms.repackage.org.apache.struts.action.ActionMapping; - import com.liferay.portal.auth.PrincipalException; import com.liferay.portal.struts.PortletAction; import com.liferay.portal.util.Constants; @@ -42,6 +36,10 @@ import com.liferay.util.StringUtil; import com.liferay.util.servlet.SessionErrors; import com.liferay.util.servlet.SessionMessages; +import javax.servlet.jsp.PageContext; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/portlet/admin/ejb/AdminConfigPersistence.java b/dotCMS/src/main/java/com/liferay/portlet/admin/ejb/AdminConfigPersistence.java index fa7f0415fe2f..7fb34aca8523 100644 --- a/dotCMS/src/main/java/com/liferay/portlet/admin/ejb/AdminConfigPersistence.java +++ b/dotCMS/src/main/java/com/liferay/portlet/admin/ejb/AdminConfigPersistence.java @@ -22,21 +22,19 @@ package com.liferay.portlet.admin.ejb; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.ObjectNotFoundException; -import com.dotcms.repackage.net.sf.hibernate.Query; -import com.dotcms.repackage.net.sf.hibernate.ScrollableResults; -import com.dotcms.repackage.net.sf.hibernate.Session; - import com.liferay.portal.SystemException; import com.liferay.portal.ejb.BasePersistence; import com.liferay.portal.util.HibernateUtil; import com.liferay.portlet.admin.NoSuchConfigException; import com.liferay.util.dao.hibernate.OrderByComparator; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.ObjectNotFoundException; +import net.sf.hibernate.Query; +import net.sf.hibernate.ScrollableResults; +import net.sf.hibernate.Session; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/JS.java b/dotCMS/src/main/java/com/liferay/util/JS.java index 60f3946c8c5a..39dfb96822cb 100644 --- a/dotCMS/src/main/java/com/liferay/util/JS.java +++ b/dotCMS/src/main/java/com/liferay/util/JS.java @@ -24,8 +24,7 @@ import java.net.URLDecoder; import java.net.URLEncoder; - -import com.dotcms.repackage.org.apache.oro.text.perl.Perl5Util; +import org.apache.oro.text.perl.Perl5Util; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/LocaleUtil.java b/dotCMS/src/main/java/com/liferay/util/LocaleUtil.java index b325c6965228..5482173f212c 100644 --- a/dotCMS/src/main/java/com/liferay/util/LocaleUtil.java +++ b/dotCMS/src/main/java/com/liferay/util/LocaleUtil.java @@ -24,7 +24,6 @@ import com.dotcms.auth.providers.jwt.JsonWebTokenUtils; import com.dotcms.company.CompanyAPI; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.util.security.Encryptor; import com.dotcms.util.security.EncryptorFactory; import com.dotmarketing.business.APILocator; @@ -39,14 +38,13 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.portal.util.CookieKeys; -import com.liferay.portal.util.WebKeys; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +import java.util.Locale; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.Locale; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.Globals; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/PropertyComparator.java b/dotCMS/src/main/java/com/liferay/util/PropertyComparator.java index 78631c6e7833..536a6f242668 100644 --- a/dotCMS/src/main/java/com/liferay/util/PropertyComparator.java +++ b/dotCMS/src/main/java/com/liferay/util/PropertyComparator.java @@ -22,12 +22,10 @@ package com.liferay.util; +import com.dotmarketing.util.Logger; import java.lang.reflect.InvocationTargetException; import java.util.Comparator; - -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; - -import com.dotmarketing.util.Logger; +import org.apache.commons.beanutils.PropertyUtils; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/PwdGenerator.java b/dotCMS/src/main/java/com/liferay/util/PwdGenerator.java index 18ec211f2aed..cb942605f636 100644 --- a/dotCMS/src/main/java/com/liferay/util/PwdGenerator.java +++ b/dotCMS/src/main/java/com/liferay/util/PwdGenerator.java @@ -22,7 +22,7 @@ package com.liferay.util; -import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang.RandomStringUtils; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/Xss.java b/dotCMS/src/main/java/com/liferay/util/Xss.java index 1d831b157bb5..baa164bda642 100644 --- a/dotCMS/src/main/java/com/liferay/util/Xss.java +++ b/dotCMS/src/main/java/com/liferay/util/Xss.java @@ -22,14 +22,12 @@ package com.liferay.util; +import com.dotmarketing.util.RegEX; +import com.dotmarketing.util.UtilMethods; import java.util.HashSet; import java.util.Set; - import javax.servlet.http.HttpServletRequest; - -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; -import com.dotmarketing.util.RegEX; -import com.dotmarketing.util.UtilMethods; +import org.apache.commons.lang.StringEscapeUtils; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/BooleanType.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/BooleanType.java index f47700fc8c68..d3b5e303f32e 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/BooleanType.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/BooleanType.java @@ -25,10 +25,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import com.dotcms.repackage.net.sf.hibernate.Hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.UserType; +import net.sf.hibernate.Hibernate; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.UserType; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DSConnectionProvider.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DSConnectionProvider.java index 3df2edef5b6d..26fd31e51d22 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DSConnectionProvider.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DSConnectionProvider.java @@ -22,16 +22,13 @@ package com.liferay.util.dao.hibernate; +import com.dotmarketing.db.DbConnectionFactory; import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; - import javax.sql.DataSource; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.connection.ConnectionProvider; - -import com.dotmarketing.db.DbConnectionFactory; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.connection.ConnectionProvider; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DoubleType.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DoubleType.java index f48af843609e..347f00eaabc2 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DoubleType.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DoubleType.java @@ -25,10 +25,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import com.dotcms.repackage.net.sf.hibernate.Hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.UserType; +import net.sf.hibernate.Hibernate; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.UserType; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DynamicDialect.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DynamicDialect.java index 439ec7c62048..98c428af509c 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DynamicDialect.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/DynamicDialect.java @@ -22,32 +22,29 @@ package com.liferay.util.dao.hibernate; -import java.sql.Connection; -import java.util.Enumeration; - -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.MappingException; -import com.dotcms.repackage.net.sf.hibernate.cfg.Environment; -import com.dotcms.repackage.net.sf.hibernate.dialect.DB2Dialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.Dialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.GenericDialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.HSQLDialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.MySQLDialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.OracleDialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.PostgreSQLDialect; -import com.dotcms.repackage.net.sf.hibernate.dialect.SQLServerDialect; -import com.dotcms.repackage.net.sf.hibernate.exception.SQLExceptionConverter; -import com.dotcms.repackage.net.sf.hibernate.exception.ViolatedConstraintNameExtracter; -import com.dotcms.repackage.net.sf.hibernate.sql.CaseFragment; -import com.dotcms.repackage.net.sf.hibernate.sql.JoinFragment; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.dotmarketing.util.Logger; import com.liferay.util.GetterUtil; import com.liferay.util.dao.DataAccess; import com.liferay.util.dao.DriverInfo; +import java.sql.Connection; +import java.util.Enumeration; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.MappingException; +import net.sf.hibernate.cfg.Environment; +import net.sf.hibernate.dialect.DB2Dialect; +import net.sf.hibernate.dialect.Dialect; +import net.sf.hibernate.dialect.GenericDialect; +import net.sf.hibernate.dialect.HSQLDialect; +import net.sf.hibernate.dialect.MySQLDialect; +import net.sf.hibernate.dialect.OracleDialect; +import net.sf.hibernate.dialect.PostgreSQLDialect; +import net.sf.hibernate.dialect.SQLServerDialect; +import net.sf.hibernate.exception.SQLExceptionConverter; +import net.sf.hibernate.exception.ViolatedConstraintNameExtracter; +import net.sf.hibernate.sql.CaseFragment; +import net.sf.hibernate.sql.JoinFragment; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/FloatType.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/FloatType.java index e5f84b238156..5e11048d464d 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/FloatType.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/FloatType.java @@ -25,10 +25,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import com.dotcms.repackage.net.sf.hibernate.Hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.UserType; +import net.sf.hibernate.Hibernate; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.UserType; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/IntegerType.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/IntegerType.java index 870fb41008cb..ca83286ac4e2 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/IntegerType.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/IntegerType.java @@ -25,10 +25,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import com.dotcms.repackage.net.sf.hibernate.Hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.UserType; +import net.sf.hibernate.Hibernate; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.UserType; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/LongType.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/LongType.java index c6a8ba622649..acecef48e089 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/LongType.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/LongType.java @@ -25,10 +25,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import com.dotcms.repackage.net.sf.hibernate.Hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.UserType; +import net.sf.hibernate.Hibernate; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.UserType; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/SessionConfiguration.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/SessionConfiguration.java index 052052c265a4..963ff5704824 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/SessionConfiguration.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/SessionConfiguration.java @@ -22,12 +22,11 @@ package com.liferay.util.dao.hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.Session; -import com.dotcms.repackage.net.sf.hibernate.SessionFactory; -import com.dotcms.repackage.net.sf.hibernate.dialect.Dialect; -import com.dotcms.repackage.net.sf.hibernate.impl.SessionFactoryImpl; - +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.Session; +import net.sf.hibernate.SessionFactory; +import net.sf.hibernate.dialect.Dialect; +import net.sf.hibernate.impl.SessionFactoryImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/ShortType.java b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/ShortType.java index a132ba437674..d17ba79e0537 100644 --- a/dotCMS/src/main/java/com/liferay/util/dao/hibernate/ShortType.java +++ b/dotCMS/src/main/java/com/liferay/util/dao/hibernate/ShortType.java @@ -25,10 +25,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import com.dotcms.repackage.net.sf.hibernate.Hibernate; -import com.dotcms.repackage.net.sf.hibernate.HibernateException; -import com.dotcms.repackage.net.sf.hibernate.UserType; +import net.sf.hibernate.Hibernate; +import net.sf.hibernate.HibernateException; +import net.sf.hibernate.UserType; /** * View Source diff --git a/dotCMS/src/main/java/com/liferay/util/mail/MailEngineException.java b/dotCMS/src/main/java/com/liferay/util/mail/MailEngineException.java index 26d167c68fe3..95bdcd25c5a6 100644 --- a/dotCMS/src/main/java/com/liferay/util/mail/MailEngineException.java +++ b/dotCMS/src/main/java/com/liferay/util/mail/MailEngineException.java @@ -22,7 +22,7 @@ package com.liferay.util.mail; -import com.dotcms.repackage.org.apache.commons.lang.exception.NestableException; +import org.apache.commons.lang.exception.NestableException; /** * View Source diff --git a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java index 5234ba6807f2..56242af98309 100644 --- a/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java +++ b/dotCMS/src/main/java/org/apache/velocity/anakia/AnakiaTask.java @@ -19,7 +19,6 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -30,6 +29,7 @@ import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; +import org.apache.commons.collections.ExtendedProperties; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/dotCMS/src/main/java/org/apache/velocity/app/Velocity.java b/dotCMS/src/main/java/org/apache/velocity/app/Velocity.java index bbcb283e9c7e..a67cc11bac81 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/Velocity.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/Velocity.java @@ -19,6 +19,7 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; @@ -26,8 +27,7 @@ import java.io.UnsupportedEncodingException; import java.io.Writer; import java.util.Properties; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.Template; import org.apache.velocity.context.Context; import org.apache.velocity.exception.MethodInvocationException; @@ -36,8 +36,6 @@ import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeSingleton; -import com.dotmarketing.util.Logger; - /** * This class provides services to the application * developer, such as : diff --git a/dotCMS/src/main/java/org/apache/velocity/app/VelocityEngine.java b/dotCMS/src/main/java/org/apache/velocity/app/VelocityEngine.java index f2270b260d98..4e338645c162 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/VelocityEngine.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/VelocityEngine.java @@ -19,6 +19,7 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -27,8 +28,7 @@ import java.io.UnsupportedEncodingException; import java.io.Writer; import java.util.Properties; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.Template; import org.apache.velocity.context.Context; import org.apache.velocity.exception.MethodInvocationException; @@ -37,8 +37,6 @@ import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeInstance; -import com.dotmarketing.util.Logger; - /** *

* This class provides a separate new-able instance of the diff --git a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java index c96fa5764618..6d98b45c32ee 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java @@ -19,7 +19,7 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringEscapeUtils; /** * Escape all HTML entities. diff --git a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java index edd85421e52a..ea49ddbf8393 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java @@ -19,7 +19,7 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringEscapeUtils; /** * Escapes the characters in a String to be suitable for use in JavaScript. diff --git a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java index 22c8224c0c66..2f2071e19baa 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java @@ -19,15 +19,14 @@ * under the License. */ -import com.dotcms.repackage.org.apache.oro.text.perl.MalformedPerl5PatternException; -import com.dotcms.repackage.org.apache.oro.text.perl.Perl5Util; +import com.dotmarketing.util.Logger; +import org.apache.oro.text.perl.MalformedPerl5PatternException; +import org.apache.oro.text.perl.Perl5Util; import org.apache.velocity.app.event.ReferenceInsertionEventHandler; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.RuntimeServicesAware; import org.apache.velocity.util.StringUtils; -import com.dotmarketing.util.Logger; - /** * Base class for escaping references. To use it, override the following methods: *

diff --git a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java index c8667ec60e33..585cb6c6948e 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java @@ -19,7 +19,7 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringEscapeUtils; /** * Escapes the characters in a String to be suitable to pass to an SQL query. diff --git a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java index 4488a4f4de64..3d5b40f07a89 100644 --- a/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java +++ b/dotCMS/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java @@ -19,7 +19,7 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringEscapeUtils; /** * Escape all XML entities. diff --git a/dotCMS/src/main/java/org/apache/velocity/convert/WebMacro.java b/dotCMS/src/main/java/org/apache/velocity/convert/WebMacro.java index 7d739a53a894..4bb0c0af7ea3 100644 --- a/dotCMS/src/main/java/org/apache/velocity/convert/WebMacro.java +++ b/dotCMS/src/main/java/org/apache/velocity/convert/WebMacro.java @@ -22,10 +22,9 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; - -import com.dotcms.repackage.org.apache.oro.text.perl.Perl5Util; -import org.apache.velocity.util.StringUtils; +import org.apache.oro.text.perl.Perl5Util; import org.apache.tools.ant.DirectoryScanner; +import org.apache.velocity.util.StringUtils; /** * This is deprecated without replacement. diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/Runtime.java b/dotCMS/src/main/java/org/apache/velocity/runtime/Runtime.java index 039b1f9f7c44..a8aaf327fbb2 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/Runtime.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/Runtime.java @@ -20,24 +20,16 @@ */ import java.io.Reader; - import java.util.Properties; - +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.Template; - - +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.runtime.directive.Directive; import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.runtime.parser.node.SimpleNode; - -import org.apache.velocity.runtime.directive.Directive; - import org.apache.velocity.runtime.resource.ContentResource; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.exception.ParseErrorException; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; - /** * This is the Runtime system for Velocity. It is the * single access point for all functionality in Velocity. diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java b/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java index ed9ea22ccd95..f843d8a20743 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java @@ -19,6 +19,8 @@ * under the License. */ +import com.dotcms.repackage.org.github.jamm.MemoryMeter; +import com.dotmarketing.util.Logger; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -30,9 +32,8 @@ import java.util.Hashtable; import java.util.Map; import java.util.Properties; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; +import org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.Template; import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.app.event.EventHandler; @@ -64,9 +65,6 @@ import org.apache.velocity.util.introspection.Introspector; import org.apache.velocity.util.introspection.LinkingUberspector; import org.apache.velocity.util.introspection.Uberspect; -import com.dotcms.repackage.org.github.jamm.MemoryMeter; - -import com.dotmarketing.util.Logger; /** * This is the Runtime system for Velocity. It is the diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeServices.java b/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeServices.java index c3f875b093cd..69f130b1d053 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeServices.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeServices.java @@ -22,8 +22,7 @@ import java.io.Reader; import java.io.Writer; import java.util.Properties; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.Template; import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.context.Context; diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java b/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java index a04a204b4a85..5861fe6717e4 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java @@ -21,8 +21,7 @@ import java.io.Reader; import java.util.Properties; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.Template; import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.exception.ParseErrorException; diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java b/dotCMS/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java index e945d90b2fea..3cc83fa2e292 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java @@ -19,16 +19,15 @@ * under the License. */ +import com.dotcms.rendering.velocity.services.DotResourceLoader; +import com.dotmarketing.util.Logger; import java.io.StringReader; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Vector; -import java.util.ArrayList; - -import com.dotcms.rendering.velocity.services.DotResourceLoader; -import com.dotcms.repackage.bsh.This; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.velocity.Template; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; @@ -38,8 +37,6 @@ import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.runtime.parser.node.Node; -import com.dotmarketing.util.Logger; - /** * VelocimacroFactory.java diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/directive/Block.java b/dotCMS/src/main/java/org/apache/velocity/runtime/directive/Block.java index b8c652318b4e..9f520db25ee9 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/directive/Block.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/directive/Block.java @@ -19,11 +19,11 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; - -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; @@ -31,8 +31,6 @@ import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.node.Node; -import com.dotmarketing.util.Logger; - /** * Directive that puts an unrendered AST block in the context * under the specified key, postponing rendering until the diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java b/dotCMS/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java index 104daadd68f3..82638b82c402 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java @@ -19,13 +19,13 @@ * under the License. */ +import com.dotmarketing.business.CacheLocator; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.VelocityUtil; import java.io.IOException; import java.io.Writer; import java.util.List; -import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; -import com.dotmarketing.business.CacheLocator; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.VelocityContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; @@ -41,8 +41,6 @@ import org.apache.velocity.runtime.parser.Token; import org.apache.velocity.runtime.parser.node.Node; import org.apache.velocity.util.introspection.Info; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.VelocityUtil; /** * This class acts as a proxy for potential macros. When the AST is built diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/Parser.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/Parser.java index 3bfbcf99cb20..c8f02b1e2287 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/Parser.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/Parser.java @@ -1,20 +1,61 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. Parser.java */ package org.apache.velocity.runtime.parser; -import java.io.*; -import java.util.*; +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.VelocityUtil; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.Reader; +import java.util.HashMap; +import java.util.Map; import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.parser.node.*; import org.apache.velocity.runtime.directive.Directive; import org.apache.velocity.runtime.directive.Macro; import org.apache.velocity.runtime.directive.MacroParseException; -import org.apache.velocity.util.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; -import org.apache.velocity.runtime.RuntimeConstants; - -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.VelocityUtil; +import org.apache.velocity.runtime.parser.node.ASTAddNode; +import org.apache.velocity.runtime.parser.node.ASTAndNode; +import org.apache.velocity.runtime.parser.node.ASTAssignment; +import org.apache.velocity.runtime.parser.node.ASTBlock; +import org.apache.velocity.runtime.parser.node.ASTComment; +import org.apache.velocity.runtime.parser.node.ASTDirective; +import org.apache.velocity.runtime.parser.node.ASTDivNode; +import org.apache.velocity.runtime.parser.node.ASTEQNode; +import org.apache.velocity.runtime.parser.node.ASTElseIfStatement; +import org.apache.velocity.runtime.parser.node.ASTElseStatement; +import org.apache.velocity.runtime.parser.node.ASTEscape; +import org.apache.velocity.runtime.parser.node.ASTEscapedDirective; +import org.apache.velocity.runtime.parser.node.ASTExpression; +import org.apache.velocity.runtime.parser.node.ASTFalse; +import org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral; +import org.apache.velocity.runtime.parser.node.ASTGENode; +import org.apache.velocity.runtime.parser.node.ASTGTNode; +import org.apache.velocity.runtime.parser.node.ASTIdentifier; +import org.apache.velocity.runtime.parser.node.ASTIfStatement; +import org.apache.velocity.runtime.parser.node.ASTIndex; +import org.apache.velocity.runtime.parser.node.ASTIntegerLiteral; +import org.apache.velocity.runtime.parser.node.ASTIntegerRange; +import org.apache.velocity.runtime.parser.node.ASTLENode; +import org.apache.velocity.runtime.parser.node.ASTLTNode; +import org.apache.velocity.runtime.parser.node.ASTMap; +import org.apache.velocity.runtime.parser.node.ASTMethod; +import org.apache.velocity.runtime.parser.node.ASTModNode; +import org.apache.velocity.runtime.parser.node.ASTMulNode; +import org.apache.velocity.runtime.parser.node.ASTNENode; +import org.apache.velocity.runtime.parser.node.ASTNotNode; +import org.apache.velocity.runtime.parser.node.ASTObjectArray; +import org.apache.velocity.runtime.parser.node.ASTOrNode; +import org.apache.velocity.runtime.parser.node.ASTReference; +import org.apache.velocity.runtime.parser.node.ASTSetDirective; +import org.apache.velocity.runtime.parser.node.ASTStringLiteral; +import org.apache.velocity.runtime.parser.node.ASTSubtractNode; +import org.apache.velocity.runtime.parser.node.ASTText; +import org.apache.velocity.runtime.parser.node.ASTTextblock; +import org.apache.velocity.runtime.parser.node.ASTTrue; +import org.apache.velocity.runtime.parser.node.ASTWord; +import org.apache.velocity.runtime.parser.node.ASTprocess; +import org.apache.velocity.runtime.parser.node.SimpleNode; /** * This class is responsible for parsing a Velocity diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/ParserTokenManager.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/ParserTokenManager.java index c4a8abf1a422..13eb46f2f1a1 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/ParserTokenManager.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/ParserTokenManager.java @@ -1,16 +1,8 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. ParserTokenManager.java */ package org.apache.velocity.runtime.parser; -import java.io.*; -import java.util.*; -import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.parser.node.*; -import org.apache.velocity.runtime.directive.Directive; -import org.apache.velocity.runtime.directive.Macro; -import org.apache.velocity.runtime.directive.MacroParseException; -import org.apache.velocity.util.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; -import org.apache.velocity.runtime.RuntimeConstants; + +import java.util.ArrayList; +import java.util.List; /** Token Manager. */ public class ParserTokenManager implements ParserConstants diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java index 3cb69e5da3ba..c97489d28ffd 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java @@ -19,10 +19,11 @@ * under the License. */ +import com.dotmarketing.exception.DotRuntimeException; +import com.dotmarketing.util.VelocityUtil; import java.io.IOException; import java.io.Writer; - -import com.dotcms.repackage.org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; @@ -36,9 +37,6 @@ import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.util.ExceptionUtils; -import com.dotmarketing.exception.DotRuntimeException; -import com.dotmarketing.util.VelocityUtil; - /** * This class is responsible for handling the pluggable * directives in VTL. diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java index 357ba87909ba..a4ccec5a884e 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java @@ -19,10 +19,11 @@ * under the License. */ +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.VelocityUtil; import java.lang.reflect.InvocationTargetException; - -import com.dotcms.repackage.org.apache.commons.lang.ArrayUtils; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.StringUtils; import org.apache.velocity.app.event.EventHandlerUtil; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; @@ -36,9 +37,6 @@ import org.apache.velocity.util.introspection.Info; import org.apache.velocity.util.introspection.VelMethod; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.VelocityUtil; - /** * ASTMethod.java * diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java index e7883ae9514a..dcf60ca9c964 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java @@ -17,11 +17,12 @@ * the License. */ +import com.dotmarketing.util.Logger; +import com.dotmarketing.util.VelocityUtil; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; - -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.VelocityException; @@ -31,9 +32,6 @@ import org.apache.velocity.runtime.parser.Parser; import org.apache.velocity.runtime.parser.Token; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.VelocityUtil; - /** * ASTStringLiteral support. Will interpolate! * diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/NodeUtils.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/NodeUtils.java index 61e90238c42b..52bcda93c066 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/NodeUtils.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/NodeUtils.java @@ -19,7 +19,7 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.context.Context; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.runtime.parser.ParserConstants; diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java index 121f610b8563..78a6d78756f7 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java @@ -19,14 +19,12 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.lang.reflect.InvocationTargetException; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.util.introspection.Introspector; -import com.dotmarketing.util.Logger; - /** * Returned the value of object property when executed. */ diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java index ce18aacb252f..0761d24b192c 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java @@ -19,15 +19,13 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.lang.reflect.InvocationTargetException; - -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.util.introspection.Introspector; -import com.dotmarketing.util.Logger; - /** * Executor for looking up property names in the passed in class * This will try to find a set<foo>(key, value) method diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java index 05dd17581009..c30614ebb461 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java @@ -19,17 +19,15 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.util.Collections; import java.util.Iterator; import java.util.Map; - -import com.dotcms.repackage.org.apache.commons.collections.map.LRUMap; +import org.apache.commons.collections.map.LRUMap; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.MapFactory; -import com.dotmarketing.util.Logger; - /** * Default implementation of the resource cache for the default * ResourceManager. The cache uses a least recently used (LRU) diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java index cdeebf5be53f..426aec59903f 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java @@ -19,13 +19,13 @@ * under the License. */ +import com.dotcms.rendering.velocity.services.DotResourceLoader; +import com.dotmarketing.util.Logger; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Vector; - -import com.dotcms.rendering.velocity.services.DotResourceLoader; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; @@ -36,8 +36,6 @@ import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.StringUtils; -import com.dotmarketing.util.Logger; - /** @@ -157,7 +155,7 @@ else if (loaderClass != null) Object cacheObject = null; - if (com.dotcms.repackage.org.apache.commons.lang.StringUtils.isNotEmpty(cacheClassName)) + if (org.apache.commons.lang.StringUtils.isNotEmpty(cacheClassName)) { try { @@ -531,7 +529,7 @@ protected Resource refreshResource(Resource resource, final String encoding) * this strikes me as bad... */ - if (!com.dotcms.repackage.org.apache.commons.lang.StringUtils.equals(resource.getEncoding(), encoding)) + if (!org.apache.commons.lang.StringUtils.equals(resource.getEncoding(), encoding)) { Logger.warn(this,"Declared encoding for template '" + resource.getName() + diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java index 94b77d6ef01f..93e4ca5dd3b4 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java @@ -19,17 +19,15 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.InputStream; - -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.lang.StringUtils; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.ExceptionUtils; -import com.dotmarketing.util.Logger; - /** * ClasspathResourceLoader is a simple loader that will load * templates from the classpath. diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java index 166b8a7fd0ea..4ed40aba878f 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java @@ -19,6 +19,7 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.BufferedInputStream; import java.io.InputStream; import java.sql.Connection; @@ -29,15 +30,13 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.sql.DataSource; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.util.ExceptionUtils; import org.apache.velocity.util.StringUtils; -import com.dotmarketing.util.Logger; - /** *

This is a simple template file loader that loads templates * from a DataSource instead of plain files. @@ -138,7 +137,7 @@ public class DataSourceResourceLoader extends ResourceLoader private DataSource dataSource; /** - * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties) + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(org.apache.commons.collections.ExtendedProperties) */ public void init(ExtendedProperties configuration) { @@ -220,7 +219,7 @@ public long getLastModified(final Resource resource) public synchronized InputStream getResourceStream(final String name) throws ResourceNotFoundException { - if (com.dotcms.repackage.org.apache.commons.lang.StringUtils.isEmpty(name)) + if (org.apache.commons.lang.StringUtils.isEmpty(name)) { throw new ResourceNotFoundException("DataSourceResourceLoader: Template name was empty or null"); } diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java index 1e37a5ea3af4..c05328005b6a 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java @@ -19,7 +19,6 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; import com.dotmarketing.util.Logger; import java.io.BufferedInputStream; import java.io.File; @@ -32,6 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.io.UnicodeInputStream; @@ -67,7 +67,7 @@ public class FileResourceLoader extends ResourceLoader private boolean unicode = false; /** - * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties) + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(org.apache.commons.collections.ExtendedProperties) */ public void init( ExtendedProperties configuration) { @@ -118,7 +118,7 @@ public InputStream getResourceStream(String templateName) /* * Make sure we have a valid templateName. */ - if (com.dotcms.repackage.org.apache.commons.lang.StringUtils.isEmpty(templateName)) + if (org.apache.commons.lang.StringUtils.isEmpty(templateName)) { /* * If we don't get a properly formed templateName then diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java index 3f9ff9440800..9df3a67d3abe 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java @@ -19,19 +19,16 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.InputStream; - +import java.util.HashMap; import java.util.Hashtable; -import java.util.Vector; import java.util.Map; -import java.util.HashMap; - -import org.apache.velocity.util.StringUtils; -import org.apache.velocity.runtime.resource.Resource; +import java.util.Vector; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; - -import com.dotmarketing.util.Logger; +import org.apache.velocity.runtime.resource.Resource; +import org.apache.velocity.util.StringUtils; /** *

@@ -197,7 +194,7 @@ public InputStream getResourceStream( String source ) { InputStream results = null; - if (com.dotcms.repackage.org.apache.commons.lang.StringUtils.isEmpty(source)) + if (org.apache.commons.lang.StringUtils.isEmpty(source)) { throw new ResourceNotFoundException("Need to have a resource!"); } diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java index d15e214aace3..5ada565b09a5 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java @@ -19,16 +19,14 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.io.InputStream; - +import org.apache.commons.collections.ExtendedProperties; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.ResourceCacheImpl; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.exception.VelocityException; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; - -import com.dotmarketing.util.Logger; /** * This is abstract class the all text resource loaders should diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java index 4e71f4e15655..a4055d386b29 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java @@ -19,14 +19,15 @@ * under the License. */ -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import com.dotmarketing.util.Logger; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.lang.StringUtils; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.resource.Resource; @@ -35,8 +36,6 @@ import org.apache.velocity.runtime.resource.util.StringResourceRepositoryImpl; import org.apache.velocity.util.ClassUtils; -import com.dotmarketing.util.Logger; - /** * Resource loader that works with Strings. Users should manually add * resources to the repository that is used by the resource loader instance. @@ -208,7 +207,7 @@ public static void clearRepositories() /** - * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties) + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(org.apache.commons.collections.ExtendedProperties) */ public void init(final ExtendedProperties configuration) { diff --git a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java index 59318bb4197f..b6ebecd29162 100644 --- a/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java +++ b/dotCMS/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java @@ -19,20 +19,19 @@ * under the License. */ -import java.io.InputStream; +import com.dotmarketing.util.Logger; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Method; import java.net.URL; import java.net.URLConnection; import java.util.HashMap; -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import org.apache.velocity.exception.VelocityException; +import org.apache.commons.collections.ExtendedProperties; +import org.apache.commons.lang.StringUtils; import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.resource.Resource; -import com.dotmarketing.util.Logger; - /** * This is a simple URL-based loader. * @@ -49,7 +48,7 @@ public class URLResourceLoader extends ResourceLoader private Method[] timeoutMethods; /** - * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties) + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(org.apache.commons.collections.ExtendedProperties) */ public void init(ExtendedProperties configuration) { diff --git a/dotCMS/src/main/java/org/apache/velocity/texen/ant/TexenTask.java b/dotCMS/src/main/java/org/apache/velocity/texen/ant/TexenTask.java index a6ee35c40a8f..5ffcde079f2f 100644 --- a/dotCMS/src/main/java/org/apache/velocity/texen/ant/TexenTask.java +++ b/dotCMS/src/main/java/org/apache/velocity/texen/ant/TexenTask.java @@ -19,7 +19,6 @@ * under the License. */ -import com.dotcms.repackage.org.apache.commons.collections.ExtendedProperties; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -28,6 +27,7 @@ import java.util.Date; import java.util.Iterator; import java.util.StringTokenizer; +import org.apache.commons.collections.ExtendedProperties; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java index 3d0f88fadc88..3d0fa931b679 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java @@ -16,7 +16,7 @@ package org.apache.velocity.tools.generic; -import com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringEscapeUtils; /** * Tool for working with escaping in Velocity templates. diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/generic/MathTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/generic/MathTool.java index 4754ec51fafc..9c9df8f80455 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/generic/MathTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/generic/MathTool.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.beanutils.PropertyUtils; /** *

Tool for performing math in Velocity.

diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/generic/SortTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/generic/SortTool.java index 6bf371672573..310787bb877b 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/generic/SortTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/generic/SortTool.java @@ -16,17 +16,15 @@ package org.apache.velocity.tools.generic; +import com.dotcms.rendering.velocity.viewtools.content.ContentMap; import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; -import com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils; - -import com.dotmarketing.portlets.structure.model.Field; -import com.dotcms.rendering.velocity.viewtools.content.ContentMap; +import org.apache.commons.beanutils.PropertyUtils; /** * SortTool allows a user to sort a collection (or array, iterator, etc) diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java index 5eda19470ba0..265ee8b4d000 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java @@ -21,10 +21,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import org.apache.velocity.tools.struts.StrutsUtils; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.util.MessageResources; /** *

View tool to work with the Struts action messages.

diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java index db5dd18cf4ce..4eb3ce01e844 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java @@ -17,7 +17,7 @@ package org.apache.velocity.tools.struts; -import com.dotcms.repackage.org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionErrors; /** *

View tool to work with the Struts error messages.

@@ -124,7 +124,7 @@ public String getMsgs(String property, String bundle) * Overrides {@link ActionMessagesTool#getGlobalName()} * to return the "global" key for action errors. * - * @see com.dotcms.repackage.org.apache.struts.action.ActionErrors.GLOBAL_ERROR + * @see org.apache.struts.action.ActionErrors.GLOBAL_ERROR * @deprecated This will be removed after VelocityTools 1.1. */ public String getGlobalName() diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/FormTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/FormTool.java index e7c944fedda6..94bd8ac43140 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/FormTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/FormTool.java @@ -19,14 +19,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javax.servlet.ServletContext; - -import com.dotcms.repackage.org.apache.struts.util.MessageResources; -import com.dotcms.repackage.org.apache.struts.action.*; - +import org.apache.struts.action.ActionForm; import org.apache.velocity.tools.view.context.ViewContext; import org.apache.velocity.tools.view.tools.ViewTool; -import com.dotcms.repackage.org.apache.struts.util.ModuleUtils; /** @@ -149,7 +144,7 @@ public String getName() */ public String getCancelName() { - return com.dotcms.repackage.org.apache.struts.taglib.html.Constants.CANCEL_PROPERTY; + return org.apache.struts.taglib.html.Constants.CANCEL_PROPERTY; } @@ -170,7 +165,7 @@ public String getToken() */ public String getTokenName() { - return com.dotcms.repackage.org.apache.struts.taglib.html.Constants.TOKEN_KEY; + return org.apache.struts.taglib.html.Constants.TOKEN_KEY; } } diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java index 467c5beaf993..f9e50d8ffad8 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java @@ -17,11 +17,11 @@ package org.apache.velocity.tools.struts; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; +import org.apache.struts.util.MessageResources; import org.apache.velocity.tools.view.context.ViewContext; import org.apache.velocity.tools.view.tools.ViewTool; diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageTool.java index 2ee35a022fea..d1a7353d4d73 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/MessageTool.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Locale; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; +import org.apache.struts.util.MessageResources; /** *

View tool that provides methods to render Struts diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/SecureLinkTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/SecureLinkTool.java index 8ab4b119f727..8f0c449c6537 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/SecureLinkTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/SecureLinkTool.java @@ -19,14 +19,10 @@ import java.util.Iterator; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; - +import org.apache.struts.action.SecurePlugInInterface; +import org.apache.struts.config.ModuleConfig; +import org.apache.struts.config.SecureActionConfig; import org.apache.velocity.tools.view.tools.LinkTool; -import org.apache.velocity.tools.struts.StrutsUtils; - -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; -import com.dotcms.repackage.org.apache.struts.config.SecureActionConfig; -import com.dotcms.repackage.org.apache.struts.action.SecurePlugInInterface; -import com.dotcms.repackage.org.apache.struts.Globals; /** * Tool to be able to use Struts SSL Extensions with Velocity. diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/StrutsUtils.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/StrutsUtils.java index e953af9cdf7b..8cd3b4444efa 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/StrutsUtils.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/StrutsUtils.java @@ -16,26 +16,23 @@ package org.apache.velocity.tools.struts; -import java.util.Locale; +import com.dotmarketing.util.WebKeys; import java.util.Iterator; - +import java.util.Locale; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.action.ActionForm; -import com.dotcms.repackage.org.apache.struts.action.ActionMessage; -import com.dotcms.repackage.org.apache.struts.action.ActionMessages; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; -import com.dotcms.repackage.org.apache.struts.config.ForwardConfig; -import com.dotcms.repackage.org.apache.struts.config.ActionConfig; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; -import com.dotcms.repackage.org.apache.struts.util.RequestUtils; -import com.dotcms.repackage.org.apache.struts.taglib.TagUtils; -import com.dotcms.repackage.org.apache.struts.util.ModuleUtils; - -import com.dotmarketing.util.WebKeys; +import org.apache.struts.Globals; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.config.ActionConfig; +import org.apache.struts.config.ForwardConfig; +import org.apache.struts.config.ModuleConfig; +import org.apache.struts.taglib.TagUtils; +import org.apache.struts.util.MessageResources; +import org.apache.struts.util.ModuleUtils; +import org.apache.struts.util.RequestUtils; /** *

A utility class to expose the Struts shared diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/TilesTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/TilesTool.java index 388d01f3521f..3a080f22e2f5 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/TilesTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/TilesTool.java @@ -16,27 +16,22 @@ package org.apache.velocity.tools.struts; -import java.util.Stack; -import java.util.Map; +import com.dotmarketing.util.Config; import java.util.Iterator; - +import java.util.Map; +import java.util.Stack; import javax.servlet.http.HttpSession; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import com.dotcms.repackage.org.apache.struts.tiles.ComponentContext; -import com.dotcms.repackage.org.apache.struts.tiles.ComponentDefinition; -import com.dotcms.repackage.org.apache.struts.tiles.AttributeDefinition; -import com.dotcms.repackage.org.apache.struts.tiles.DirectStringAttribute; -import com.dotcms.repackage.org.apache.struts.tiles.DefinitionAttribute; -import com.dotcms.repackage.org.apache.struts.tiles.DefinitionNameAttribute; -import com.dotcms.repackage.org.apache.struts.tiles.PathAttribute; -import com.dotcms.repackage.org.apache.struts.tiles.TilesUtil; -import com.dotcms.repackage.org.apache.struts.tiles.DefinitionsFactoryException; -import com.dotcms.repackage.org.apache.struts.tiles.Controller; -import com.dotmarketing.util.Config; - +import org.apache.struts.tiles.AttributeDefinition; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.ComponentDefinition; +import org.apache.struts.tiles.Controller; +import org.apache.struts.tiles.DefinitionAttribute; +import org.apache.struts.tiles.DefinitionNameAttribute; +import org.apache.struts.tiles.DefinitionsFactoryException; +import org.apache.struts.tiles.DirectStringAttribute; +import org.apache.struts.tiles.TilesUtil; import org.apache.velocity.context.Context; import org.apache.velocity.tools.view.ImportSupport; import org.apache.velocity.tools.view.context.ViewContext; diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java index 7b23f9cda6e4..37d69e5929cd 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java @@ -17,35 +17,29 @@ package org.apache.velocity.tools.struts; import java.util.ArrayList; -import java.util.Comparator; import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; - import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; - -import com.dotcms.repackage.org.apache.commons.validator.Field; -import com.dotcms.repackage.org.apache.commons.validator.Form; -import com.dotcms.repackage.org.apache.commons.validator.ValidatorAction; -import com.dotcms.repackage.org.apache.commons.validator.ValidatorResources; -import com.dotcms.repackage.org.apache.commons.validator.util.ValidatorUtils; -import com.dotcms.repackage.org.apache.commons.validator.Var; - -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.config.ActionConfig; -import com.dotcms.repackage.org.apache.struts.config.ModuleConfig; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; -import com.dotcms.repackage.org.apache.struts.util.ModuleUtils; -import com.dotcms.repackage.org.apache.struts.validator.Resources; -import com.dotcms.repackage.org.apache.struts.validator.ValidatorPlugIn; - +import org.apache.commons.validator.Field; +import org.apache.commons.validator.Form; +import org.apache.commons.validator.ValidatorAction; +import org.apache.commons.validator.ValidatorResources; +import org.apache.commons.validator.Var; +import org.apache.struts.Globals; +import org.apache.struts.config.ActionConfig; +import org.apache.struts.config.ModuleConfig; +import org.apache.struts.util.MessageResources; +import org.apache.struts.util.ModuleUtils; +import org.apache.struts.validator.Resources; +import org.apache.struts.validator.ValidatorPlugIn; import org.apache.velocity.tools.view.context.ViewContext; import org.apache.velocity.tools.view.tools.ViewTool; -import java.util.StringTokenizer; /** *

View tool that works with Struts Validator to diff --git a/dotCMS/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java b/dotCMS/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java index 17cd3e73e8ba..fb0d4865b42f 100644 --- a/dotCMS/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java +++ b/dotCMS/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java @@ -21,14 +21,12 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.velocity.tools.view.context.ViewContext; -import org.apache.velocity.tools.view.tools.ViewTool; /** * View tool to make building URIs pleasant and fun! @@ -91,7 +89,7 @@ public class LinkTool implements ViewTool, Cloneable private static Method encode = null; /* Initialize the encode variable with the 1.4 method if available. - * this code was adapted from com.dotcms.repackage.org.apache.struts.utils.RequestUtils */ + * this code was adapted from org.apache.struts.utils.RequestUtils */ static { try diff --git a/dotCMS/src/main/java/org/apache/velocity/util/introspection/ClassMap.java b/dotCMS/src/main/java/org/apache/velocity/util/introspection/ClassMap.java index 6edb80b031d9..9d8aca7d478c 100644 --- a/dotCMS/src/main/java/org/apache/velocity/util/introspection/ClassMap.java +++ b/dotCMS/src/main/java/org/apache/velocity/util/introspection/ClassMap.java @@ -19,15 +19,14 @@ * under the License. */ +import com.dotmarketing.util.Logger; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.Map; -import com.dotcms.repackage.org.apache.commons.lang.text.StrBuilder; +import org.apache.commons.lang.text.StrBuilder; import org.apache.velocity.util.MapFactory; -import com.dotmarketing.util.Logger; - /** * A cache of introspection information for a specific class instance. * Keys {@link java.lang.reflect.Method} objects by a concatenation of the diff --git a/dotCMS/src/main/resources/stxx.properties b/dotCMS/src/main/resources/stxx.properties index fd87de39628a..8aab694fdfa0 100644 --- a/dotCMS/src/main/resources/stxx.properties +++ b/dotCMS/src/main/resources/stxx.properties @@ -57,9 +57,9 @@ stxx.useCSVParameterFormat=false # This particular transformer, CachedXSLTransformer, uses a custom property named # "mimeType" that is used to set the mime type of the transformation. -stxx.transformer.xml.class=com.dotcms.repackage.com.oroad.stxx.transform.CachedXSLTransformer +stxx.transformer.xml.class=com.oroad.stxx.transform.CachedXSLTransformer stxx.transformer.xml.mimeType=text/xml -stxx.transformer.html.class=com.dotcms.repackage.com.oroad.stxx.transform.CachedXSLTransformer +stxx.transformer.html.class=com.oroad.stxx.transform.CachedXSLTransformer stxx.transformer.html.mimeType=text/html stxx.transformer.html.allowRenderParameter=true stxx.transformer.html.autoReloadTemplates=true @@ -68,22 +68,22 @@ stxx.transformer.html.cache.name=HTML Templates stxx.transformer.html.cache.size=0 # You can uncomment the next lines to add support for FOP. Make sure you have the necessary jars. -#stxx.transformer.pdf.class=com.dotcms.repackage.com.oroad.stxx.transform.CachedFOPTransformer +#stxx.transformer.pdf.class=com.oroad.stxx.transform.CachedFOPTransformer #stxx.transformer.pdf.outputType=pdf -#stxx.transformer.svg.class=com.dotcms.repackage.com.oroad.stxx.transform.CachedFOPTransformer +#stxx.transformer.svg.class=com.oroad.stxx.transform.CachedFOPTransformer #stxx.transformer.svg.outputType=svg # Uncomment this line to add support for Velocity -#stxx.transformer.velocity.class=com.dotcms.repackage.com.oroad.stxx.transform.VelocityTransformer +#stxx.transformer.velocity.class=com.oroad.stxx.transform.VelocityTransformer #stxx.transformer.velocity.mimeType=text/html #stxx.transformer.velocity.encoding=ISO-8859-1 # Uncomment these lines to add support for XForms -#stxx.transformer.xform.class=com.dotcms.repackage.com.oroad.stxx.transform.CachedXFormTransformer +#stxx.transformer.xform.class=com.oroad.stxx.transform.CachedXFormTransformer #stxx.transformer.xform.mimeType=text/html # Uncomment these lines to add support for DOM writing (JSP support) -#stxx.transformer.dom.class=com.dotcms.repackage.com.oroad.stxx.transform.DOMWriteTransformer +#stxx.transformer.dom.class=com.oroad.stxx.transform.DOMWriteTransformer #stxx.transformer.dom.attributeName=stxxXML #stxx.transformer.dom.scope=request @@ -92,7 +92,7 @@ stxx.transformer.html.cache.size=0 # These are the default cache values. # # The name of the class implementing a cache -stxx.default.cache.class=com.dotcms.repackage.com.oroad.stxx.cache.SimpleCacheImpl +stxx.default.cache.class=com.oroad.stxx.cache.SimpleCacheImpl # The maximum number of elements allowed in the cache stxx.default.cache.size=10 @@ -110,9 +110,9 @@ stxx.default.cache.expiryTime=0 # UserAgentSelector which will try to match the browser type to choose the appropriate # stylesheet customized for the browser type. To specify a selector, uncomment # one of the following lines, then follow the instructions to configure the selector: -stxx.transformSelector.class=com.dotcms.repackage.com.oroad.stxx.util.UserAgentSelector -#stxx.transformSelector.class=com.dotcms.repackage.com.oroad.stxx.util.UserAgentRegexpSelector -#stxx.transformSelector.class=com.dotcms.repackage.com.oroad.stxx.util.RequestAttributeSelector +stxx.transformSelector.class=com.oroad.stxx.util.UserAgentSelector +#stxx.transformSelector.class=com.oroad.stxx.util.UserAgentRegexpSelector +#stxx.transformSelector.class=com.oroad.stxx.util.RequestAttributeSelector # # UserAgentSelector: # The strings to match should be comma-delimited with double quotes around them. Make @@ -149,7 +149,7 @@ stxx.userAgent.MSIE="MSIE 6.0","MSIE 5.0" # override the serializeRequestAttribute method. # # This setting determines which class will be used for SAX serialization: -#stxx.serialize.sax.class=com.dotcms.repackage.com.oroad.stxx.transform.document.DefaultSAXSerializer +#stxx.serialize.sax.class=com.oroad.stxx.transform.document.DefaultSAXSerializer # # The serializer can optionally have custom options defined accessible to the # serializer upon initialiation. Custom options are defined in the following format: @@ -160,10 +160,10 @@ stxx.userAgent.MSIE="MSIE 6.0","MSIE 5.0" # XML attachment configurations # # To determine which information will be attached to the XML, stxx uses a -# com.dotcms.repackage.com.oroad.stxx.transform.document.BuilderRules implementation. The default +# com.oroad.stxx.transform.document.BuilderRules implementation. The default # implementation uses the following properties. To override the implementation, # uncomment this line and add the name of your implementing class -#stxx.attach.rulesClass=com.dotcms.repackage.com.oroad.stxx.transform.document.BuilderRulesImpl +#stxx.attach.rulesClass=com.oroad.stxx.transform.document.BuilderRulesImpl # # These allow you to have more control over what extra information is serialized # and added to your XML document before transformation. For a given information diff --git a/dotCMS/src/main/resources/system.properties b/dotCMS/src/main/resources/system.properties index f1c5795a73f4..8051c856f636 100644 --- a/dotCMS/src/main/resources/system.properties +++ b/dotCMS/src/main/resources/system.properties @@ -85,7 +85,7 @@ hibernate.jdbc.batch_size=0 hibernate.jdbc.use_scrollable_resultset=true hibernate.cglib.use_reflection_optimizer=false - #hibernate.cache.provider_class=com.dotcms.repackage.net.sf.hibernate.cache.HashtableCacheProvider + #hibernate.cache.provider_class=net.sf.hibernate.cache.HashtableCacheProvider hibernate.cache.provider_class=com.dotmarketing.db.NoCacheProvider hibernate.show_sql=false diff --git a/dotCMS/src/main/webapp/WEB-INF/jsp/rules/include.jsp b/dotCMS/src/main/webapp/WEB-INF/jsp/rules/include.jsp index 3ca3e147607c..0a4c6cfd7d7a 100644 --- a/dotCMS/src/main/webapp/WEB-INF/jsp/rules/include.jsp +++ b/dotCMS/src/main/webapp/WEB-INF/jsp/rules/include.jsp @@ -2,7 +2,7 @@ <%@page import="com.dotcms.enterprise.license.LicenseLevel"%> <%@ page import="com.dotmarketing.util.Config" %> <%@page import="com.dotmarketing.business.APILocator"%> -<%@page import="com.dotcms.repackage.org.apache.struts.Globals"%> +<%@page import="org.apache.struts.Globals"%> <%@ page import="com.dotmarketing.util.PortletURLUtil" %> <%@ include file="/html/common/init.jsp" %> diff --git a/dotCMS/src/main/webapp/WEB-INF/jsp/rules/render.jsp b/dotCMS/src/main/webapp/WEB-INF/jsp/rules/render.jsp index 1361bda7122f..725f3c1fb555 100644 --- a/dotCMS/src/main/webapp/WEB-INF/jsp/rules/render.jsp +++ b/dotCMS/src/main/webapp/WEB-INF/jsp/rules/render.jsp @@ -1,7 +1,7 @@ <%@page import="com.dotcms.enterprise.LicenseUtil"%> <%@page import="com.dotcms.enterprise.license.LicenseLevel"%> <%@page import="com.dotmarketing.business.APILocator"%> -<%@page import="com.dotcms.repackage.org.apache.struts.Globals"%> +<%@page import="org.apache.struts.Globals"%> <%@ page import="com.dotmarketing.util.*" %> <%@ include file="/html/common/init.jsp" %> diff --git a/dotCMS/src/main/webapp/WEB-INF/jsp/tag_manager/tag_manager.jsp b/dotCMS/src/main/webapp/WEB-INF/jsp/tag_manager/tag_manager.jsp index cac53643be9e..9bba12703458 100644 --- a/dotCMS/src/main/webapp/WEB-INF/jsp/tag_manager/tag_manager.jsp +++ b/dotCMS/src/main/webapp/WEB-INF/jsp/tag_manager/tag_manager.jsp @@ -33,8 +33,8 @@ <%@page import="java.lang.Exception"%> -<%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionForm"%> -<%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionMapping"%> +<%@ page import="org.apache.struts.action.ActionForm"%> +<%@ page import="org.apache.struts.action.ActionMapping"%> diff --git a/dotCMS/src/main/webapp/WEB-INF/struts-config.xml b/dotCMS/src/main/webapp/WEB-INF/struts-config.xml index 54b7da71f131..e45a68bfdb0b 100644 --- a/dotCMS/src/main/webapp/WEB-INF/struts-config.xml +++ b/dotCMS/src/main/webapp/WEB-INF/struts-config.xml @@ -1016,14 +1016,14 @@ - + - + diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-html.tld b/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-html.tld index 51932561469a..b8be00e3f726 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-html.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-html.tld @@ -14,7 +14,7 @@ http://struts.apache.org/tags-html base -com.dotcms.repackage.org.apache.struts.taglib.html.BaseTag +org.apache.struts.taglib.html.BaseTag empty target @@ -29,7 +29,7 @@ button -com.dotcms.repackage.org.apache.struts.taglib.html.ButtonTag +org.apache.struts.taglib.html.ButtonTag accesskey false @@ -163,7 +163,7 @@ cancel -com.dotcms.repackage.org.apache.struts.taglib.html.CancelTag +org.apache.struts.taglib.html.CancelTag accesskey false @@ -292,7 +292,7 @@ checkbox -com.dotcms.repackage.org.apache.struts.taglib.html.CheckboxTag +org.apache.struts.taglib.html.CheckboxTag accesskey false @@ -431,7 +431,7 @@ errors -com.dotcms.repackage.org.apache.struts.taglib.html.ErrorsTag +org.apache.struts.taglib.html.ErrorsTag empty bundle @@ -456,7 +456,7 @@ file -com.dotcms.repackage.org.apache.struts.taglib.html.FileTag +org.apache.struts.taglib.html.FileTag accesskey false @@ -610,7 +610,7 @@ form -com.dotcms.repackage.org.apache.struts.taglib.html.FormTag +org.apache.struts.taglib.html.FormTag JSP action @@ -680,7 +680,7 @@ frame -com.dotcms.repackage.org.apache.struts.taglib.html.FrameTag +org.apache.struts.taglib.html.FrameTag action false @@ -814,7 +814,7 @@ hidden -com.dotcms.repackage.org.apache.struts.taglib.html.HiddenTag +org.apache.struts.taglib.html.HiddenTag empty accesskey @@ -954,7 +954,7 @@ html -com.dotcms.repackage.org.apache.struts.taglib.html.HtmlTag +org.apache.struts.taglib.html.HtmlTag JSP lang @@ -974,7 +974,7 @@ image -com.dotcms.repackage.org.apache.struts.taglib.html.ImageTag +org.apache.struts.taglib.html.ImageTag accesskey false @@ -1148,7 +1148,7 @@ img -com.dotcms.repackage.org.apache.struts.taglib.html.ImgTag +org.apache.struts.taglib.html.ImgTag empty align @@ -1373,7 +1373,7 @@ javascript -com.dotcms.repackage.org.apache.struts.taglib.html.JavascriptValidatorTag +org.apache.struts.taglib.html.JavascriptValidatorTag empty cdata @@ -1423,7 +1423,7 @@ link -com.dotcms.repackage.org.apache.struts.taglib.html.LinkTag +org.apache.struts.taglib.html.LinkTag accesskey false @@ -1617,8 +1617,8 @@ messages -com.dotcms.repackage.org.apache.struts.taglib.html.MessagesTag -com.dotcms.repackage.org.apache.struts.taglib.html.MessagesTei +org.apache.struts.taglib.html.MessagesTag +org.apache.struts.taglib.html.MessagesTei JSP id @@ -1663,7 +1663,7 @@ multibox -com.dotcms.repackage.org.apache.struts.taglib.html.MultiboxTag +org.apache.struts.taglib.html.MultiboxTag accesskey false @@ -1797,7 +1797,7 @@ option -com.dotcms.repackage.org.apache.struts.taglib.html.OptionTag +org.apache.struts.taglib.html.OptionTag bundle false @@ -1841,7 +1841,7 @@ options -com.dotcms.repackage.org.apache.struts.taglib.html.OptionsTag +org.apache.struts.taglib.html.OptionsTag empty collection @@ -1886,7 +1886,7 @@ optionsCollection -com.dotcms.repackage.org.apache.struts.taglib.html.OptionsCollectionTag +org.apache.struts.taglib.html.OptionsCollectionTag empty filter @@ -1926,7 +1926,7 @@ password -com.dotcms.repackage.org.apache.struts.taglib.html.PasswordTag +org.apache.struts.taglib.html.PasswordTag accesskey false @@ -2085,7 +2085,7 @@ radio -com.dotcms.repackage.org.apache.struts.taglib.html.RadioTag +org.apache.struts.taglib.html.RadioTag accesskey false @@ -2229,7 +2229,7 @@ reset -com.dotcms.repackage.org.apache.struts.taglib.html.ResetTag +org.apache.struts.taglib.html.ResetTag accesskey false @@ -2358,7 +2358,7 @@ rewrite -com.dotcms.repackage.org.apache.struts.taglib.html.RewriteTag +org.apache.struts.taglib.html.RewriteTag empty action @@ -2438,7 +2438,7 @@ select -com.dotcms.repackage.org.apache.struts.taglib.html.SelectTag +org.apache.struts.taglib.html.SelectTag JSP alt @@ -2583,7 +2583,7 @@ submit -com.dotcms.repackage.org.apache.struts.taglib.html.SubmitTag +org.apache.struts.taglib.html.SubmitTag accesskey false @@ -2717,7 +2717,7 @@ text -com.dotcms.repackage.org.apache.struts.taglib.html.TextTag +org.apache.struts.taglib.html.TextTag accesskey false @@ -2871,7 +2871,7 @@ textarea -com.dotcms.repackage.org.apache.struts.taglib.html.TextareaTag +org.apache.struts.taglib.html.TextareaTag accesskey false @@ -3025,7 +3025,7 @@ xhtml -com.dotcms.repackage.org.apache.struts.taglib.html.XhtmlTag +org.apache.struts.taglib.html.XhtmlTag empty diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-logic.tld b/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-logic.tld index 6d1a8e270e8f..f267fcc91778 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-logic.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-logic.tld @@ -13,7 +13,7 @@ http://struts.apache.org/tags-logic empty -com.dotcms.repackage.org.apache.struts.taglib.logic.EmptyTag +org.apache.struts.taglib.logic.EmptyTag JSP name @@ -33,7 +33,7 @@ equal -com.dotcms.repackage.org.apache.struts.taglib.logic.EqualTag +org.apache.struts.taglib.logic.EqualTag JSP cookie @@ -73,7 +73,7 @@ forward -com.dotcms.repackage.org.apache.struts.taglib.logic.ForwardTag +org.apache.struts.taglib.logic.ForwardTag empty name @@ -83,7 +83,7 @@ greaterEqual -com.dotcms.repackage.org.apache.struts.taglib.logic.GreaterEqualTag +org.apache.struts.taglib.logic.GreaterEqualTag JSP cookie @@ -123,7 +123,7 @@ greaterThan -com.dotcms.repackage.org.apache.struts.taglib.logic.GreaterThanTag +org.apache.struts.taglib.logic.GreaterThanTag JSP cookie @@ -163,8 +163,8 @@ iterate -com.dotcms.repackage.org.apache.struts.taglib.logic.IterateTag -com.dotcms.repackage.org.apache.struts.taglib.logic.IterateTei +org.apache.struts.taglib.logic.IterateTag +org.apache.struts.taglib.logic.IterateTei JSP collection @@ -214,7 +214,7 @@ lessEqual -com.dotcms.repackage.org.apache.struts.taglib.logic.LessEqualTag +org.apache.struts.taglib.logic.LessEqualTag JSP cookie @@ -254,7 +254,7 @@ lessThan -com.dotcms.repackage.org.apache.struts.taglib.logic.LessThanTag +org.apache.struts.taglib.logic.LessThanTag JSP cookie @@ -294,7 +294,7 @@ match -com.dotcms.repackage.org.apache.struts.taglib.logic.MatchTag +org.apache.struts.taglib.logic.MatchTag JSP cookie @@ -339,7 +339,7 @@ messagesNotPresent -com.dotcms.repackage.org.apache.struts.taglib.logic.MessagesNotPresentTag +org.apache.struts.taglib.logic.MessagesNotPresentTag JSP name @@ -359,7 +359,7 @@ messagesPresent -com.dotcms.repackage.org.apache.struts.taglib.logic.MessagesPresentTag +org.apache.struts.taglib.logic.MessagesPresentTag JSP name @@ -379,7 +379,7 @@ notEmpty -com.dotcms.repackage.org.apache.struts.taglib.logic.NotEmptyTag +org.apache.struts.taglib.logic.NotEmptyTag JSP name @@ -399,7 +399,7 @@ notEqual -com.dotcms.repackage.org.apache.struts.taglib.logic.NotEqualTag +org.apache.struts.taglib.logic.NotEqualTag JSP cookie @@ -439,7 +439,7 @@ notMatch -com.dotcms.repackage.org.apache.struts.taglib.logic.NotMatchTag +org.apache.struts.taglib.logic.NotMatchTag JSP cookie @@ -484,7 +484,7 @@ notPresent -com.dotcms.repackage.org.apache.struts.taglib.logic.NotPresentTag +org.apache.struts.taglib.logic.NotPresentTag JSP cookie @@ -529,7 +529,7 @@ present -com.dotcms.repackage.org.apache.struts.taglib.logic.PresentTag +org.apache.struts.taglib.logic.PresentTag JSP cookie @@ -574,7 +574,7 @@ redirect -com.dotcms.repackage.org.apache.struts.taglib.logic.RedirectTag +org.apache.struts.taglib.logic.RedirectTag action false diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-nested.tld b/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-nested.tld index e7327d641506..08edaa9b4b15 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-nested.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/old/struts-nested.tld @@ -13,7 +13,7 @@ http://struts.apache.org/tags-nested nest -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedPropertyTag +org.apache.struts.taglib.nested.NestedPropertyTag JSP property @@ -23,8 +23,8 @@ writeNesting -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedWriteNestingTag -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedWriteNestingTei +org.apache.struts.taglib.nested.NestedWriteNestingTag +org.apache.struts.taglib.nested.NestedWriteNestingTei JSP property @@ -44,7 +44,7 @@ root -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedRootTag +org.apache.struts.taglib.nested.NestedRootTag JSP name @@ -54,8 +54,8 @@ define -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedDefineTag -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedDefineTei +org.apache.struts.taglib.nested.bean.NestedDefineTag +org.apache.struts.taglib.nested.bean.NestedDefineTei empty id @@ -95,7 +95,7 @@ message -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedMessageTag +org.apache.struts.taglib.nested.bean.NestedMessageTag empty arg0 @@ -155,8 +155,8 @@ size -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedSizeTag -com.dotcms.repackage.org.apache.struts.taglib.bean.SizeTei +org.apache.struts.taglib.nested.bean.NestedSizeTag +org.apache.struts.taglib.bean.SizeTei empty collection @@ -186,7 +186,7 @@ write -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedWriteTag +org.apache.struts.taglib.nested.bean.NestedWriteTag empty bundle @@ -236,7 +236,7 @@ checkbox -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedCheckboxTag +org.apache.struts.taglib.nested.html.NestedCheckboxTag accesskey false @@ -375,7 +375,7 @@ errors -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedErrorsTag +org.apache.struts.taglib.nested.html.NestedErrorsTag empty bundle @@ -400,7 +400,7 @@ file -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedFileTag +org.apache.struts.taglib.nested.html.NestedFileTag accesskey false @@ -554,7 +554,7 @@ form -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedFormTag +org.apache.struts.taglib.nested.html.NestedFormTag JSP action @@ -609,7 +609,7 @@ hidden -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedHiddenTag +org.apache.struts.taglib.nested.html.NestedHiddenTag alt false @@ -668,7 +668,7 @@ image -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedImageTag +org.apache.struts.taglib.nested.html.NestedImageTag accesskey false @@ -837,7 +837,7 @@ img -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedImgTag +org.apache.struts.taglib.nested.html.NestedImgTag empty accesskey @@ -1012,7 +1012,7 @@ link -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedLinkTag +org.apache.struts.taglib.nested.html.NestedLinkTag accesskey false @@ -1196,8 +1196,8 @@ messages -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedMessagesTag -com.dotcms.repackage.org.apache.struts.taglib.html.MessagesTei +org.apache.struts.taglib.nested.html.NestedMessagesTag +org.apache.struts.taglib.html.MessagesTei JSP id @@ -1242,7 +1242,7 @@ multibox -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedMultiboxTag +org.apache.struts.taglib.nested.html.NestedMultiboxTag accesskey false @@ -1376,7 +1376,7 @@ options -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedOptionsTag +org.apache.struts.taglib.nested.html.NestedOptionsTag empty collection @@ -1421,7 +1421,7 @@ optionsCollection -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag +org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag empty filter @@ -1461,7 +1461,7 @@ password -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedPasswordTag +org.apache.struts.taglib.nested.html.NestedPasswordTag accesskey false @@ -1620,7 +1620,7 @@ radio -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedRadioTag +org.apache.struts.taglib.nested.html.NestedRadioTag accesskey false @@ -1739,7 +1739,7 @@ select -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedSelectTag +org.apache.struts.taglib.nested.html.NestedSelectTag JSP accesskey @@ -1889,7 +1889,7 @@ submit -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedSubmitTag +org.apache.struts.taglib.nested.html.NestedSubmitTag accesskey false @@ -2023,7 +2023,7 @@ text -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedTextTag +org.apache.struts.taglib.nested.html.NestedTextTag accesskey false @@ -2177,7 +2177,7 @@ textarea -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedTextareaTag +org.apache.struts.taglib.nested.html.NestedTextareaTag accesskey false @@ -2331,7 +2331,7 @@ empty -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedEmptyTag +org.apache.struts.taglib.nested.logic.NestedEmptyTag JSP name @@ -2351,7 +2351,7 @@ equal -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedEqualTag +org.apache.struts.taglib.nested.logic.NestedEqualTag JSP cookie @@ -2391,7 +2391,7 @@ greaterEqual -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedGreaterEqualTag +org.apache.struts.taglib.nested.logic.NestedGreaterEqualTag JSP cookie @@ -2431,7 +2431,7 @@ greaterThan -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedGreaterThanTag +org.apache.struts.taglib.nested.logic.NestedGreaterThanTag JSP cookie @@ -2471,8 +2471,8 @@ iterate -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedIterateTag -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedIterateTei +org.apache.struts.taglib.nested.logic.NestedIterateTag +org.apache.struts.taglib.nested.logic.NestedIterateTei JSP collection @@ -2522,7 +2522,7 @@ lessEqual -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedLessEqualTag +org.apache.struts.taglib.nested.logic.NestedLessEqualTag JSP cookie @@ -2562,7 +2562,7 @@ lessThan -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedLessThanTag +org.apache.struts.taglib.nested.logic.NestedLessThanTag JSP cookie @@ -2602,7 +2602,7 @@ match -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedMatchTag +org.apache.struts.taglib.nested.logic.NestedMatchTag JSP cookie @@ -2647,7 +2647,7 @@ messagesNotPresent -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedMessagesNotPresentTag +org.apache.struts.taglib.nested.logic.NestedMessagesNotPresentTag JSP name @@ -2667,7 +2667,7 @@ messagesPresent -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedMessagesPresentTag +org.apache.struts.taglib.nested.logic.NestedMessagesPresentTag JSP name @@ -2687,7 +2687,7 @@ notEmpty -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotEmptyTag +org.apache.struts.taglib.nested.logic.NestedNotEmptyTag JSP name @@ -2707,7 +2707,7 @@ notEqual -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotEqualTag +org.apache.struts.taglib.nested.logic.NestedNotEqualTag JSP cookie @@ -2747,7 +2747,7 @@ notMatch -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotMatchTag +org.apache.struts.taglib.nested.logic.NestedNotMatchTag JSP cookie @@ -2792,7 +2792,7 @@ notPresent -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotPresentTag +org.apache.struts.taglib.nested.logic.NestedNotPresentTag JSP cookie @@ -2837,7 +2837,7 @@ present -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedPresentTag +org.apache.struts.taglib.nested.logic.NestedPresentTag JSP cookie diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/struts-html.tld b/dotCMS/src/main/webapp/WEB-INF/tld/struts-html.tld index 51932561469a..b8be00e3f726 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/struts-html.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/struts-html.tld @@ -14,7 +14,7 @@ http://struts.apache.org/tags-html base -com.dotcms.repackage.org.apache.struts.taglib.html.BaseTag +org.apache.struts.taglib.html.BaseTag empty target @@ -29,7 +29,7 @@ button -com.dotcms.repackage.org.apache.struts.taglib.html.ButtonTag +org.apache.struts.taglib.html.ButtonTag accesskey false @@ -163,7 +163,7 @@ cancel -com.dotcms.repackage.org.apache.struts.taglib.html.CancelTag +org.apache.struts.taglib.html.CancelTag accesskey false @@ -292,7 +292,7 @@ checkbox -com.dotcms.repackage.org.apache.struts.taglib.html.CheckboxTag +org.apache.struts.taglib.html.CheckboxTag accesskey false @@ -431,7 +431,7 @@ errors -com.dotcms.repackage.org.apache.struts.taglib.html.ErrorsTag +org.apache.struts.taglib.html.ErrorsTag empty bundle @@ -456,7 +456,7 @@ file -com.dotcms.repackage.org.apache.struts.taglib.html.FileTag +org.apache.struts.taglib.html.FileTag accesskey false @@ -610,7 +610,7 @@ form -com.dotcms.repackage.org.apache.struts.taglib.html.FormTag +org.apache.struts.taglib.html.FormTag JSP action @@ -680,7 +680,7 @@ frame -com.dotcms.repackage.org.apache.struts.taglib.html.FrameTag +org.apache.struts.taglib.html.FrameTag action false @@ -814,7 +814,7 @@ hidden -com.dotcms.repackage.org.apache.struts.taglib.html.HiddenTag +org.apache.struts.taglib.html.HiddenTag empty accesskey @@ -954,7 +954,7 @@ html -com.dotcms.repackage.org.apache.struts.taglib.html.HtmlTag +org.apache.struts.taglib.html.HtmlTag JSP lang @@ -974,7 +974,7 @@ image -com.dotcms.repackage.org.apache.struts.taglib.html.ImageTag +org.apache.struts.taglib.html.ImageTag accesskey false @@ -1148,7 +1148,7 @@ img -com.dotcms.repackage.org.apache.struts.taglib.html.ImgTag +org.apache.struts.taglib.html.ImgTag empty align @@ -1373,7 +1373,7 @@ javascript -com.dotcms.repackage.org.apache.struts.taglib.html.JavascriptValidatorTag +org.apache.struts.taglib.html.JavascriptValidatorTag empty cdata @@ -1423,7 +1423,7 @@ link -com.dotcms.repackage.org.apache.struts.taglib.html.LinkTag +org.apache.struts.taglib.html.LinkTag accesskey false @@ -1617,8 +1617,8 @@ messages -com.dotcms.repackage.org.apache.struts.taglib.html.MessagesTag -com.dotcms.repackage.org.apache.struts.taglib.html.MessagesTei +org.apache.struts.taglib.html.MessagesTag +org.apache.struts.taglib.html.MessagesTei JSP id @@ -1663,7 +1663,7 @@ multibox -com.dotcms.repackage.org.apache.struts.taglib.html.MultiboxTag +org.apache.struts.taglib.html.MultiboxTag accesskey false @@ -1797,7 +1797,7 @@ option -com.dotcms.repackage.org.apache.struts.taglib.html.OptionTag +org.apache.struts.taglib.html.OptionTag bundle false @@ -1841,7 +1841,7 @@ options -com.dotcms.repackage.org.apache.struts.taglib.html.OptionsTag +org.apache.struts.taglib.html.OptionsTag empty collection @@ -1886,7 +1886,7 @@ optionsCollection -com.dotcms.repackage.org.apache.struts.taglib.html.OptionsCollectionTag +org.apache.struts.taglib.html.OptionsCollectionTag empty filter @@ -1926,7 +1926,7 @@ password -com.dotcms.repackage.org.apache.struts.taglib.html.PasswordTag +org.apache.struts.taglib.html.PasswordTag accesskey false @@ -2085,7 +2085,7 @@ radio -com.dotcms.repackage.org.apache.struts.taglib.html.RadioTag +org.apache.struts.taglib.html.RadioTag accesskey false @@ -2229,7 +2229,7 @@ reset -com.dotcms.repackage.org.apache.struts.taglib.html.ResetTag +org.apache.struts.taglib.html.ResetTag accesskey false @@ -2358,7 +2358,7 @@ rewrite -com.dotcms.repackage.org.apache.struts.taglib.html.RewriteTag +org.apache.struts.taglib.html.RewriteTag empty action @@ -2438,7 +2438,7 @@ select -com.dotcms.repackage.org.apache.struts.taglib.html.SelectTag +org.apache.struts.taglib.html.SelectTag JSP alt @@ -2583,7 +2583,7 @@ submit -com.dotcms.repackage.org.apache.struts.taglib.html.SubmitTag +org.apache.struts.taglib.html.SubmitTag accesskey false @@ -2717,7 +2717,7 @@ text -com.dotcms.repackage.org.apache.struts.taglib.html.TextTag +org.apache.struts.taglib.html.TextTag accesskey false @@ -2871,7 +2871,7 @@ textarea -com.dotcms.repackage.org.apache.struts.taglib.html.TextareaTag +org.apache.struts.taglib.html.TextareaTag accesskey false @@ -3025,7 +3025,7 @@ xhtml -com.dotcms.repackage.org.apache.struts.taglib.html.XhtmlTag +org.apache.struts.taglib.html.XhtmlTag empty diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/struts-logic.tld b/dotCMS/src/main/webapp/WEB-INF/tld/struts-logic.tld index 6d1a8e270e8f..f267fcc91778 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/struts-logic.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/struts-logic.tld @@ -13,7 +13,7 @@ http://struts.apache.org/tags-logic empty -com.dotcms.repackage.org.apache.struts.taglib.logic.EmptyTag +org.apache.struts.taglib.logic.EmptyTag JSP name @@ -33,7 +33,7 @@ equal -com.dotcms.repackage.org.apache.struts.taglib.logic.EqualTag +org.apache.struts.taglib.logic.EqualTag JSP cookie @@ -73,7 +73,7 @@ forward -com.dotcms.repackage.org.apache.struts.taglib.logic.ForwardTag +org.apache.struts.taglib.logic.ForwardTag empty name @@ -83,7 +83,7 @@ greaterEqual -com.dotcms.repackage.org.apache.struts.taglib.logic.GreaterEqualTag +org.apache.struts.taglib.logic.GreaterEqualTag JSP cookie @@ -123,7 +123,7 @@ greaterThan -com.dotcms.repackage.org.apache.struts.taglib.logic.GreaterThanTag +org.apache.struts.taglib.logic.GreaterThanTag JSP cookie @@ -163,8 +163,8 @@ iterate -com.dotcms.repackage.org.apache.struts.taglib.logic.IterateTag -com.dotcms.repackage.org.apache.struts.taglib.logic.IterateTei +org.apache.struts.taglib.logic.IterateTag +org.apache.struts.taglib.logic.IterateTei JSP collection @@ -214,7 +214,7 @@ lessEqual -com.dotcms.repackage.org.apache.struts.taglib.logic.LessEqualTag +org.apache.struts.taglib.logic.LessEqualTag JSP cookie @@ -254,7 +254,7 @@ lessThan -com.dotcms.repackage.org.apache.struts.taglib.logic.LessThanTag +org.apache.struts.taglib.logic.LessThanTag JSP cookie @@ -294,7 +294,7 @@ match -com.dotcms.repackage.org.apache.struts.taglib.logic.MatchTag +org.apache.struts.taglib.logic.MatchTag JSP cookie @@ -339,7 +339,7 @@ messagesNotPresent -com.dotcms.repackage.org.apache.struts.taglib.logic.MessagesNotPresentTag +org.apache.struts.taglib.logic.MessagesNotPresentTag JSP name @@ -359,7 +359,7 @@ messagesPresent -com.dotcms.repackage.org.apache.struts.taglib.logic.MessagesPresentTag +org.apache.struts.taglib.logic.MessagesPresentTag JSP name @@ -379,7 +379,7 @@ notEmpty -com.dotcms.repackage.org.apache.struts.taglib.logic.NotEmptyTag +org.apache.struts.taglib.logic.NotEmptyTag JSP name @@ -399,7 +399,7 @@ notEqual -com.dotcms.repackage.org.apache.struts.taglib.logic.NotEqualTag +org.apache.struts.taglib.logic.NotEqualTag JSP cookie @@ -439,7 +439,7 @@ notMatch -com.dotcms.repackage.org.apache.struts.taglib.logic.NotMatchTag +org.apache.struts.taglib.logic.NotMatchTag JSP cookie @@ -484,7 +484,7 @@ notPresent -com.dotcms.repackage.org.apache.struts.taglib.logic.NotPresentTag +org.apache.struts.taglib.logic.NotPresentTag JSP cookie @@ -529,7 +529,7 @@ present -com.dotcms.repackage.org.apache.struts.taglib.logic.PresentTag +org.apache.struts.taglib.logic.PresentTag JSP cookie @@ -574,7 +574,7 @@ redirect -com.dotcms.repackage.org.apache.struts.taglib.logic.RedirectTag +org.apache.struts.taglib.logic.RedirectTag action false diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/struts-nested.tld b/dotCMS/src/main/webapp/WEB-INF/tld/struts-nested.tld index e7327d641506..08edaa9b4b15 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/struts-nested.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/struts-nested.tld @@ -13,7 +13,7 @@ http://struts.apache.org/tags-nested nest -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedPropertyTag +org.apache.struts.taglib.nested.NestedPropertyTag JSP property @@ -23,8 +23,8 @@ writeNesting -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedWriteNestingTag -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedWriteNestingTei +org.apache.struts.taglib.nested.NestedWriteNestingTag +org.apache.struts.taglib.nested.NestedWriteNestingTei JSP property @@ -44,7 +44,7 @@ root -com.dotcms.repackage.org.apache.struts.taglib.nested.NestedRootTag +org.apache.struts.taglib.nested.NestedRootTag JSP name @@ -54,8 +54,8 @@ define -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedDefineTag -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedDefineTei +org.apache.struts.taglib.nested.bean.NestedDefineTag +org.apache.struts.taglib.nested.bean.NestedDefineTei empty id @@ -95,7 +95,7 @@ message -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedMessageTag +org.apache.struts.taglib.nested.bean.NestedMessageTag empty arg0 @@ -155,8 +155,8 @@ size -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedSizeTag -com.dotcms.repackage.org.apache.struts.taglib.bean.SizeTei +org.apache.struts.taglib.nested.bean.NestedSizeTag +org.apache.struts.taglib.bean.SizeTei empty collection @@ -186,7 +186,7 @@ write -com.dotcms.repackage.org.apache.struts.taglib.nested.bean.NestedWriteTag +org.apache.struts.taglib.nested.bean.NestedWriteTag empty bundle @@ -236,7 +236,7 @@ checkbox -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedCheckboxTag +org.apache.struts.taglib.nested.html.NestedCheckboxTag accesskey false @@ -375,7 +375,7 @@ errors -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedErrorsTag +org.apache.struts.taglib.nested.html.NestedErrorsTag empty bundle @@ -400,7 +400,7 @@ file -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedFileTag +org.apache.struts.taglib.nested.html.NestedFileTag accesskey false @@ -554,7 +554,7 @@ form -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedFormTag +org.apache.struts.taglib.nested.html.NestedFormTag JSP action @@ -609,7 +609,7 @@ hidden -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedHiddenTag +org.apache.struts.taglib.nested.html.NestedHiddenTag alt false @@ -668,7 +668,7 @@ image -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedImageTag +org.apache.struts.taglib.nested.html.NestedImageTag accesskey false @@ -837,7 +837,7 @@ img -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedImgTag +org.apache.struts.taglib.nested.html.NestedImgTag empty accesskey @@ -1012,7 +1012,7 @@ link -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedLinkTag +org.apache.struts.taglib.nested.html.NestedLinkTag accesskey false @@ -1196,8 +1196,8 @@ messages -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedMessagesTag -com.dotcms.repackage.org.apache.struts.taglib.html.MessagesTei +org.apache.struts.taglib.nested.html.NestedMessagesTag +org.apache.struts.taglib.html.MessagesTei JSP id @@ -1242,7 +1242,7 @@ multibox -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedMultiboxTag +org.apache.struts.taglib.nested.html.NestedMultiboxTag accesskey false @@ -1376,7 +1376,7 @@ options -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedOptionsTag +org.apache.struts.taglib.nested.html.NestedOptionsTag empty collection @@ -1421,7 +1421,7 @@ optionsCollection -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag +org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag empty filter @@ -1461,7 +1461,7 @@ password -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedPasswordTag +org.apache.struts.taglib.nested.html.NestedPasswordTag accesskey false @@ -1620,7 +1620,7 @@ radio -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedRadioTag +org.apache.struts.taglib.nested.html.NestedRadioTag accesskey false @@ -1739,7 +1739,7 @@ select -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedSelectTag +org.apache.struts.taglib.nested.html.NestedSelectTag JSP accesskey @@ -1889,7 +1889,7 @@ submit -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedSubmitTag +org.apache.struts.taglib.nested.html.NestedSubmitTag accesskey false @@ -2023,7 +2023,7 @@ text -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedTextTag +org.apache.struts.taglib.nested.html.NestedTextTag accesskey false @@ -2177,7 +2177,7 @@ textarea -com.dotcms.repackage.org.apache.struts.taglib.nested.html.NestedTextareaTag +org.apache.struts.taglib.nested.html.NestedTextareaTag accesskey false @@ -2331,7 +2331,7 @@ empty -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedEmptyTag +org.apache.struts.taglib.nested.logic.NestedEmptyTag JSP name @@ -2351,7 +2351,7 @@ equal -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedEqualTag +org.apache.struts.taglib.nested.logic.NestedEqualTag JSP cookie @@ -2391,7 +2391,7 @@ greaterEqual -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedGreaterEqualTag +org.apache.struts.taglib.nested.logic.NestedGreaterEqualTag JSP cookie @@ -2431,7 +2431,7 @@ greaterThan -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedGreaterThanTag +org.apache.struts.taglib.nested.logic.NestedGreaterThanTag JSP cookie @@ -2471,8 +2471,8 @@ iterate -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedIterateTag -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedIterateTei +org.apache.struts.taglib.nested.logic.NestedIterateTag +org.apache.struts.taglib.nested.logic.NestedIterateTei JSP collection @@ -2522,7 +2522,7 @@ lessEqual -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedLessEqualTag +org.apache.struts.taglib.nested.logic.NestedLessEqualTag JSP cookie @@ -2562,7 +2562,7 @@ lessThan -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedLessThanTag +org.apache.struts.taglib.nested.logic.NestedLessThanTag JSP cookie @@ -2602,7 +2602,7 @@ match -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedMatchTag +org.apache.struts.taglib.nested.logic.NestedMatchTag JSP cookie @@ -2647,7 +2647,7 @@ messagesNotPresent -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedMessagesNotPresentTag +org.apache.struts.taglib.nested.logic.NestedMessagesNotPresentTag JSP name @@ -2667,7 +2667,7 @@ messagesPresent -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedMessagesPresentTag +org.apache.struts.taglib.nested.logic.NestedMessagesPresentTag JSP name @@ -2687,7 +2687,7 @@ notEmpty -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotEmptyTag +org.apache.struts.taglib.nested.logic.NestedNotEmptyTag JSP name @@ -2707,7 +2707,7 @@ notEqual -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotEqualTag +org.apache.struts.taglib.nested.logic.NestedNotEqualTag JSP cookie @@ -2747,7 +2747,7 @@ notMatch -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotMatchTag +org.apache.struts.taglib.nested.logic.NestedNotMatchTag JSP cookie @@ -2792,7 +2792,7 @@ notPresent -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedNotPresentTag +org.apache.struts.taglib.nested.logic.NestedNotPresentTag JSP cookie @@ -2837,7 +2837,7 @@ present -com.dotcms.repackage.org.apache.struts.taglib.nested.logic.NestedPresentTag +org.apache.struts.taglib.nested.logic.NestedPresentTag JSP cookie diff --git a/dotCMS/src/main/webapp/WEB-INF/tld/struts-tiles.tld b/dotCMS/src/main/webapp/WEB-INF/tld/struts-tiles.tld index 618aad90f14f..7ae564b28197 100644 --- a/dotCMS/src/main/webapp/WEB-INF/tld/struts-tiles.tld +++ b/dotCMS/src/main/webapp/WEB-INF/tld/struts-tiles.tld @@ -14,7 +14,7 @@ http://struts.apache.org/tags-tiles insert -com.dotcms.repackage.org.apache.struts.taglib.tiles.InsertTag +org.apache.struts.taglib.tiles.InsertTag JSP template @@ -89,7 +89,7 @@ definition -com.dotcms.repackage.org.apache.struts.taglib.tiles.DefinitionTag +org.apache.struts.taglib.tiles.DefinitionTag JSP id @@ -124,7 +124,7 @@ put -com.dotcms.repackage.org.apache.struts.taglib.tiles.PutTag +org.apache.struts.taglib.tiles.PutTag JSP name @@ -174,7 +174,7 @@ putList -com.dotcms.repackage.org.apache.struts.taglib.tiles.PutListTag +org.apache.struts.taglib.tiles.PutListTag JSP name @@ -184,7 +184,7 @@ add -com.dotcms.repackage.org.apache.struts.taglib.tiles.AddTag +org.apache.struts.taglib.tiles.AddTag JSP value @@ -229,7 +229,7 @@ get -com.dotcms.repackage.org.apache.struts.taglib.tiles.GetTag +org.apache.struts.taglib.tiles.GetTag empty name @@ -254,7 +254,7 @@ getAsString -com.dotcms.repackage.org.apache.struts.taglib.tiles.GetAttributeTag +org.apache.struts.taglib.tiles.GetAttributeTag empty name @@ -274,8 +274,8 @@ useAttribute -com.dotcms.repackage.org.apache.struts.taglib.tiles.UseAttributeTag -com.dotcms.repackage.org.apache.struts.taglib.tiles.UseAttributeTei +org.apache.struts.taglib.tiles.UseAttributeTag +org.apache.struts.taglib.tiles.UseAttributeTei empty id @@ -305,7 +305,7 @@ importAttribute -com.dotcms.repackage.org.apache.struts.taglib.tiles.ImportAttributeTag +org.apache.struts.taglib.tiles.ImportAttributeTag empty name @@ -325,7 +325,7 @@ initComponentDefinitions -com.dotcms.repackage.org.apache.struts.taglib.tiles.InitDefinitionsTag +org.apache.struts.taglib.tiles.InitDefinitionsTag empty file diff --git a/dotCMS/src/main/webapp/WEB-INF/validator-rules.xml b/dotCMS/src/main/webapp/WEB-INF/validator-rules.xml index f4d170b93bcc..b648d31efe82 100644 --- a/dotCMS/src/main/webapp/WEB-INF/validator-rules.xml +++ b/dotCMS/src/main/webapp/WEB-INF/validator-rules.xml @@ -11,7 +11,7 @@ referenced in the struts-config.xml under the plug-in element for the ValidatorPlugIn. - + @@ -52,84 +52,84 @@ + jsFunction="org.apache.commons.validator.javascript.validateMinLength"/> + jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/> @@ -280,7 +280,7 @@ methodParams="" depends="" msg="" - jsFunction="com.dotcms.repackage.org.apache.commons.validator.javascript.validateUtilities"/> + jsFunction="org.apache.commons.validator.javascript.validateUtilities"/> diff --git a/dotCMS/src/main/webapp/html/common/init-basic.jsp b/dotCMS/src/main/webapp/html/common/init-basic.jsp index e76798fcd281..a0b579837b09 100644 --- a/dotCMS/src/main/webapp/html/common/init-basic.jsp +++ b/dotCMS/src/main/webapp/html/common/init-basic.jsp @@ -156,7 +156,7 @@ else { signedIn = true; } -Locale locale = (Locale)session.getAttribute(com.dotcms.repackage.org.apache.struts.Globals.LOCALE_KEY); +Locale locale = (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); if (locale == null) { // Locale should never be null except when the TCK tests invalidate the session diff --git a/dotCMS/src/main/webapp/html/common/init.jsp b/dotCMS/src/main/webapp/html/common/init.jsp index 30490c99ab93..2bb5281e9dfe 100644 --- a/dotCMS/src/main/webapp/html/common/init.jsp +++ b/dotCMS/src/main/webapp/html/common/init.jsp @@ -154,7 +154,7 @@ } Locale locale = (Locale) session - .getAttribute(com.dotcms.repackage.org.apache.struts.Globals.LOCALE_KEY); + .getAttribute(org.apache.struts.Globals.LOCALE_KEY); if (locale == null) { // Locale should never be null except when the TCK tests invalidate the session @@ -167,13 +167,13 @@ String test = locales[i].getLanguage() + "_" + locales[i].getCountry(); if(test.equals(request.getParameter("switchLocale"))){ locale = locales[i]; - session.setAttribute(com.dotcms.repackage.org.apache.struts.Globals.LOCALE_KEY, locale); + session.setAttribute(org.apache.struts.Globals.LOCALE_KEY, locale); break; } } }else{//DOTCMS-5013 - session.setAttribute(com.dotcms.repackage.org.apache.struts.Globals.LOCALE_KEY, locale); + session.setAttribute(org.apache.struts.Globals.LOCALE_KEY, locale); } TimeZone timeZone = user.getTimeZone(); diff --git a/dotCMS/src/main/webapp/html/common/messages_inc.jsp b/dotCMS/src/main/webapp/html/common/messages_inc.jsp index ebc4e55b995e..e303f4c64786 100644 --- a/dotCMS/src/main/webapp/html/common/messages_inc.jsp +++ b/dotCMS/src/main/webapp/html/common/messages_inc.jsp @@ -1,15 +1,15 @@ -<%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionErrors" %> +<%@ page import="org.apache.struts.action.ActionErrors" %> <%@ page import="java.util.HashSet"%> <%@ page import="java.util.Set"%> -<%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionErrors" %> +<%@ page import="org.apache.struts.action.ActionErrors" %> <%@ page import="com.liferay.portal.language.LanguageUtil" %> <%@ page import="java.util.List"%> <%@ page import="java.util.ArrayList"%> -<%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionMessage"%> +<%@ page import="org.apache.struts.action.ActionMessage"%> <%@ page import="java.util.Iterator"%> <%@ page import="com.liferay.util.servlet.SessionMessages"%> -<%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionMessages"%> -<%@page import="com.dotcms.repackage.org.apache.struts.Globals"%> +<%@ page import="org.apache.struts.action.ActionMessages"%> +<%@page import="org.apache.struts.Globals"%> <% if(request.getSession().getAttribute(ActionErrors.GLOBAL_ERROR) != null){ request.setAttribute(ActionErrors.GLOBAL_ERROR, request.getSession().getAttribute(ActionErrors.GLOBAL_ERROR)); @@ -109,8 +109,8 @@ do { SessionMessages.clear(session); SessionMessages.clear(request); -request.getSession().removeAttribute("com.dotcms.repackage.org.apache.struts.action.MESSAGE"); -request.getSession().removeAttribute("com.dotcms.repackage.org.apache.struts.action.ERROR"); +request.getSession().removeAttribute("org.apache.struts.action.MESSAGE"); +request.getSession().removeAttribute("org.apache.struts.action.ERROR"); diff --git a/dotCMS/src/main/webapp/html/common/top_js_inc.jsp b/dotCMS/src/main/webapp/html/common/top_js_inc.jsp index 1b3943f0701b..fceb88f4799f 100644 --- a/dotCMS/src/main/webapp/html/common/top_js_inc.jsp +++ b/dotCMS/src/main/webapp/html/common/top_js_inc.jsp @@ -20,7 +20,7 @@ if(sess != null){ - locale = (Locale) sess.getAttribute(com.dotcms.repackage.org.apache.struts.Globals.LOCALE_KEY); + locale = (Locale) sess.getAttribute(org.apache.struts.Globals.LOCALE_KEY); } if (locale == null && user != null) { // Locale should never be null except when the TCK tests invalidate the session diff --git a/dotCMS/src/main/webapp/html/portal/init.jsp b/dotCMS/src/main/webapp/html/portal/init.jsp index 1038c65b8be5..73002d7e9c75 100644 --- a/dotCMS/src/main/webapp/html/portal/init.jsp +++ b/dotCMS/src/main/webapp/html/portal/init.jsp @@ -11,7 +11,7 @@ import="com.liferay.portal.struts.PortletRequestProcessor"%><%@ page import="com.liferay.portal.util.PortletTitleComparator"%><%@ page import="javax.servlet.jsp.PageContext"%><%@ page - import="org.apache.commons.fileupload.LiferayDiskFileUpload"%><%@ page import="com.dotcms.repackage.org.apache.struts.action.ActionMapping"%><%@ page - import="com.dotcms.repackage.org.apache.struts.tiles.ComponentDefinition"%><%@ page - import="com.dotcms.repackage.org.apache.struts.tiles.TilesUtil"%><%@ page + import="org.apache.commons.fileupload.LiferayDiskFileUpload"%><%@ page import="org.apache.struts.action.ActionMapping"%><%@ page + import="org.apache.struts.tiles.ComponentDefinition"%><%@ page + import="org.apache.struts.tiles.TilesUtil"%><%@ page import="com.liferay.portal.UserActiveException"%> \ No newline at end of file diff --git a/dotCMS/src/main/webapp/html/portal/view_portlet_inc.jsp b/dotCMS/src/main/webapp/html/portal/view_portlet_inc.jsp index 0612dfbf2189..67f132d238b2 100644 --- a/dotCMS/src/main/webapp/html/portal/view_portlet_inc.jsp +++ b/dotCMS/src/main/webapp/html/portal/view_portlet_inc.jsp @@ -85,7 +85,7 @@ if ((cachePortlet != null) && cachePortlet.isStrutsPortlet()) { // Make sure the Tiles context is reset for the next portlet - request.removeAttribute(com.dotcms.repackage.org.apache.struts.taglib.tiles.ComponentConstants.COMPONENT_CONTEXT); + request.removeAttribute(org.apache.struts.taglib.tiles.ComponentConstants.COMPONENT_CONTEXT); } boolean portletException = false; diff --git a/dotCMS/src/main/webapp/html/portlet/ext/cmsconfig/license.jsp b/dotCMS/src/main/webapp/html/portlet/ext/cmsconfig/license.jsp index 287240912f0e..a8f2d39d3c08 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/cmsconfig/license.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/cmsconfig/license.jsp @@ -1,5 +1,5 @@ <%@page import="com.dotcms.enterprise.license.LicenseManager"%> -<%@page import="com.dotcms.repackage.org.apache.struts.Globals"%> +<%@page import="org.apache.struts.Globals"%> <%@page import="com.dotmarketing.util.Config"%> <%@page import="com.liferay.portal.struts.MultiMessageResources"%> <%@ include file="/html/portlet/ext/cmsconfig/init.jsp" %> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_wrapper.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_wrapper.jsp index 8e6d59601a35..b92a8e128b2a 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_wrapper.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_wrapper.jsp @@ -72,7 +72,7 @@ if (isLocked) { <% SessionMessages.clear(session); SessionMessages.clear(request); -request.getSession().removeAttribute("com.dotcms.repackage.org.apache.struts.action.MESSAGE"); -request.getSession().removeAttribute("com.dotcms.repackage.org.apache.struts.action.ERROR"); +request.getSession().removeAttribute("org.apache.struts.action.MESSAGE"); +request.getSession().removeAttribute("org.apache.struts.action.ERROR"); %> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp index 1d2130dfbfbc..d8043ac2a296 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp @@ -701,7 +701,7 @@ selected = "SELECTED"; } %> - + <% } %> @@ -739,7 +739,7 @@ } } %> - + <% } %> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/order_contentlets.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/order_contentlets.jsp index 00b01f01887b..ad3749bcacb7 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/order_contentlets.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/order_contentlets.jsp @@ -9,7 +9,7 @@ %> <%@page import="com.dotmarketing.portlets.folders.business.FolderFactory"%> <%@page import="com.dotmarketing.util.Logger"%> -<%@page import="com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils"%> +<%@page import="org.apache.commons.beanutils.PropertyUtils"%> <%@page import="com.dotmarketing.portlets.structure.model.Field"%> <%@page import="com.dotmarketing.portlets.structure.factories.FieldFactory"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/edit_publish_bundle.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/edit_publish_bundle.jsp index f1f64ad2635c..6ff741aa806d 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/edit_publish_bundle.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/edit_publish_bundle.jsp @@ -6,7 +6,7 @@ <%@page import="com.dotcms.publisher.bundle.bean.Bundle"%> <%@ page import="com.liferay.portal.language.LanguageUtil"%> <%@page import="com.dotmarketing.business.Role"%> -<%@page import="com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> <% String identifier = request.getParameter("id"); Bundle bundle = APILocator.getBundleAPI().getBundleById(identifier); diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_audit_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_audit_list.jsp index 6b03d9002027..4ef2ec2a5acb 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_audit_list.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_audit_list.jsp @@ -1,4 +1,4 @@ -<%@page import="com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="com.dotcms.publisher.business.PublishAuditUtil"%> <%@page import="com.dotmarketing.beans.PermissionableProxy"%> <%@page import="com.dotcms.publisher.business.PublishQueueElement"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_content_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_content_list.jsp index e84bab30bc95..b1848f4306ab 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_content_list.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_content_list.jsp @@ -1,4 +1,4 @@ -<%@page import="com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="com.dotmarketing.util.Config"%> <%@page import="com.dotmarketing.business.PermissionAPI"%> <%@page import="java.io.StringWriter"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp index 18e1c308cc5d..9c426acaf062 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp @@ -1,5 +1,5 @@ <%@page import="com.dotmarketing.portlets.languagesmanager.model.Language"%> -<%@page import="com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="com.dotcms.publisher.business.PublishAuditUtil"%> <%@page import="com.dotmarketing.business.PermissionAPI"%> <%@page import="com.dotmarketing.beans.PermissionableProxy"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_unpushed_bundles.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_unpushed_bundles.jsp index 37fe835ad9b9..22ef91b59af9 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_unpushed_bundles.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_unpushed_bundles.jsp @@ -14,7 +14,7 @@ <%@ page import="com.dotcms.publisher.bundle.bean.Bundle"%> <%@page import="com.dotmarketing.portlets.contentlet.model.Contentlet"%> <%@page import="com.dotcms.publisher.business.PublishAuditUtil"%> -<%@page import="com.dotcms.repackage.org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@ page import="com.dotmarketing.portlets.contentlet.business.DotContentletStateException" %> <%@ page import="com.dotmarketing.util.Logger" %> <%@page import="com.dotcms.publisher.business.DotPublisherException"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/dashboard/host_properties_tab_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/dashboard/host_properties_tab_inc.jsp index 5df576eecc6e..d82c0cdf342b 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/dashboard/host_properties_tab_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/dashboard/host_properties_tab_inc.jsp @@ -5,7 +5,7 @@ <%@page import="com.dotmarketing.factories.InodeFactory"%> <%@page import="com.dotmarketing.portlets.structure.model.Structure"%> <%@page import="com.dotmarketing.portlets.structure.model.Field"%> -<%@page import="com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils"%> +<%@page import="org.apache.commons.beanutils.PropertyUtils"%> <%@page import="com.dotmarketing.util.Parameter"%> <%@page import="java.util.Calendar"%> <%@page import="java.util.Date"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/dashboard/rel_content_properties_tab_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/dashboard/rel_content_properties_tab_inc.jsp index 3bece151eb6b..ba8b412c991a 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/dashboard/rel_content_properties_tab_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/dashboard/rel_content_properties_tab_inc.jsp @@ -5,7 +5,7 @@ <%@page import="com.dotmarketing.factories.InodeFactory"%> <%@page import="com.dotmarketing.portlets.structure.model.Structure"%> <%@page import="com.dotmarketing.portlets.structure.model.Field"%> -<%@page import="com.dotcms.repackage.org.apache.commons.beanutils.PropertyUtils"%> +<%@page import="org.apache.commons.beanutils.PropertyUtils"%> <%@page import="com.dotmarketing.util.Parameter"%> <%@page import="java.util.Calendar"%> <%@page import="java.util.Date"%> diff --git a/dotCMS/src/main/webapp/html/portlet/ext/usermanager/load_users.jsp b/dotCMS/src/main/webapp/html/portlet/ext/usermanager/load_users.jsp index a2321148526e..72b93d1913fe 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/usermanager/load_users.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/usermanager/load_users.jsp @@ -8,7 +8,7 @@ <% UserManagerListSearchForm form = (UserManagerListSearchForm)request.getAttribute(com.dotmarketing.util.WebKeys.USERMANAGERLISTFORM); //by setting the bean on context we can use the form tag instead of the struts form tag, and use the autocomplete=off on the form - pageContext.setAttribute("com.dotcms.repackage.org.apache.struts.taglib.html.BEAN",form); + pageContext.setAttribute("org.apache.struts.taglib.html.BEAN",form); int numberGenericVariables = Config.getIntProperty("MAX_NUMBER_VARIABLES_TO_SHOW"); diff --git a/dotCMS/src/main/webapp/html/portlet/ext/usermanager/search_form_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/usermanager/search_form_inc.jsp index e63d878a4ee0..35edcbff48ed 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/usermanager/search_form_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/usermanager/search_form_inc.jsp @@ -13,7 +13,7 @@ if(form == null){ form = new UserManagerListSearchForm(); } - pageContext.setAttribute("com.dotcms.repackage.org.apache.struts.taglib.html.BEAN",form); + pageContext.setAttribute("org.apache.struts.taglib.html.BEAN",form); String active = null; if (form != null) { diff --git a/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp index 4c0d4b7ae07d..215bd4a9282f 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp @@ -3,7 +3,7 @@ <%@page import="java.util.Map"%> <%@page import="com.dotmarketing.portlets.contentlet.model.Contentlet"%> <%@page import="com.dotmarketing.util.Logger"%> -<%@page import="com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils"%> +<%@page import="org.apache.commons.beanutils.BeanUtils"%> <%@page import="com.dotmarketing.portlets.workflows.model.WorkflowAction"%> <%@page import="com.dotmarketing.util.DateUtil"%> <%@page import="com.dotmarketing.util.PortletURLUtil"%> diff --git a/dotCMS/src/test/java/com/dotcms/content/elasticsearch/business/ESIndexHelperTest.java b/dotCMS/src/test/java/com/dotcms/content/elasticsearch/business/ESIndexHelperTest.java index b55bd7b856d4..c7c7ecc8553b 100644 --- a/dotCMS/src/test/java/com/dotcms/content/elasticsearch/business/ESIndexHelperTest.java +++ b/dotCMS/src/test/java/com/dotcms/content/elasticsearch/business/ESIndexHelperTest.java @@ -8,19 +8,17 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.dotcms.UnitTestBase; +import com.dotcms.enterprise.LicenseService; +import com.dotcms.enterprise.license.LicenseLevel; +import com.dotmarketing.sitesearch.business.SiteSearchAPI; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import com.dotcms.enterprise.license.LicenseLevel; +import org.apache.commons.lang.StringUtils; import org.junit.Test; -import com.dotcms.UnitTestBase; -import com.dotcms.enterprise.LicenseService; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotmarketing.sitesearch.business.SiteSearchAPI; - public class ESIndexHelperTest extends UnitTestBase { /** diff --git a/dotCMS/src/test/java/com/dotcms/rest/RestUtilTest.java b/dotCMS/src/test/java/com/dotcms/rest/RestUtilTest.java index f881096b6f81..8776172e8306 100644 --- a/dotCMS/src/test/java/com/dotcms/rest/RestUtilTest.java +++ b/dotCMS/src/test/java/com/dotcms/rest/RestUtilTest.java @@ -1,24 +1,25 @@ package com.dotcms.rest; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.dotcms.UnitTestBase; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotmarketing.logConsole.model.LogMapper; import com.dotmarketing.util.Config; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; import com.liferay.portal.util.WebKeys; - +import java.util.Locale; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.Locale; - -import static org.junit.Assert.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.apache.struts.Globals; /** * Created by freddyrodriguez on 7/29/16. diff --git a/dotCMS/src/test/java/com/dotcms/rest/api/v1/authentication/ForgotPasswordResourceTest.java b/dotCMS/src/test/java/com/dotcms/rest/api/v1/authentication/ForgotPasswordResourceTest.java index 2bd8b29bc904..7b01273b5729 100644 --- a/dotCMS/src/test/java/com/dotcms/rest/api/v1/authentication/ForgotPasswordResourceTest.java +++ b/dotCMS/src/test/java/com/dotcms/rest/api/v1/authentication/ForgotPasswordResourceTest.java @@ -1,36 +1,40 @@ package com.dotcms.rest.api.v1.authentication; +import static com.dotmarketing.util.Constants.CONFIG_DISPLAY_NOT_EXISTING_USER_AT_RECOVER_PASSWORD; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.dotcms.UnitTestBase; import com.dotcms.api.system.user.UserService; import com.dotcms.company.CompanyAPI; import com.dotcms.repackage.javax.ws.rs.core.Response; import com.dotcms.repackage.javax.ws.rs.core.Response.Status; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.rest.ResponseEntityView; import com.dotcms.rest.RestUtilTest; import com.dotmarketing.business.ApiProvider; import com.dotmarketing.util.Config; import com.dotmarketing.util.json.JSONException; -import com.liferay.portal.*; +import com.liferay.portal.NoSuchUserException; +import com.liferay.portal.SendPasswordException; +import com.liferay.portal.UserEmailAddressException; import com.liferay.portal.ejb.UserLocalManager; import com.liferay.portal.model.Company; import com.liferay.portal.model.User; -import org.junit.Before; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - +import java.util.Locale; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.util.Locale; - -import static com.dotmarketing.util.Constants.CONFIG_DISPLAY_NOT_EXISTING_USER_AT_RECOVER_PASSWORD; -import static org.junit.Assert.*; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.apache.struts.Globals; +import org.junit.Before; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; public class ForgotPasswordResourceTest extends UnitTestBase { diff --git a/dotCMS/src/test/java/com/dotcms/rest/api/v1/site/SiteResourceTest.java b/dotCMS/src/test/java/com/dotcms/rest/api/v1/site/SiteResourceTest.java index 0b02de912c00..145651727bd0 100644 --- a/dotCMS/src/test/java/com/dotcms/rest/api/v1/site/SiteResourceTest.java +++ b/dotCMS/src/test/java/com/dotcms/rest/api/v1/site/SiteResourceTest.java @@ -12,29 +12,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.dotcms.util.PaginationUtil; -import org.junit.Test; -import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import com.dotcms.UnitTestBase; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.commons.lang.StringUtils; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.rest.InitDataObject; import com.dotcms.rest.ResponseEntityView; import com.dotcms.rest.RestUtilTest; import com.dotcms.rest.WebResource; import com.dotcms.util.I18NUtil; +import com.dotcms.util.PaginationUtil; import com.dotmarketing.beans.Host; import com.dotmarketing.business.DotStateException; import com.dotmarketing.business.UserAPI; @@ -47,6 +32,18 @@ import com.dotmarketing.util.WebKeys; import com.dotmarketing.util.json.JSONException; import com.liferay.portal.model.User; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.Globals; +import org.junit.Test; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; /** * {@link SiteResource} test diff --git a/dotCMS/src/test/java/com/dotcms/rest/api/v1/user/UserResourceTest.java b/dotCMS/src/test/java/com/dotcms/rest/api/v1/user/UserResourceTest.java index 99ec69bdb95f..3ecdd23a7260 100644 --- a/dotCMS/src/test/java/com/dotcms/rest/api/v1/user/UserResourceTest.java +++ b/dotCMS/src/test/java/com/dotcms/rest/api/v1/user/UserResourceTest.java @@ -8,23 +8,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.dotcms.cms.login.LoginServiceAPI; -import org.junit.Test; - import com.dotcms.UnitTestBase; import com.dotcms.api.system.user.UserService; +import com.dotcms.cms.login.LoginServiceAPI; import com.dotcms.repackage.javax.ws.rs.core.Response; -import com.dotcms.repackage.org.apache.struts.Globals; import com.dotcms.rest.ErrorResponseHelper; import com.dotcms.rest.InitDataObject; import com.dotcms.rest.ResponseEntityView; @@ -43,6 +30,16 @@ import com.dotmarketing.util.Config; import com.dotmarketing.util.json.JSONException; import com.liferay.portal.model.User; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.Globals; +import org.junit.Test; /** * {@link UserResource} test diff --git a/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java b/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java index d622483616e1..38f11d119160 100644 --- a/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java +++ b/dotCMS/src/test/java/com/dotmarketing/business/cache/provider/h22/H22CacheTest.java @@ -2,7 +2,6 @@ import static org.hamcrest.MatcherAssert.assertThat; -import com.dotcms.repackage.org.apache.commons.lang.RandomStringUtils; import com.liferay.util.FileUtil; import java.io.File; import java.sql.Connection; @@ -14,6 +13,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.commons.lang.RandomStringUtils; import org.junit.Test; public class H22CacheTest { diff --git a/dotCMS/src/test/java/com/dotmarketing/util/BaseMessageResources.java b/dotCMS/src/test/java/com/dotmarketing/util/BaseMessageResources.java index b0a4b307dd15..3ea71d38e301 100644 --- a/dotCMS/src/test/java/com/dotmarketing/util/BaseMessageResources.java +++ b/dotCMS/src/test/java/com/dotmarketing/util/BaseMessageResources.java @@ -1,12 +1,12 @@ package com.dotmarketing.util; -import com.dotcms.repackage.org.apache.struts.Globals; -import com.dotcms.repackage.org.apache.struts.util.MessageResources; -import com.dotcms.repackage.org.apache.struts.util.MessageResourcesFactory; -import com.dotcms.repackage.org.apache.struts.util.PropertyMessageResources; -import com.dotcms.repackage.org.apache.struts.util.PropertyMessageResourcesFactory; import com.liferay.portal.model.User; import com.liferay.portal.util.WebAppPool; +import org.apache.struts.Globals; +import org.apache.struts.util.MessageResources; +import org.apache.struts.util.MessageResourcesFactory; +import org.apache.struts.util.PropertyMessageResources; +import org.apache.struts.util.PropertyMessageResourcesFactory; /** * THis base class is useful just to load base things for other unit test From 415e2e78b29ef0d2084ee9f56c8654273c7c8046 Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Fri, 26 Jan 2018 14:39:37 -0600 Subject: [PATCH 6/6] dotCMS/core#13482 --- dotCMS/src/main/enterprise | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotCMS/src/main/enterprise b/dotCMS/src/main/enterprise index cbda01a63ca9..ca3421f6a801 160000 --- a/dotCMS/src/main/enterprise +++ b/dotCMS/src/main/enterprise @@ -1 +1 @@ -Subproject commit cbda01a63ca92c678e8e607c5987f54d60b0ce1f +Subproject commit ca3421f6a801c99dcf531e4f40918a33ff41b1cf