Merge remote-tracking branch 'remotes/origin/master-3.6' into master-3.7

# Conflicts: # dependencies.gradle # src/com/dotmarketing/util/TaskLocatorUtil.java # src/com/liferay/portal/util/build.properties
dotCMS · Sep 6, 2016 · 37b9eb1 · 37b9eb1
2 parents 7955079 + 3876030
commit 37b9eb1
Show file tree

Hide file tree

Showing 46 changed files with 5,358 additions and 268 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,31 @@
+# dotCMS
+
+dotCMS is a scalable, java based, open source content management system (CMS) that has been designed to manage and deliver personalized, permission based content experiences across multiple channels.  dotCMS can serve as the plaform for sites, mobile apps, mini-sites, portals, intranets or as a headless CMS (content is consumed via RESTful APIs).  dotCMS is used everywhere, from running small sites to powering multi-node installations for governemnts, Fortune 100 companies, Universities and Global Brands. A dotCMS environment can scale to support hundreds of editors managing thousands of sites with millions of content objects.  
+
+dotCMS is available for download or as a cloud based product.
+
+- Download dotCMS: https://dotcms.com/download
+- dotCMS Enterprise Cloud: https://dotcms.com/cms-platform/cloud-cms/
+
+## Licensing
+dotCMS comes in multiple editions and as such is dual licensed.  The dotCMS Community Edition is licensed under the GPL 3.0 and is freely available for download, customization and deployment for use within organizations of all stripes.  dotCMS Enterprise Editions (EE) adds a number of enterprise features and is available via a supported, indemnified commercial license from dotCMS.  For the differences between the editions, see [the feature page](http://dotcms.com/cms-platform/features).
+
+##Contributing
+
+GitHub pull requests are the preferred method to contribute code to dotCMS.  Before any pull requests can be accepted, an automated tool will ask you to agree to the [dotCMS Contributor's Agreement](https://gist.github.com/wezell/85ef45298c48494b90d92755b583acb3).
+
+## Requirements
+
+dotCMS requires a Java 8 Runtime Environment (JRE) or a Java 7 Development Kit (JDK). For a complete list of requirements, see [this page](http://dotcms.com/docs/latest/dotcms-technology-requirements).
+
+## Getting Help
+
+| Source        | Location                                               |
+| ------------- |--------------------------------------------------------|
+| Installation | [Installation](https://dotcms.com/docs/latest/quick-start-guide)                  |
+| Documentation | [Documentation](http://dotcms.com/docs/)                  |
+| Videos | [Helpful Videos](http://dotcms.com/videos/)                  |
+| Code Examples | [Codeshare](http://dotcms.com/codeshare)                  |
+| Forums/Listserv        | [via Google Groups](https://groups.google.com/forum/#!forum/dotCMS) |
+| Twitter       | @dotCMS                         |
+| Main Site | [dotCMS.com](http://dotcms.com/)                  |
diff --git a/README.textile b/README.textile
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,8 +1,8 @@
 //noinspection GroovyAssignabilityCheck
 dependencies {
 
-    compile group: 'com.dotcms.enterprise', name: 'ee', version: '3.6-SNAPSHOT', changing: true
-    compile group: 'com.dotcms.enterprise', name: 'eelic', version: '3.6-SNAPSHOT', changing: true
+    compile group: 'com.dotcms.enterprise', name: 'ee', version: '3.6.0', changing: true
+    compile group: 'com.dotcms.enterprise', name: 'eelic', version: '3.6.0', changing: true
 
     compile group: 'com.dotcms', name: 'ant-tooling', version: '1.2'
     compile 'io.jsonwebtoken:jjwt:0.6.0'
@@ -268,7 +268,7 @@ dependencies {
     /**** And now the libs we pull in from internal company sources - libs stored in ./plugins, ./bin, ./libs, the starter site, etc. ****/
     compile fileTree("${project.projectDir}/plugins/com.dotcms.config/build/jar").include('plugin-com.dotcms.config.jar')
 
-    compile group: 'com.dotcms', name: 'starter', version: '20160622-SNAPSHOT', ext: 'zip'
+    compile group: 'com.dotcms', name: 'starter', version: '20160902', ext: 'zip'
     coreWeb group: 'com.dotcms', name: 'core-web', version: '3.7.0-SNAPSHOT', ext: 'zip', changing: true
 
     provided fileTree("${project.projectDir}/libs/buildlibs").include('**/*.jar')

diff --git a/docs/examples/osgi/com.dotcms.3rd.party/build.gradle b/docs/examples/osgi/com.dotcms.3rd.party/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.actionlet/build.gradle b/docs/examples/osgi/com.dotcms.actionlet/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.custom.dwr/build.gradle b/docs/examples/osgi/com.dotcms.custom.dwr/build.gradle
@@ -19,7 +19,7 @@ repositories {
 dependencies {
 
     compile fileTree(dir: configurations.resourcesLibsFolder, include: '*.jar')
-    compile(group: 'com.dotcms', name: 'dotcms', version: '3.5') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.6.0') {
         transitive = true
     }
     providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.custom.spring/build.gradle b/docs/examples/osgi/com.dotcms.custom.spring/build.gradle
@@ -27,7 +27,7 @@ dependencies {
 
 	//Compile against dotCMS 3.1
     compile fileTree(dir: configurations.resourcesLibsFolder, include: '*.jar')
-    compile(group: 'com.dotcms', name: 'dotcms', version: '3.5') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.6.0') {
         transitive = true
     }
     providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.hooks/build.gradle b/docs/examples/osgi/com.dotcms.hooks/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.job/build.gradle b/docs/examples/osgi/com.dotcms.job/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.override/build.gradle b/docs/examples/osgi/com.dotcms.override/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/...sgi/com.dotcms.override/src/main/java/com/dotmarketing/portlets/folders/model/Folder.java b/...sgi/com.dotcms.override/src/main/java/com/dotmarketing/portlets/folders/model/Folder.java
@@ -31,6 +31,8 @@ public class Folder extends Inode implements Serializable, Permissionable, Treea
 
     private static final long serialVersionUID = 1L;
 
+    public static final String SYSTEM_FOLDER = "SYSTEM_FOLDER";
+
     /** nullable persistent field */
     private String name;
 

diff --git a/docs/examples/osgi/com.dotcms.portlet/build.gradle b/docs/examples/osgi/com.dotcms.portlet/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.rest/build.gradle b/docs/examples/osgi/com.dotcms.rest/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.ruleengine.actionlet/build.gradle b/docs/examples/osgi/com.dotcms.ruleengine.actionlet/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    compile(group: 'com.dotcms', name: 'dotcms', version: '3.5') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.6.0') {
         transitive = true
     }
     /* Specifying an alternate configuration (see above 'configurations') keeps servlet-api.jar from being added to our own output Jar. */

diff --git a/docs/examples/osgi/com.dotcms.ruleengine.conditionlet/build.gradle b/docs/examples/osgi/com.dotcms.ruleengine.conditionlet/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    compile(group: 'com.dotcms', name: 'dotcms', version: '3.5') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.6.0') {
         transitive = true
     }
     /* Specifying an alternate configuration (see above 'configurations') keeps servlet-api.jar from being added to our own output Jar. */

diff --git a/docs/examples/osgi/com.dotcms.ruleengine.slowruleactionlet/build.gradle b/docs/examples/osgi/com.dotcms.ruleengine.slowruleactionlet/build.gradle
@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    compile(group: 'com.dotcms', name: 'dotcms', version: '3.5') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.6.0') {
         transitive = true
     }
     /* Specifying an alternate configuration (see above 'configurations') keeps servlet-api.jar from being added to our own output Jar. */

diff --git a/docs/examples/osgi/com.dotcms.service/build.gradle b/docs/examples/osgi/com.dotcms.service/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.servlet/build.gradle b/docs/examples/osgi/com.dotcms.servlet/build.gradle
@@ -15,7 +15,7 @@ repositories {
 dependencies {
 	compile fileTree(dir: '../com.dotcms.service/build/libs/', include: '*.jar')//As this example depends on the com.dotcms.service example
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.spring/build.gradle b/docs/examples/osgi/com.dotcms.spring/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.tuckey/build.gradle b/docs/examples/osgi/com.dotcms.tuckey/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.viewtool/build.gradle b/docs/examples/osgi/com.dotcms.viewtool/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
-	compile (group: 'com.dotcms', name: 'dotcms', version: '3.5'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.6.0'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/dotCMS/WEB-INF/messages/Language.properties b/dotCMS/WEB-INF/messages/Language.properties
@@ -1235,9 +1235,10 @@ Time-Started=Time Started
 File-Name=File Name
 Total-number-of-other-imports=Total number of other imports
 
+##Content Error Messaging
 message.contentlet.delete.error.archived = Cannot delete content with inode: {0} that has a working copy in another language
-message.contentlet.delete.success.withError = {0} The others contentlets were deleted successfully
-message.contentlet.delete.error.dontExists = The contentlet does not exit
+message.contentlet.delete.success.withError = {0} The other contentlets were deleted successfully
+message.contentlet.delete.error.dontExists = The contentlet does not exist
 message.contentlet.save=Content saved
 message.contentlet.save.error=Error: Content Could Not Be Saved.  Please refresh and try again.
 message.contentlet.delete=Content Archived
@@ -1934,7 +1935,7 @@ message.cmsmaintenance.cache.indexrebuilt=Building index in background, it could
 message.cmsmaintenance.cache.failedtorebuild=Index rebuild failed because there is another rebuild task executing right now.
 message.cmsmaintenance.cache.indexoptimized=Contents Index Optimized
 message.cmsmaintenance.cache.flushmenucaches=The menu files have been deleted
-View-Maintenance-Tasks"=View Maintenance Tasks
+View-Maintenance-Tasks=View Maintenance Tasks
 File-Upload-Done=File Upload Done Failed
 File-Upload-Failed=File Upload Failed
 Please-specify-a-search-string=Please specify a search string
@@ -4618,6 +4619,7 @@ system.locale.language.inputs.language.options.za=Zhuang
 system.locale.language.inputs.language.options.zh=Chinese
 system.locale.language.inputs.language.options.zu=Zulu
 
+##Rules Engine
 api.system.ruleengine.actionlet.SetPersona.name=Set Persona
 api.system.ruleengine.actionlet.SetPersona.inputs.personaIdKey.placeholder=Choose a Persona