Release nocode alpha (#13536)

* #12619 Update edit content to match the rows and columns from content types

* fixing messages

* #13315 fixed

* #13315 sonarcube

* #13315 mas sonarcube

* fixing broken ContentTypeUtilTest

* Return PageView object after saving layout

* #13270 fixes layout manager, but we still need to copy themes

* Can't save new containers in a layout

* refactoring

* refactoring

* merge

* #13352 adding drag and drop to workflow builder

* #13352 cool new hover trick

* #13352 we didn't need api changed

* #13352

* #13325 development branch

* doing constructor public again

* #13325 added toString methods to template designer

* #13325 blow up page if template has bad data

* #13325 throw error if template does not have a drawed body

* #13325 moving the velocity mode renderer to the VelocityModeHandler

* creating neew fields type: RowField and ColumnField

* adding ColumnField into JsonSubTypes

* #13325 fixes null container in getContainersInTemplate

* #13325 fixes widget and form written out in loop

* #13325 fixes double // duplication

* #13325 invalidate container by object and not string

* #13325 reverted edit_contentlet changes

* #13325 showing template image if exists

* #13325 fixes content drag and drop for new content

* #13325 fixing template picker

* #13395 CopyContentlet done

* #13424 fixes the mysql lockup issue

* #13425 fixes container invalidation

* #13424 fixes the mysql lockup issue

* #13425 containers now invalidating

* #13424 closes the preparedstatement

* #13425 cache key corrected for files

* #13425 reverting log4j and others

* Issue 13440 drawed templates (#13441)

* Fix TreeTransformer for Oracle. (#13439)

* #13440 draw your templates

* #nocode allow columns to be accesses by int

* #nocode workflow steps still needs love

* #Added the work to create the system workflow on UT

* #13174 fixing a log

* Issue 13292 add contentlet search (#13448)

* #13292 Contentlet search filter and add contentlet to a page

* Make work forms and widgets

* Added new starter

* #13321: Avoiding factory method with API find call inside (#13443)

* #13429 (#13432)

* Updating commit reference for src/main/enterprise

* Added new starter

* Adding new content from edit-mode

* merge

* removing TODO

* #13449 adds libsass support

* #13449 adds libsass support

* #13449 adds libsass support

* #13449 adds libsass support

* #13174 feedback fixes

* #13449 fixed if condition

* #13449 reverting sass

* #13449 velocity cache invalidation

* #13452 added content can be moved from container to container

* #13452 save contentlet to container, allow content selection

* #13452 auto-add who can use and actionlet when selected

* #13452 hide row/column fields from ui

* #13452 contentlet velocity cache not invalidating

* saving sidebar's width property

* Fixing error when try to add a form content

* fixed sidebar not saving

* fixing error when saving the template's sidebar

* saving the sidebar width in lowercase

* saving the sidebar's width in lowercase

* #13475 cache invalidations again

* #13482

* #13452 allows you to select content type to add

* #13390 cherry-pick the email fix

* #13390 removing all the old velocity files

* #13482

* #13452 container velocity cache

* merge y saving uuid

* merge and saving uuid

* #13452 respect tree order

* Removing tika jar #13482

* #13452 ng-content-select

* #13452 ng-content-select

* #13452 fixed an npe on content versions and made minor changes to workflow list

* Add CategoryAjax

* #13482

* Add edit contentlet toolbar lang

* #13504 uses outputstream rather than writer

* #13452 adds basetype to content search

* fixing nocode tests

* Fix error with extra call to _fillStructures in Firefox

* Adding base type to the ContentEvent when a content is add

* revert context.xml change

* Adding page fields to renderHTML end point

* #13482

* #13482

* cleaned up the page resource return

* cleaned up the page resource return

* more page resource cleanup

* more page resource cleanup

* hopefully final renderHTML result

* Adding messages

* added CopyActionlet to imports

* Cleaning imports

* Missing javassist #13482

* Updating repackaged cactus.integration.ant jar #13482

* Missing dependency #13482

* Adding hibernate back #13482

* #13482

* #13482

* Updating aws repackaged jars #13482

* Changing jar version #13482

* Updating milton repackaged jars #13482

* Changing jar version #13482

* Updating daisydiff repackaged jar #13482

* Adding tika bundle and related osgi bundles as system bundles in order to exclude them from the OSGI portlet #13482

* Changing back ee version #13482

dotCMS/build.gradle

@@ -127,11 +127,22 @@ 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'
+    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')

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;

dotCMS/src/functional-test/resources/build-tests.xml

@@ -6,11 +6,10 @@
 
     <taskdef resource="cactus.tasks">
         <classpath>
-            <pathelement location="dotserver/tomcat/webapps/ROOT/WEB-INF/lib/dot.cactus.integration.ant-1.8.0_2.jar"/>
+            <pathelement location="dotserver/tomcat/webapps/ROOT/WEB-INF/lib/dot.cactus.integration.ant-1.8.0_3.jar"/>
             <pathelement location="dotserver/tomcat/webapps/ROOT/WEB-INF/lib/dot.cargo-ant-0.9_2.jar"/>
             <pathelement location="dotserver/tomcat/webapps/ROOT/WEB-INF/lib/dot.cargo-core-uberjar-0.9_2.jar"/>
             <pathelement location="dotserver/tomcat/webapps/ROOT/WEB-INF/lib/dot.commons-httpclient-3.1_2.jar"/>
-            <pathelement location="dotserver/tomcat/webapps/ROOT/WEB-INF/lib/dot.tika-app-1.3_3.jar"/>
         </classpath>
     </taskdef>
 

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 com.dotcms.repackage.net.sf.hibernate.HibernateException;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Assert;

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;
 

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;
 
 /**
  * 

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

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 {
 

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;
 
 /**

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.

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.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.apache.commons.lang.RandomStringUtils;
 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<String> 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));
       }
     }
 

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 com.dotcms.repackage.net.sf.hibernate.Session;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class HibernateUtilTest {
 

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 {