From 92347c184e9f651f0a3f412b6f9c31e1aa6ff7a5 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 8 Dec 2017 10:46:44 -0600 Subject: [PATCH 1/6] resolving the error of the missing schemeid --- .../com/dotcms/rest/ContentResourceTest.java | 5 +++++ .../resources/db-config.properties | 15 +++++++++++---- .../it-dotcms-config-cluster.properties | 10 +++++----- .../resources/it-dotmarketing-config.properties | 16 ++++++++-------- dotCMS/src/main/enterprise | 2 +- .../conf/dotmarketing-config-ext.properties | 1 + .../resources/dotcms-config-cluster.properties | 2 +- dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml | 9 +++++++-- dotCMS/src/main/webapp/WEB-INF/web.xml | 4 ++-- 9 files changed, 41 insertions(+), 23 deletions(-) diff --git a/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java b/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java index 51681ea3b999..1a488b4184ac 100644 --- a/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java +++ b/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java @@ -569,6 +569,7 @@ public void workflowTask() throws Exception { // Save as Draft Step1 -> Step1 WorkflowAction saveDraft=new WorkflowAction(); saveDraft.setId(UUIDGenerator.generateUuid()); + saveDraft.setSchemeId(scheme.getId()); saveDraft.setName("Save as Draft"); saveDraft.setOrder(1); saveDraft.setNextStep(step1.getId()); @@ -586,6 +587,7 @@ public void workflowTask() throws Exception { // Save as Draft Step1 -> Step1 WorkflowAction escalate=new WorkflowAction(); escalate.setId(UUIDGenerator.generateUuid()); + escalate.setSchemeId(scheme.getId()); escalate.setName("Save and Assign"); escalate.setOrder(2); escalate.setNextStep(step1.getId()); @@ -605,6 +607,7 @@ public void workflowTask() throws Exception { // Send for review Step1 -> Step2 WorkflowAction sendReview=new WorkflowAction(); sendReview.setId(UUIDGenerator.generateUuid()); + sendReview.setSchemeId(scheme.getId()); sendReview.setName("Send for review"); sendReview.setOrder(3); sendReview.setNextStep(step2.getId()); @@ -622,6 +625,7 @@ public void workflowTask() throws Exception { // reject Step2 -> Step1 WorkflowAction reject=new WorkflowAction(); reject.setId(UUIDGenerator.generateUuid()); + reject.setSchemeId(scheme.getId()); reject.setName("Reject"); reject.setOrder(1); reject.setNextStep(step1.getId()); @@ -639,6 +643,7 @@ public void workflowTask() throws Exception { // publish Step2 -> Step3 WorkflowAction publish=new WorkflowAction(); publish.setId(UUIDGenerator.generateUuid()); + publish.setSchemeId(scheme.getId()); publish.setName("Publish"); publish.setOrder(2); publish.setNextStep(step3.getId()); diff --git a/dotCMS/src/integration-test/resources/db-config.properties b/dotCMS/src/integration-test/resources/db-config.properties index 5834e3857c88..2e92d4d3f57c 100644 --- a/dotCMS/src/integration-test/resources/db-config.properties +++ b/dotCMS/src/integration-test/resources/db-config.properties @@ -1,11 +1,18 @@ #Postgres Connection -postgres.db.driver=org.postgresql.Driver -postgres.db.base.url=jdbc:postgresql://localhost/dotcms -postgres.db.username=postgres -postgres.db.password=postgres +#postgres.db.driver=org.postgresql.Driver +#postgres.db.base.url=jdbc:postgresql://localhost/dotcms +#postgres.db.username=postgres +#postgres.db.password=postgres +#postgres.db.max.total=60 +#postgres.db.max.idle=10 +postgres.db.driver=com.mysql.jdbc.Driver +postgres.db.base.url=jdbc:mysql://localhost:3306/dotcms42master?characterEncoding=UTF-8 +postgres.db.username=root +postgres.db.password= postgres.db.max.total=60 postgres.db.max.idle=10 + #MySQL Connection mysql.db.driver=com.mysql.jdbc.Driver mysql.db.base.url=jdbc:mysql://localhost/dotcms?characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=UTC diff --git a/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties b/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties index 2e1c4e10888b..7cda31349bc9 100755 --- a/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties +++ b/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties @@ -89,7 +89,7 @@ ELASTICSEARCH_USE_FILTERS_FOR_SEARCHING=true ## The name of your dotCMS cluster. Each dotCMS cluster ## should have a unique name (all servers in a cluster share the same name) -es.cluster.name=dotCMSContentIndex_3x +es.cluster.name=dotCMSContentIndexAlCarrer_3x ## Default settings #es.node.master=true @@ -137,12 +137,12 @@ es.query.bool.max_clause_count=10240 ## Paths to your esdata and to the logs ## You are going to want your index on a fast disk ## generally the es.path.data will match the config val for DYNAMIC_CONTENT_PATH -es.path.data=dotsecure/esdata -es.path.work=dotsecure/esdata/work -es.path.repo=dotsecure/esdata/essnapshot/snapshots +es.path.data=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure/esdata +es.path.work=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure/esdata/work +es.path.repo=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure/esdata/essnapshot/snapshots ## Where logs go -es.path.logs=tomcat/logs +es.path.logs=/Users/jsanca/gitsources/4.2/tomcat8/tomcat/logs ## This enables the http restful API for elasticsearch. Recommended to run ## this in a production enviroment with access limited to the port/ip address diff --git a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties index aab8ae6da420..af20573eda4d 100644 --- a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties +++ b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties @@ -15,13 +15,13 @@ DEFAULT_LANGUAGE_COUNTRY_CODE = US ## this aditional search is avoided DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE=false -## it is similar to DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE but only applies for Widgets +## it is similar to MULTILINGUAGE_FALLBACK but only applies for Widgets DEFAULT_WIDGET_TO_DEFAULT_LANGUAGE=true -## it is similar to DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE but only applies for Pages +## it is similar to MULTILINGUAGE_FALLBACK but only applies for Pages DEFAULT_PAGE_TO_DEFAULT_LANGUAGE=true -## it is similar to DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE but only applies for Files +## it is similar to MULTILINGUAGE_FALLBACK but only applies for Files DEFAULT_FILE_TO_DEFAULT_LANGUAGE = true @@ -50,7 +50,7 @@ ASSET_PATH = /assets ## shared folder in unix/linux enviroments we encourage you to use symbolic links ## If this variable is commented the system will work as usual using ## the ASSET_PATH variable as the assets directory inside liferay web root -ASSET_REAL_PATH = /tomcat8/webapps/ROOT/assets +ASSET_REAL_PATH = /Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/assets ## This variable should be used if the dynamic content is to be placed outside of the web application. By the default, the location ## is in dotCMS/dotsecure. If running as war inside an application server, it is important to move this data to a location @@ -107,7 +107,7 @@ SHOW_VELOCITYFILES=false LOG_VELOCITY_TEMPLATES=false VELOCITY_PAGE_EXTENSION = html -VELOCITY_ROOT = /WEB-INF/velocity +VELOCITY_ROOT = /Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/WEB-INF/velocity VELOCITY_HTMLPAGE_EXTENSION = dotpage VELOCITY_HOST_EXTENSION= host VELOCITY_INCLUDE_EXTENSION = vtl @@ -735,7 +735,7 @@ CONTENT_ESCAPE_HTML_TEXT=true ##SALESFORCE INTEGRATION. THESE VARIABLES ARE REQUIRED #SALESFORCE_LOGIN_FILTER_ON=true -DYNAMIC_CONTENT_PATH=/tomcat8/webapps/ROOT/dotsecure +DYNAMIC_CONTENT_PATH=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure ## SALESFORCE URL FOR REQUESTING ACCESS TOKEN #salesforce_token_request_url=https://test.salesforce.com/services/oauth2/token @@ -822,9 +822,9 @@ api.system.ruleengine.actionlet.VisitorTagsActionlet.MAX_TAGS=20 #GOOGLE_TRANSLATE_SERVICE_API_KEY=put-your-key-here ## Path to the toolbox.xml file -#TOOLBOX_MANAGER_PATH=/webapps/ROOT/WEB-INF/toolbox.xml +TOOLBOX_MANAGER_PATH=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/WEB-INF/toolbox.xml ## Path to felix folder #context.path.felix=/webapps/ROOT/WEB-INF/felix -#felix.base.dir=/webapps/ROOT/WEB-INF/felix +felix.base.dir=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/WEB-INF/felix diff --git a/dotCMS/src/main/enterprise b/dotCMS/src/main/enterprise index 0a76a5f84e53..4ccfa3991dc7 160000 --- a/dotCMS/src/main/enterprise +++ b/dotCMS/src/main/enterprise @@ -1 +1 @@ -Subproject commit 0a76a5f84e533f5de6e1bbf012f26049cb91fe4b +Subproject commit 4ccfa3991dc78c015fa5688bdda2e90b49bf24d5 diff --git a/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties b/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties index e69de29bb2d1..68b2fb69cee3 100644 --- a/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties +++ b/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties @@ -0,0 +1 @@ +DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE=true \ No newline at end of file diff --git a/dotCMS/src/main/resources/dotcms-config-cluster.properties b/dotCMS/src/main/resources/dotcms-config-cluster.properties index 2c114283aa01..06ffa38f7842 100755 --- a/dotCMS/src/main/resources/dotcms-config-cluster.properties +++ b/dotCMS/src/main/resources/dotcms-config-cluster.properties @@ -95,7 +95,7 @@ ELASTICSEARCH_USE_FILTERS_FOR_SEARCHING=true ## The name of your dotCMS cluster. Each dotCMS cluster ## should have a unique name (all servers in a cluster share the same name) -es.cluster.name=dotCMSContentIndex_3x +es.cluster.name=dotCMSContentIndexAlCarrer_3x ## Default settings #es.node.master=true diff --git a/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml b/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml index f767472bdbbf..ea8628a7493a 100644 --- a/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml +++ b/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml @@ -21,7 +21,6 @@ %-5level %d %c:%M(%L): %m%n %-5level %d %c:%M(%L): %m%n [%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %c{2}: %m%n - [%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %m - %X{EndpointName} %X{BundleId} %n @@ -115,7 +114,7 @@ - + @@ -207,5 +206,11 @@ + + + + + + diff --git a/dotCMS/src/main/webapp/WEB-INF/web.xml b/dotCMS/src/main/webapp/WEB-INF/web.xml index 8a8bf2cba036..168293de321e 100644 --- a/dotCMS/src/main/webapp/WEB-INF/web.xml +++ b/dotCMS/src/main/webapp/WEB-INF/web.xml @@ -189,9 +189,9 @@ com.dotcms.listeners.RegisterMBeansListener - + From 5ab4a08bc8cef9442666b5c83b07e1e4b9419dab Mon Sep 17 00:00:00 2001 From: Oswaldo Gallango Date: Fri, 8 Dec 2017 16:53:48 -0500 Subject: [PATCH 2/6] solving issue with content resource test --- .../java/com/dotcms/rest/ContentResourceTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java b/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java index 1a488b4184ac..5135bdccd1d7 100644 --- a/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java +++ b/dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java @@ -583,8 +583,9 @@ public void workflowTask() throws Exception { saveDraft.getId(), APILocator.getRoleAPI().loadCMSAnonymousRole().getId(), PermissionAPI.PERMISSION_USE) })); + APILocator.getWorkflowAPI().saveAction(saveDraft.getId(), step1.getId(),user); - // Save as Draft Step1 -> Step1 + // Save as Draft Step1 -> Step1 WorkflowAction escalate=new WorkflowAction(); escalate.setId(UUIDGenerator.generateUuid()); escalate.setSchemeId(scheme.getId()); @@ -603,6 +604,11 @@ public void workflowTask() throws Exception { escalate.getId(), APILocator.getRoleAPI().loadCMSAnonymousRole().getId(), PermissionAPI.PERMISSION_USE) })); + APILocator.getWorkflowAPI().saveAction(escalate.getId(), step1.getId(),user); + + //Set mandatory workflow default action + scheme.setEntryActionId(saveDraft.getId()); + APILocator.getWorkflowAPI().saveScheme(scheme); // Send for review Step1 -> Step2 WorkflowAction sendReview=new WorkflowAction(); @@ -621,6 +627,7 @@ public void workflowTask() throws Exception { sendReview.getId(), APILocator.getRoleAPI().loadCMSAnonymousRole().getId(), PermissionAPI.PERMISSION_USE) })); + APILocator.getWorkflowAPI().saveAction(sendReview.getId(), step1.getId(),user); // reject Step2 -> Step1 WorkflowAction reject=new WorkflowAction(); @@ -639,6 +646,7 @@ public void workflowTask() throws Exception { reject.getId(), APILocator.getRoleAPI().loadCMSAnonymousRole().getId(), PermissionAPI.PERMISSION_USE) })); + APILocator.getWorkflowAPI().saveAction(sendReview.getId(), step2.getId(),user); // publish Step2 -> Step3 WorkflowAction publish=new WorkflowAction(); @@ -657,6 +665,8 @@ public void workflowTask() throws Exception { publish.getId(), APILocator.getRoleAPI().loadCMSAnonymousRole().getId(), PermissionAPI.PERMISSION_USE) })); + APILocator.getWorkflowAPI().saveAction(publish.getId(), step2.getId(),user); + WorkflowActionClass publishlet=new WorkflowActionClass(); publishlet.setActionId(publish.getId()); publishlet.setClazz(com.dotmarketing.portlets.workflows.actionlet.PublishContentActionlet.class.getCanonicalName()); From 694375b2906670303ee35750ff64c563b3fbeab6 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 11 Dec 2017 08:57:06 -0600 Subject: [PATCH 3/6] Fixing the Task04305UpdateWorkflowActionTable --- .../Task04305UpdateWorkflowActionTable.java | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) 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 72c42eca0adc..60c9440c5621 100644 --- a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04305UpdateWorkflowActionTable.java +++ b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task04305UpdateWorkflowActionTable.java @@ -3,11 +3,13 @@ import com.dotcms.repackage.org.apache.commons.lang.StringUtils; 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.portlets.workflows.model.WorkflowAction; import com.dotmarketing.startup.StartupTask; import com.dotmarketing.util.Logger; + import java.sql.SQLException; import java.util.List; import java.util.Map; @@ -53,10 +55,10 @@ public class Task04305UpdateWorkflowActionTable implements StartupTask { private static final String MSSQL_FIND_SCHEME_ID_COLUMN = "SELECT scheme_id FROM workflow_action"; private static final String ORACLE_FIND_SCHEME_ID_COLUMN = "SELECT scheme_id FROM workflow_action"; - private static final String MYSQL_ADD_SCHEME_ID_COLUMN = "ALTER TABLE workflow_action ADD scheme_id VARCHAR(36) NOT NULL"; + private static final String MYSQL_ADD_SCHEME_ID_COLUMN = "ALTER TABLE workflow_action ADD scheme_id VARCHAR(36)"; private static final String POSTGRES_ADD_SCHEME_ID_COLUMN = MYSQL_ADD_SCHEME_ID_COLUMN; - private static final String MSSQL_ADD_SCHEME_ID_COLUMN = "ALTER TABLE workflow_action ADD scheme_id NVARCHAR(36) NOT NULL"; - private static final String ORACLE_ADD_SCHEME_ID_COLUMN = "ALTER TABLE workflow_action ADD scheme_id varchar2(36) NOT NULL"; + private static final String MSSQL_ADD_SCHEME_ID_COLUMN = "ALTER TABLE workflow_action ADD scheme_id NVARCHAR(36)"; + private static final String ORACLE_ADD_SCHEME_ID_COLUMN = "ALTER TABLE workflow_action ADD scheme_id varchar2(36)"; private static final String MYSQL_ADD_REQUIRES_CHECKOUT_OPTION_COLUMN = "ALTER TABLE workflow_action ADD requires_checkout_option VARCHAR(16) default 'both'"; private static final String POSTGRES_ADD_REQUIRES_CHECKOUT_OPTION_COLUMN = "ALTER TABLE workflow_action ADD requires_checkout_option VARCHAR(16) default 'both'"; @@ -258,12 +260,16 @@ private void addSchemeIdColumn(final DotConnect dc) throws DotDataException { Logger.info(this, "Column 'workflow_action.scheme_id' does not exists, creating it"); needToCreate = true; + // in some databases if an error is throw the transaction is not longer valid + this.closeAndStartTransaction(); } if (needToCreate) { try { dc.executeStatement(addSchemeIdColumn()); } catch (SQLException e) { throw new DotRuntimeException("The 'scheme_id' column could not be created.", e); + } finally { + this.closeCommitAndStartTransaction(); } } } // addSchemeIdColumn. @@ -280,27 +286,44 @@ private void createWorkflowActionStepTable(final DotConnect dc) throws DotDataEx Logger.info(this, "Table 'workflow_action_step' does not exists, creating it"); needToCreate = true; + // in some databases if an error is throw the transaction is not longer valid + this.closeAndStartTransaction(); } if (needToCreate) { try { - dc.executeStatement(createIntermediateTable()); + dc.setSQL(createIntermediateTable()).loadResult(); // The SQL Server and Oracle table definition already include de PK creation if (DbConnectionFactory.isMySql() || DbConnectionFactory.isPostgres()) { - dc.executeStatement(createIntermediateTablePk()); + dc.setSQL(createIntermediateTablePk()).loadResult(); } // adding the FK Logger.info(this, "Creating the Workflow action step intermediate FKs."); - dc.executeStatement(this.createIntermediateTableForeignKeyActionId()); - dc.executeStatement(this.createIntermediateTableForeignKeyStepId()); - } catch (SQLException e) { + dc.setSQL(this.createIntermediateTableForeignKeyActionId()).loadResult(); + dc.setSQL(this.createIntermediateTableForeignKeyStepId()).loadResult(); + } catch (Exception e) { throw new DotRuntimeException( "The 'workflow_action_step' table could not be created.", e); + } finally { + this.closeCommitAndStartTransaction(); } } } // createWorkflowActionStepTable. + private void closeCommitAndStartTransaction() throws DotHibernateException { + if (DbConnectionFactory.inTransaction()) { + HibernateUtil.closeAndCommitTransaction(); + HibernateUtil.startTransaction(); + } + } + + private void closeAndStartTransaction() throws DotHibernateException { + + HibernateUtil.closeSessionSilently(); + HibernateUtil.startTransaction(); + } + private boolean isLocked(final Object requiresCheckout) { boolean isLocked = false; From 62e431748ee82606798d63d6d62b7c0eea4a396b Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 11 Dec 2017 09:08:03 -0600 Subject: [PATCH 4/6] Reverting to master configuration --- .../resources/db-config.properties | 15 +- .../it-dotcms-config-cluster.properties | 12 +- .../it-dotmarketing-config.properties | 33 +- .../conf/dotmarketing-config-ext.properties | 1 - .../dotcms-config-cluster.properties | 4 +- .../src/main/webapp/WEB-INF/log4j/log4j2.xml | 11 +- dotCMS/src/main/webapp/WEB-INF/web.xml | 468 +++++++++--------- 7 files changed, 265 insertions(+), 279 deletions(-) diff --git a/dotCMS/src/integration-test/resources/db-config.properties b/dotCMS/src/integration-test/resources/db-config.properties index 2e92d4d3f57c..5834e3857c88 100644 --- a/dotCMS/src/integration-test/resources/db-config.properties +++ b/dotCMS/src/integration-test/resources/db-config.properties @@ -1,18 +1,11 @@ #Postgres Connection -#postgres.db.driver=org.postgresql.Driver -#postgres.db.base.url=jdbc:postgresql://localhost/dotcms -#postgres.db.username=postgres -#postgres.db.password=postgres -#postgres.db.max.total=60 -#postgres.db.max.idle=10 -postgres.db.driver=com.mysql.jdbc.Driver -postgres.db.base.url=jdbc:mysql://localhost:3306/dotcms42master?characterEncoding=UTF-8 -postgres.db.username=root -postgres.db.password= +postgres.db.driver=org.postgresql.Driver +postgres.db.base.url=jdbc:postgresql://localhost/dotcms +postgres.db.username=postgres +postgres.db.password=postgres postgres.db.max.total=60 postgres.db.max.idle=10 - #MySQL Connection mysql.db.driver=com.mysql.jdbc.Driver mysql.db.base.url=jdbc:mysql://localhost/dotcms?characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=UTC diff --git a/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties b/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties index 7cda31349bc9..49dc445feaad 100755 --- a/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties +++ b/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties @@ -89,7 +89,7 @@ ELASTICSEARCH_USE_FILTERS_FOR_SEARCHING=true ## The name of your dotCMS cluster. Each dotCMS cluster ## should have a unique name (all servers in a cluster share the same name) -es.cluster.name=dotCMSContentIndexAlCarrer_3x +es.cluster.name=dotCMSContentIndex_3x ## Default settings #es.node.master=true @@ -137,12 +137,12 @@ es.query.bool.max_clause_count=10240 ## Paths to your esdata and to the logs ## You are going to want your index on a fast disk ## generally the es.path.data will match the config val for DYNAMIC_CONTENT_PATH -es.path.data=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure/esdata -es.path.work=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure/esdata/work -es.path.repo=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure/esdata/essnapshot/snapshots +es.path.data=dotsecure/esdata +es.path.work=dotsecure/esdata/work +es.path.repo=dotsecure/esdata/essnapshot/snapshots ## Where logs go -es.path.logs=/Users/jsanca/gitsources/4.2/tomcat8/tomcat/logs +es.path.logs=tomcat/logs ## This enables the http restful API for elasticsearch. Recommended to run ## this in a production enviroment with access limited to the port/ip address @@ -171,4 +171,4 @@ es.script.disable_dynamic=false ## These lines should be last to allow plugins to override values - touche pas! ## BEGIN PLUGINS -## END PLUGINS +## END PLUGINS \ No newline at end of file diff --git a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties index af20573eda4d..51706aa88b1a 100644 --- a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties +++ b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties @@ -15,13 +15,13 @@ DEFAULT_LANGUAGE_COUNTRY_CODE = US ## this aditional search is avoided DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE=false -## it is similar to MULTILINGUAGE_FALLBACK but only applies for Widgets +## it is similar to DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE but only applies for Widgets DEFAULT_WIDGET_TO_DEFAULT_LANGUAGE=true -## it is similar to MULTILINGUAGE_FALLBACK but only applies for Pages +## it is similar to DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE but only applies for Pages DEFAULT_PAGE_TO_DEFAULT_LANGUAGE=true -## it is similar to MULTILINGUAGE_FALLBACK but only applies for Files +## it is similar to DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE but only applies for Files DEFAULT_FILE_TO_DEFAULT_LANGUAGE = true @@ -50,7 +50,7 @@ ASSET_PATH = /assets ## shared folder in unix/linux enviroments we encourage you to use symbolic links ## If this variable is commented the system will work as usual using ## the ASSET_PATH variable as the assets directory inside liferay web root -ASSET_REAL_PATH = /Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/assets +ASSET_REAL_PATH = /tomcat8/webapps/ROOT/assets ## This variable should be used if the dynamic content is to be placed outside of the web application. By the default, the location ## is in dotCMS/dotsecure. If running as war inside an application server, it is important to move this data to a location @@ -107,7 +107,7 @@ SHOW_VELOCITYFILES=false LOG_VELOCITY_TEMPLATES=false VELOCITY_PAGE_EXTENSION = html -VELOCITY_ROOT = /Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/WEB-INF/velocity +VELOCITY_ROOT = /WEB-INF/velocity VELOCITY_HTMLPAGE_EXTENSION = dotpage VELOCITY_HOST_EXTENSION= host VELOCITY_INCLUDE_EXTENSION = vtl @@ -661,8 +661,8 @@ PUSH_PUBLISHING_PUSH_ALL_FOLDER_PAGES=false #ID of the user whom workflow action next assign will be set to IF the received user role does NOT exist on this side PUSH_PUBLISHING_WORKFLOW_ACTION_NEXT_ASSIGN_DEFAULT_USER=dotcms.org.1 -# If true, the Rules coming from pushing a Site (Host) or a Content Page will overwrite the existing Rules in the destination -# end point (i.e., deleting the existing Rules and adding the ones in the pushed bundle). Otherwise, existing Rules will be +# If true, the Rules coming from pushing a Site (Host) or a Content Page will overwrite the existing Rules in the destination +# end point (i.e., deleting the existing Rules and adding the ones in the pushed bundle). Otherwise, existing Rules will be # left as they are (or updated if required), and new rules will be added PUSH_PUBLISHING_RULES_OVERWRITE=true @@ -692,8 +692,8 @@ PUSH_PUBLISHING_PAGE_LIMIT=25 # COOKIES -## In order to set the httpOnly flag of the JSESSIONID cookie, you need to add the attribute useHttpOnly="true" -## to the Context tag of the tomcat/conf/context.xml. If using different app servers/containers you can consult their documentation. +## In order to set the httpOnly flag of the JSESSIONID cookie, you need to add the attribute useHttpOnly="true" +## to the Context tag of the tomcat/conf/context.xml. If using different app servers/containers you can consult their documentation. ## For reference see https://www.owasp.org/index.php/HttpOnly COOKIES_HTTP_ONLY=false # values: never|always|https @@ -735,7 +735,7 @@ CONTENT_ESCAPE_HTML_TEXT=true ##SALESFORCE INTEGRATION. THESE VARIABLES ARE REQUIRED #SALESFORCE_LOGIN_FILTER_ON=true -DYNAMIC_CONTENT_PATH=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/dotsecure +DYNAMIC_CONTENT_PATH=/tomcat8/webapps/ROOT/dotsecure ## SALESFORCE URL FOR REQUESTING ACCESS TOKEN #salesforce_token_request_url=https://test.salesforce.com/services/oauth2/token @@ -803,16 +803,16 @@ DISABLE_EXTERNAL_REFERERS=false CMS_INDEX_PAGE = index ## MySQL System Variables -## Newer versions of MySQL will only recognize "default_storage_engine" instead -## of the old "storage_engine" variable, which was deprecated as of version 5.5.3 +## Newer versions of MySQL will only recognize "default_storage_engine" instead +## of the old "storage_engine" variable, which was deprecated as of version 5.5.3 ## and became invalid as of version 5.7.5 mysql_storage_engine_varname=default_storage_engine -## GeoIP2 DB Path Override (absolute path) (defaults to : +## GeoIP2 DB Path Override (absolute path) (defaults to : ## $TOMCAT_HOME/webapps/ROOT/WEB-INF/geoip2/GeoLite2-City.mmdb) #GEOIP2_CITY_DATABASE_PATH_OVERRIDE= -## Rules engine maximun execution time in ms this property allow to find any rules that +## Rules engine maximun execution time in ms this property allow to find any rules that ## are running slower than expected, so we can manage the performance of the dotCMS server. SLOW_RULE_LOG_MIN=100 ## Actionlets @@ -822,9 +822,8 @@ api.system.ruleengine.actionlet.VisitorTagsActionlet.MAX_TAGS=20 #GOOGLE_TRANSLATE_SERVICE_API_KEY=put-your-key-here ## Path to the toolbox.xml file -TOOLBOX_MANAGER_PATH=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/WEB-INF/toolbox.xml +#TOOLBOX_MANAGER_PATH=/webapps/ROOT/WEB-INF/toolbox.xml ## Path to felix folder #context.path.felix=/webapps/ROOT/WEB-INF/felix -felix.base.dir=/Users/jsanca/gitsources/4.2/tomcat8/webapps/ROOT/WEB-INF/felix - +#felix.base.dir=/webapps/ROOT/WEB-INF/felix diff --git a/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties b/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties index 68b2fb69cee3..e69de29bb2d1 100644 --- a/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties +++ b/dotCMS/src/main/plugins/com.dotcms.config/conf/dotmarketing-config-ext.properties @@ -1 +0,0 @@ -DEFAULT_CONTENT_TO_DEFAULT_LANGUAGE=true \ No newline at end of file diff --git a/dotCMS/src/main/resources/dotcms-config-cluster.properties b/dotCMS/src/main/resources/dotcms-config-cluster.properties index 06ffa38f7842..3693b194c30e 100755 --- a/dotCMS/src/main/resources/dotcms-config-cluster.properties +++ b/dotCMS/src/main/resources/dotcms-config-cluster.properties @@ -95,7 +95,7 @@ ELASTICSEARCH_USE_FILTERS_FOR_SEARCHING=true ## The name of your dotCMS cluster. Each dotCMS cluster ## should have a unique name (all servers in a cluster share the same name) -es.cluster.name=dotCMSContentIndexAlCarrer_3x +es.cluster.name=dotCMSContentIndex_3x ## Default settings #es.node.master=true @@ -185,4 +185,4 @@ es.script.groovy.sandbox.enabled=false ## These lines should be last to allow plugins to override values - touche pas! ## BEGIN PLUGINS -## END PLUGINS +## END PLUGINS \ No newline at end of file diff --git a/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml b/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml index ea8628a7493a..f1a7d23c2964 100644 --- a/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml +++ b/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml @@ -21,6 +21,7 @@ %-5level %d %c:%M(%L): %m%n %-5level %d %c:%M(%L): %m%n [%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %c{2}: %m%n + [%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %m - %X{EndpointName} %X{BundleId} %n @@ -114,7 +115,7 @@ - + @@ -206,11 +207,5 @@ - - - - - - - + \ No newline at end of file diff --git a/dotCMS/src/main/webapp/WEB-INF/web.xml b/dotCMS/src/main/webapp/WEB-INF/web.xml index 168293de321e..0d97178ac6e9 100644 --- a/dotCMS/src/main/webapp/WEB-INF/web.xml +++ b/dotCMS/src/main/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" metadata-complete="true"> - dotCMS + dotCMS @@ -16,32 +16,32 @@ - + CookiesFilter com.dotmarketing.filters.CookiesFilter true - + ThreadNameFilter com.dotmarketing.filters.ThreadNameFilter true - + CharsetEncodingFilter com.dotmarketing.filters.CharsetEncodingFilter true - + - TimeMachineFilter + TimeMachineFilter com.dotmarketing.filters.TimeMachineFilter true - + FixCmisFilter com.dotmarketing.filters.FixCmis.FixCmisFilter @@ -61,13 +61,13 @@ com.dotmarketing.filters.CMSFilter true - + AutoLoginFilter com.dotmarketing.filters.AutoLoginFilter true - + LoginRequiredFilter com.dotmarketing.filters.LoginRequiredFilter @@ -81,63 +81,63 @@ main.servlet. - - - UrlRewriteFilter - com.dotmarketing.filters.DotUrlRewriteFilter + + + UrlRewriteFilter + com.dotmarketing.filters.DotUrlRewriteFilter true - + - - + + - + - - + + CharsetEncodingFilter /* - + CookiesFilter /* - + ThreadNameFilter /* - + TimeMachineFilter /* - + FixCmisFilter /cmis - - - UrlRewriteFilter - /* - - - - VanityURLFilter - /* - - + + + UrlRewriteFilter + /* + + + + VanityURLFilter + /* + + URLMapFilter /* - + AutoLoginFilter /* @@ -155,46 +155,46 @@ /c/* - - + + - - - + + + com.dotmarketing.listeners.ContextLifecycleListener - com.dotmarketing.listeners.ClickstreamListener + com.dotmarketing.listeners.ClickstreamListener com.dotmarketing.listeners.OsgiFelixListener - - org.apache.felix.http.proxy.impl.ProxyServletContextListener - - + + org.apache.felix.http.proxy.impl.ProxyServletContextListener + + com.dotcms.repackage.org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener - - com.dotcms.listeners.SessionMonitor - - - ImageIO service provider loader/unloader - com.twelvemonkeys.servlet.image.IIOProviderContextListener - + + com.dotcms.listeners.SessionMonitor + + + ImageIO service provider loader/unloader + com.twelvemonkeys.servlet.image.IIOProviderContextListener + com.dotcms.listeners.RegisterMBeansListener - + + com.dotmarketing.listeners.HibernateSessionsListener + - - + + @@ -207,19 +207,19 @@ 98 - + Init com.dotmarketing.servlets.InitServlet 8 - + VelocityServlet com.dotmarketing.velocity.ClientVelocityServlet 10 - + SpeedyAssetServlet com.dotmarketing.servlets.SpeedyAssetServlet @@ -229,42 +229,42 @@ com.dotmarketing.servlets.ShortyServlet - AjaxFileUploadServlet - com.dotmarketing.servlets.AjaxFileUploadServlet - - + AjaxFileUploadServlet + com.dotmarketing.servlets.AjaxFileUploadServlet + + CategoriesServlet com.dotmarketing.servlets.JSONCategoriesServlet - + login_edit_mode com.dotmarketing.servlets.LoginEditModeServlet - + TailLogServlet com.dotmarketing.servlets.taillog.TailLogServlet - + - dwr-invoker - com.dotmarketing.servlets.DwrWrapperServlet - - debug - false - - - compressor - none - - - crossDomainSessionSecurity - false - + dwr-invoker + com.dotmarketing.servlets.DwrWrapperServlet + + debug + false + + + compressor + none + + + crossDomainSessionSecurity + false + - + InitServlet com.liferay.portal.servlet.InitServlet @@ -275,7 +275,7 @@ com.dotmarketing.servlets.image.ImageToolAjaxServlet 1 - + MainServlet com.liferay.portal.servlet.MainServlet @@ -301,7 +301,7 @@ 2 - + ImageServlet com.liferay.portal.servlet.ImageServlet @@ -311,11 +311,11 @@ WebDav com.dotcms.repackage.com.bradmcevoy.http.MiltonServlet - resource.factory.class - com.dotmarketing.webdav.ResourceFactorytImpl + resource.factory.class + com.dotmarketing.webdav.ResourceFactorytImpl - + CMIS com.dotcms.repackage.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet @@ -325,7 +325,7 @@ 2 - + ScheduledJobs com.dotmarketing.servlets.RunScheduledJobServlet @@ -333,33 +333,33 @@ BinaryExporterServlet com.dotmarketing.servlets.BinaryExporterServlet - 100 + 100 - + AjaxDirector com.dotmarketing.servlets.ajax.AjaxDirectorServlet - - + + JSONTagsServlet com.dotmarketing.servlets.JSONTagsServlet - - springmvc - org.springframework.web.servlet.DispatcherServlet - - - - CSSPreProcessServlet - com.dotcms.csspreproc.CSSPreProcessServlet - - - - + + springmvc + org.springframework.web.servlet.DispatcherServlet + + + + CSSPreProcessServlet + com.dotcms.csspreproc.CSSPreProcessServlet + + + + RESTAPI - com.dotcms.rest.servlet.ReloadableServletContainer + com.dotcms.rest.servlet.ReloadableServletContainer jersey.config.server.mediaTypeMappings @@ -368,108 +368,108 @@ 1 true - - - proxy - com.dotmarketing.osgi.OSGIProxyServlet - 20 - - - + + + proxy + com.dotmarketing.osgi.OSGIProxyServlet + 20 + + + XMLSitemapServlet com.dotcms.xmlsitemap.XMLSitemapServlet - - - PreviewDesignTemplateServlet - com.dotmarketing.portlets.templates.design.servlets.PreviewDesignTemplateServlet - - + + + PreviewDesignTemplateServlet + com.dotmarketing.portlets.templates.design.servlets.PreviewDesignTemplateServlet + + - - + + - - - - + + + - - - - proxy - /app/* - - - - springmvc - /spring/* - - - - CSSPreProcessServlet - /DOTLESS/* - - - - CSSPreProcessServlet - /DOTSASS/* - - - - AjaxDirector - /DotAjaxDirector/* - - - login_edit_mode - /edit/* - - - - ImageToolAjaxServlet - /servlet/dotImageToolAjax - - - - ImageToolAjaxServlet - /servlet/dotImageToolAjax/* - - - - login_edit_mode - /admin/* - - - - login_edit_mode - /edit - - - - login_edit_mode - /admin - - + END OF TEST FRAMEWORK SERVLETS --> + + + + proxy + /app/* + + + + springmvc + /spring/* + + + + CSSPreProcessServlet + /DOTLESS/* + + + + CSSPreProcessServlet + /DOTSASS/* + + + + AjaxDirector + /DotAjaxDirector/* + + + login_edit_mode + /edit/* + + + + ImageToolAjaxServlet + /servlet/dotImageToolAjax + + + + ImageToolAjaxServlet + /servlet/dotImageToolAjax/* + + + + login_edit_mode + /admin/* + + + + login_edit_mode + /edit + + + + login_edit_mode + /admin + + ScheduledJobs /dotScheduledJobs - + TailLogServlet /dotTailLogServlet/* - + CMIS /cmis/* @@ -491,9 +491,9 @@ /webdav/working/* - AjaxFileUploadServlet - /servlets/ajax_file_upload - + AjaxFileUploadServlet + /servlets/ajax_file_upload + VelocityServlet /servlets/VelocityServlet @@ -506,12 +506,12 @@ ShortyServlet /dA/* - + - dwr-invoker - /dwr/* + dwr-invoker + /dwr/* - + MainServlet /c/* @@ -524,112 +524,112 @@ MainServlet /dotAdmin/c/* - + ImageServlet /image/* - - BinaryExporterServlet - /contentAsset/* + + BinaryExporterServlet + /contentAsset/* - + CategoriesServlet /categoriesServlet - + JSONTagsServlet /JSONTags/* - + RESTAPI /api/* - + XMLSitemapServlet /sitemap_index.xml - + PreviewDesignTemplateServlet /servlets/template/design/preview - + - - + + 30 - + vtl text/velocity - + xsl application/xml - + sass text/plain - + - scss - text/plain - - + scss + text/plain + + less text/plain - + index.html index.jsp - + - 404 - /html/error/custom-error-page.jsp + 404 + /html/error/custom-error-page.jsp - + - 401 - /html/error/custom-error-page.jsp + 401 + /html/error/custom-error-page.jsp - + - 403 - /html/error/custom-error-page.jsp + 403 + /html/error/custom-error-page.jsp - + - 500 - /html/error/custom-error-page.jsp + 500 + /html/error/custom-error-page.jsp - + - 503 - /html/error/custom-error-page.jsp + 503 + /html/error/custom-error-page.jsp - + *.jsp true - + Secure area @@ -640,9 +640,9 @@ - + - - - + + + \ No newline at end of file From 2eb28b60b96e469cb2018f8da153604f43df7c18 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 11 Dec 2017 11:02:25 -0600 Subject: [PATCH 5/6] reverts of configuration --- .../it-dotcms-config-cluster.properties | 2 +- .../it-dotmarketing-config.properties | 17 +- .../dotcms-config-cluster.properties | 2 +- .../src/main/webapp/WEB-INF/log4j/log4j2.xml | 2 +- dotCMS/src/main/webapp/WEB-INF/web.xml | 464 +++++++++--------- 5 files changed, 244 insertions(+), 243 deletions(-) diff --git a/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties b/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties index 49dc445feaad..2e1c4e10888b 100755 --- a/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties +++ b/dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties @@ -171,4 +171,4 @@ es.script.disable_dynamic=false ## These lines should be last to allow plugins to override values - touche pas! ## BEGIN PLUGINS -## END PLUGINS \ No newline at end of file +## END PLUGINS diff --git a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties index 51706aa88b1a..aab8ae6da420 100644 --- a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties +++ b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties @@ -661,8 +661,8 @@ PUSH_PUBLISHING_PUSH_ALL_FOLDER_PAGES=false #ID of the user whom workflow action next assign will be set to IF the received user role does NOT exist on this side PUSH_PUBLISHING_WORKFLOW_ACTION_NEXT_ASSIGN_DEFAULT_USER=dotcms.org.1 -# If true, the Rules coming from pushing a Site (Host) or a Content Page will overwrite the existing Rules in the destination -# end point (i.e., deleting the existing Rules and adding the ones in the pushed bundle). Otherwise, existing Rules will be +# If true, the Rules coming from pushing a Site (Host) or a Content Page will overwrite the existing Rules in the destination +# end point (i.e., deleting the existing Rules and adding the ones in the pushed bundle). Otherwise, existing Rules will be # left as they are (or updated if required), and new rules will be added PUSH_PUBLISHING_RULES_OVERWRITE=true @@ -692,8 +692,8 @@ PUSH_PUBLISHING_PAGE_LIMIT=25 # COOKIES -## In order to set the httpOnly flag of the JSESSIONID cookie, you need to add the attribute useHttpOnly="true" -## to the Context tag of the tomcat/conf/context.xml. If using different app servers/containers you can consult their documentation. +## In order to set the httpOnly flag of the JSESSIONID cookie, you need to add the attribute useHttpOnly="true" +## to the Context tag of the tomcat/conf/context.xml. If using different app servers/containers you can consult their documentation. ## For reference see https://www.owasp.org/index.php/HttpOnly COOKIES_HTTP_ONLY=false # values: never|always|https @@ -803,16 +803,16 @@ DISABLE_EXTERNAL_REFERERS=false CMS_INDEX_PAGE = index ## MySQL System Variables -## Newer versions of MySQL will only recognize "default_storage_engine" instead -## of the old "storage_engine" variable, which was deprecated as of version 5.5.3 +## Newer versions of MySQL will only recognize "default_storage_engine" instead +## of the old "storage_engine" variable, which was deprecated as of version 5.5.3 ## and became invalid as of version 5.7.5 mysql_storage_engine_varname=default_storage_engine -## GeoIP2 DB Path Override (absolute path) (defaults to : +## GeoIP2 DB Path Override (absolute path) (defaults to : ## $TOMCAT_HOME/webapps/ROOT/WEB-INF/geoip2/GeoLite2-City.mmdb) #GEOIP2_CITY_DATABASE_PATH_OVERRIDE= -## Rules engine maximun execution time in ms this property allow to find any rules that +## Rules engine maximun execution time in ms this property allow to find any rules that ## are running slower than expected, so we can manage the performance of the dotCMS server. SLOW_RULE_LOG_MIN=100 ## Actionlets @@ -827,3 +827,4 @@ api.system.ruleengine.actionlet.VisitorTagsActionlet.MAX_TAGS=20 ## Path to felix folder #context.path.felix=/webapps/ROOT/WEB-INF/felix #felix.base.dir=/webapps/ROOT/WEB-INF/felix + diff --git a/dotCMS/src/main/resources/dotcms-config-cluster.properties b/dotCMS/src/main/resources/dotcms-config-cluster.properties index 3693b194c30e..2c114283aa01 100755 --- a/dotCMS/src/main/resources/dotcms-config-cluster.properties +++ b/dotCMS/src/main/resources/dotcms-config-cluster.properties @@ -185,4 +185,4 @@ es.script.groovy.sandbox.enabled=false ## These lines should be last to allow plugins to override values - touche pas! ## BEGIN PLUGINS -## END PLUGINS \ No newline at end of file +## END PLUGINS diff --git a/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml b/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml index f1a7d23c2964..f767472bdbbf 100644 --- a/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml +++ b/dotCMS/src/main/webapp/WEB-INF/log4j/log4j2.xml @@ -208,4 +208,4 @@ - \ No newline at end of file + diff --git a/dotCMS/src/main/webapp/WEB-INF/web.xml b/dotCMS/src/main/webapp/WEB-INF/web.xml index 0d97178ac6e9..8a8bf2cba036 100644 --- a/dotCMS/src/main/webapp/WEB-INF/web.xml +++ b/dotCMS/src/main/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" metadata-complete="true"> - dotCMS + dotCMS @@ -16,32 +16,32 @@ - + CookiesFilter com.dotmarketing.filters.CookiesFilter true - + ThreadNameFilter com.dotmarketing.filters.ThreadNameFilter true - + CharsetEncodingFilter com.dotmarketing.filters.CharsetEncodingFilter true - + - TimeMachineFilter + TimeMachineFilter com.dotmarketing.filters.TimeMachineFilter true - + FixCmisFilter com.dotmarketing.filters.FixCmis.FixCmisFilter @@ -61,13 +61,13 @@ com.dotmarketing.filters.CMSFilter true - + AutoLoginFilter com.dotmarketing.filters.AutoLoginFilter true - + LoginRequiredFilter com.dotmarketing.filters.LoginRequiredFilter @@ -81,63 +81,63 @@ main.servlet. - - - UrlRewriteFilter - com.dotmarketing.filters.DotUrlRewriteFilter + + + UrlRewriteFilter + com.dotmarketing.filters.DotUrlRewriteFilter true - + - - + + - + - - + + CharsetEncodingFilter /* - + CookiesFilter /* - + ThreadNameFilter /* - + TimeMachineFilter /* - + FixCmisFilter /cmis - - - UrlRewriteFilter - /* - - - - VanityURLFilter - /* - - + + + UrlRewriteFilter + /* + + + + VanityURLFilter + /* + + URLMapFilter /* - + AutoLoginFilter /* @@ -155,46 +155,46 @@ /c/* - - + + - - - + + + com.dotmarketing.listeners.ContextLifecycleListener - com.dotmarketing.listeners.ClickstreamListener + com.dotmarketing.listeners.ClickstreamListener com.dotmarketing.listeners.OsgiFelixListener - - org.apache.felix.http.proxy.impl.ProxyServletContextListener - - + + org.apache.felix.http.proxy.impl.ProxyServletContextListener + + com.dotcms.repackage.org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener - - com.dotcms.listeners.SessionMonitor - - - ImageIO service provider loader/unloader - com.twelvemonkeys.servlet.image.IIOProviderContextListener - + + com.dotcms.listeners.SessionMonitor + + + ImageIO service provider loader/unloader + com.twelvemonkeys.servlet.image.IIOProviderContextListener + com.dotcms.listeners.RegisterMBeansListener - com.dotmarketing.listeners.HibernateSessionsListener + com.dotmarketing.listeners.HibernateSessionsListener - - + + @@ -207,19 +207,19 @@ 98 - + Init com.dotmarketing.servlets.InitServlet 8 - + VelocityServlet com.dotmarketing.velocity.ClientVelocityServlet 10 - + SpeedyAssetServlet com.dotmarketing.servlets.SpeedyAssetServlet @@ -229,42 +229,42 @@ com.dotmarketing.servlets.ShortyServlet - AjaxFileUploadServlet - com.dotmarketing.servlets.AjaxFileUploadServlet - - + AjaxFileUploadServlet + com.dotmarketing.servlets.AjaxFileUploadServlet + + CategoriesServlet com.dotmarketing.servlets.JSONCategoriesServlet - + login_edit_mode com.dotmarketing.servlets.LoginEditModeServlet - + TailLogServlet com.dotmarketing.servlets.taillog.TailLogServlet - + - dwr-invoker - com.dotmarketing.servlets.DwrWrapperServlet - - debug - false - - - compressor - none - - - crossDomainSessionSecurity - false - + dwr-invoker + com.dotmarketing.servlets.DwrWrapperServlet + + debug + false + + + compressor + none + + + crossDomainSessionSecurity + false + - + InitServlet com.liferay.portal.servlet.InitServlet @@ -275,7 +275,7 @@ com.dotmarketing.servlets.image.ImageToolAjaxServlet 1 - + MainServlet com.liferay.portal.servlet.MainServlet @@ -301,7 +301,7 @@ 2 - + ImageServlet com.liferay.portal.servlet.ImageServlet @@ -311,11 +311,11 @@ WebDav com.dotcms.repackage.com.bradmcevoy.http.MiltonServlet - resource.factory.class - com.dotmarketing.webdav.ResourceFactorytImpl + resource.factory.class + com.dotmarketing.webdav.ResourceFactorytImpl - + CMIS com.dotcms.repackage.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet @@ -325,7 +325,7 @@ 2 - + ScheduledJobs com.dotmarketing.servlets.RunScheduledJobServlet @@ -333,33 +333,33 @@ BinaryExporterServlet com.dotmarketing.servlets.BinaryExporterServlet - 100 + 100 - + AjaxDirector com.dotmarketing.servlets.ajax.AjaxDirectorServlet - - + + JSONTagsServlet com.dotmarketing.servlets.JSONTagsServlet - - springmvc - org.springframework.web.servlet.DispatcherServlet - - - - CSSPreProcessServlet - com.dotcms.csspreproc.CSSPreProcessServlet - - - - + + springmvc + org.springframework.web.servlet.DispatcherServlet + + + + CSSPreProcessServlet + com.dotcms.csspreproc.CSSPreProcessServlet + + + + RESTAPI - com.dotcms.rest.servlet.ReloadableServletContainer + com.dotcms.rest.servlet.ReloadableServletContainer jersey.config.server.mediaTypeMappings @@ -368,108 +368,108 @@ 1 true - - - proxy - com.dotmarketing.osgi.OSGIProxyServlet - 20 - - - + + + proxy + com.dotmarketing.osgi.OSGIProxyServlet + 20 + + + XMLSitemapServlet com.dotcms.xmlsitemap.XMLSitemapServlet - - - PreviewDesignTemplateServlet - com.dotmarketing.portlets.templates.design.servlets.PreviewDesignTemplateServlet - - + + + PreviewDesignTemplateServlet + com.dotmarketing.portlets.templates.design.servlets.PreviewDesignTemplateServlet + + - - + + - - - - + + + - - - - proxy - /app/* - - - - springmvc - /spring/* - - - - CSSPreProcessServlet - /DOTLESS/* - - - - CSSPreProcessServlet - /DOTSASS/* - - - - AjaxDirector - /DotAjaxDirector/* - - - login_edit_mode - /edit/* - - - - ImageToolAjaxServlet - /servlet/dotImageToolAjax - - - - ImageToolAjaxServlet - /servlet/dotImageToolAjax/* - - - - login_edit_mode - /admin/* - - - - login_edit_mode - /edit - - - - login_edit_mode - /admin - - + END OF TEST FRAMEWORK SERVLETS --> + + + + proxy + /app/* + + + + springmvc + /spring/* + + + + CSSPreProcessServlet + /DOTLESS/* + + + + CSSPreProcessServlet + /DOTSASS/* + + + + AjaxDirector + /DotAjaxDirector/* + + + login_edit_mode + /edit/* + + + + ImageToolAjaxServlet + /servlet/dotImageToolAjax + + + + ImageToolAjaxServlet + /servlet/dotImageToolAjax/* + + + + login_edit_mode + /admin/* + + + + login_edit_mode + /edit + + + + login_edit_mode + /admin + + ScheduledJobs /dotScheduledJobs - + TailLogServlet /dotTailLogServlet/* - + CMIS /cmis/* @@ -491,9 +491,9 @@ /webdav/working/* - AjaxFileUploadServlet - /servlets/ajax_file_upload - + AjaxFileUploadServlet + /servlets/ajax_file_upload + VelocityServlet /servlets/VelocityServlet @@ -506,12 +506,12 @@ ShortyServlet /dA/* - + - dwr-invoker - /dwr/* + dwr-invoker + /dwr/* - + MainServlet /c/* @@ -524,112 +524,112 @@ MainServlet /dotAdmin/c/* - + ImageServlet /image/* - - BinaryExporterServlet - /contentAsset/* + + BinaryExporterServlet + /contentAsset/* - + CategoriesServlet /categoriesServlet - + JSONTagsServlet /JSONTags/* - + RESTAPI /api/* - + XMLSitemapServlet /sitemap_index.xml - + PreviewDesignTemplateServlet /servlets/template/design/preview - + - - + + 30 - + vtl text/velocity - + xsl application/xml - + sass text/plain - + - scss - text/plain - - + scss + text/plain + + less text/plain - + index.html index.jsp - + - 404 - /html/error/custom-error-page.jsp + 404 + /html/error/custom-error-page.jsp - + - 401 - /html/error/custom-error-page.jsp + 401 + /html/error/custom-error-page.jsp - + - 403 - /html/error/custom-error-page.jsp + 403 + /html/error/custom-error-page.jsp - + - 500 - /html/error/custom-error-page.jsp + 500 + /html/error/custom-error-page.jsp - + - 503 - /html/error/custom-error-page.jsp + 503 + /html/error/custom-error-page.jsp - + *.jsp true - + Secure area @@ -640,9 +640,9 @@ - + - - - \ No newline at end of file + + + From aeeadef583a0ce4878c32a4cebc093b691d921c1 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 11 Dec 2017 11:39:16 -0600 Subject: [PATCH 6/6] reverting enterprise to the last commit --- 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 4ccfa3991dc7..0a76a5f84e53 160000 --- a/dotCMS/src/main/enterprise +++ b/dotCMS/src/main/enterprise @@ -1 +1 @@ -Subproject commit 4ccfa3991dc78c015fa5688bdda2e90b49bf24d5 +Subproject commit 0a76a5f84e533f5de6e1bbf012f26049cb91fe4b