Merge pull request #8906 from dotCMS/release-3.3.1

Merging into master-3.3 the changes added for the 3.3.1 release
dotCMS · Apr 18, 2016 · 55f3f10 · 55f3f10
2 parents 79a4892 + c051450
commit 55f3f10
Show file tree

Hide file tree

Showing 49 changed files with 1,212 additions and 1,077 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 dependencies {
 
-    compile group: 'com.dotcms.enterprise', name: 'ee', version: 'ba016a5-SNAPSHOT'
-    compile group: 'com.dotcms.enterprise', name: 'eelic', version: '5abf2b5-SNAPSHOT'
+    compile group: 'com.dotcms.enterprise', name: 'ee', version: '933f706'
+    compile group: 'com.dotcms.enterprise', name: 'eelic', version: '5abf2b5'
 
     compile group: 'com.dotcms', name: 'ant-tooling-log4j', version: '1.1'
 

diff --git a/deploy.gradle b/deploy.gradle
@@ -85,6 +85,9 @@ apply plugin: 'application'
 
 import org.gradle.api.internal.artifacts.publish.DefaultPublishArtifact
 
+//Required for gradle 2.3 and above
+mainClassName = ' '
+
 repositories {
     maven { url "http://repo.dotcms.com/artifactory/libs-release" }
     maven { url "http://repo.dotcms.com/artifactory/libs-snapshot-local" }

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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.3.1') {
         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.2.4') {
+    compile(group: 'com.dotcms', name: 'dotcms', version: '3.3.1') {
         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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/docs/examples/osgi/com.dotcms.hooks/src/main/java/com/dotmarketing/osgi/hooks/Activator.java b/docs/examples/osgi/com.dotcms.hooks/src/main/java/com/dotmarketing/osgi/hooks/Activator.java
@@ -1,19 +1,33 @@
 package com.dotmarketing.osgi.hooks;
 
+import com.dotcms.repackage.org.apache.logging.log4j.LogManager;
+import com.dotcms.repackage.org.apache.logging.log4j.core.LoggerContext;
 import com.dotcms.repackage.org.osgi.framework.BundleContext;
 import com.dotmarketing.business.APILocator;
+import com.dotmarketing.loggers.Log4jUtil;
 import com.dotmarketing.osgi.GenericBundleActivator;
 import com.dotmarketing.portlets.contentlet.business.ContentletAPI;
+import com.dotmarketing.util.Logger;
 
 /**
  * Created by Jonathan Gamba
  * Date: 6/18/12
  */
 public class Activator extends GenericBundleActivator {
 
+    private LoggerContext pluginLoggerContext;
+
     @SuppressWarnings ("unchecked")
     public void start ( BundleContext context ) throws Exception {
 
+        //Initializing log4j...
+        LoggerContext dotcmsLoggerContext = Log4jUtil.getLoggerContext();
+        //Initialing the log4j context of this plugin based on the dotCMS logger context
+        pluginLoggerContext = (LoggerContext) LogManager.getContext(this.getClass().getClassLoader(),
+                false,
+                dotcmsLoggerContext,
+                dotcmsLoggerContext.getConfigLocation());
+
         //Initializing services...
         initializeServices ( context );
 
@@ -25,13 +39,17 @@ public void start ( BundleContext context ) throws Exception {
         ContentletAPI conAPI = APILocator.getContentletAPI();
 
         Long count = conAPI.contentletCount();
-        System.out.println( "+++++++++++++++++++++++++++++++++++++++++++++++" );
-        System.out.println( "ContentletAPI.contentletCount() = " + count );
-        System.out.println( "+++++++++++++++++++++++++++++++++++++++++++++++" );
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++");
+        Logger.info(this, "ContentletAPI.contentletCount() = " + count);
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++");
     }
 
     public void stop ( BundleContext context ) throws Exception {
+
         unregisterServices( context );
+
+        //Shutting down log4j in order to avoid memory leaks
+        Log4jUtil.shutdown(pluginLoggerContext);
     }
 
 }
diff --git a/...sgi/com.dotcms.hooks/src/main/java/com/dotmarketing/osgi/hooks/SamplePostContentHook.java b/...sgi/com.dotcms.hooks/src/main/java/com/dotmarketing/osgi/hooks/SamplePostContentHook.java
@@ -3,8 +3,10 @@
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Permission;
 import com.dotmarketing.exception.DotDataException;
+import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.categories.model.Category;
 import com.dotmarketing.portlets.contentlet.business.ContentletAPIPostHookAbstractImp;
+import com.dotmarketing.portlets.contentlet.business.DotReindexStateException;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.structure.model.ContentletRelationships;
 import com.dotmarketing.util.Logger;
@@ -22,9 +24,9 @@ public SamplePostContentHook () {
     @Override
     public long contentletCount ( long returnValue ) throws DotDataException {
 
-        System.out.println( "+++++++++++++++++++++++++++++++++++++++++++++++" );
-        System.out.println( "INSIDE SamplePostContentHook.contentletCount() -->" + String.valueOf( returnValue ) );
-        System.out.println( "+++++++++++++++++++++++++++++++++++++++++++++++" );
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
+        Logger.info(this, "INSIDE SamplePostContentHook.contentletCount() -->" + String.valueOf( returnValue ) );
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
 
         return super.contentletCount( returnValue );
     }
@@ -35,12 +37,8 @@ public void checkin ( Contentlet currentContentlet, ContentletRelationships rela
         Logger.info( this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
         Logger.info( this, "INSIDE SamplePostContentHook.checkin()" );
         Logger.info( this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
-        super.checkin( currentContentlet, relationshipsData, cats, selectedPermissions, user, respectFrontendRoles, returnValue );
-    }
 
-    @Override
-    public void deleteByHost(Host host, User user, boolean respectFrontendRoles) {
-        // TODO Auto-generated method stub
+        super.checkin( currentContentlet, relationshipsData, cats, selectedPermissions, user, respectFrontendRoles, returnValue );
     }
 
 }
diff --git a/...osgi/com.dotcms.hooks/src/main/java/com/dotmarketing/osgi/hooks/SamplePreContentHook.java b/...osgi/com.dotcms.hooks/src/main/java/com/dotmarketing/osgi/hooks/SamplePreContentHook.java
@@ -1,6 +1,7 @@
 package com.dotmarketing.osgi.hooks;
 
 import com.dotmarketing.exception.DotDataException;
+import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.contentlet.business.ContentletAPIPreHookAbstractImp;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.structure.model.ContentletRelationships;
@@ -24,25 +25,21 @@ public SamplePreContentHook () {
     @Override
     public boolean contentletCount () throws DotDataException {
 
-        System.out.println( "+++++++++++++++++++++++++++++++++++++++++++++++" );
-        System.out.println( "INSIDE SamplePreContentHook.contentletCount()" );
-        System.out.println( "+++++++++++++++++++++++++++++++++++++++++++++++" );
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
+        Logger.info(this, "INSIDE SamplePreContentHook.contentletCount()" );
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
 
         return super.contentletCount();
     }
 
     @Override
 	public boolean checkin(Contentlet currentContentlet, ContentletRelationships relationshipsData, List<Category> cats, List<Permission> selectedPermissions, User user,	boolean respectFrontendRoles) {
-        Logger.info(this,"+++++++++++++++++++++++++++++++++++++++++++++++" );
-        Logger.info(this,"INSIDE SamplePreContentHook.checkin()" );
-        Logger.info(this,"+++++++++++++++++++++++++++++++++++++++++++++++" );
-		return super.checkin(currentContentlet, relationshipsData, cats,selectedPermissions, user, respectFrontendRoles);
-	}
 
-    @Override
-    public boolean deleteByHost(Host host, User user, boolean respectFrontendRoles) {
-        // TODO Auto-generated method stub
-        return false;
-    }
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
+        Logger.info(this, "INSIDE SamplePreContentHook.checkin()" );
+        Logger.info(this, "+++++++++++++++++++++++++++++++++++++++++++++++" );
+
+        return super.checkin(currentContentlet, relationshipsData, cats,selectedPermissions, user, respectFrontendRoles);
+	}
 
 }
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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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: '../../../../dotCMS/WEB-INF/felix/load', 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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		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.2.4'){
+	compile (group: 'com.dotcms', name: 'dotcms', version: '3.3.1'){
 		transitive = true
 	}
 	providedCompile "javax.servlet:servlet-api:2.5"

diff --git a/dotCMS/WEB-INF/log4j/log4j2.xml b/dotCMS/WEB-INF/log4j/log4j2.xml
@@ -3,21 +3,21 @@
 
    <Properties>
     <Property name="DOTCMS_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms.log</Property>
-    <Property name="DOTCMS_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="DOTCMS_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-%i.log.gz</Property>
     <Property name="SECURITY_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-security.log</Property>
-    <Property name="SECURITY_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-security-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="SECURITY_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-security-%i.log.gz</Property>
     <Property name="SITESEARCH_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-sitesearch.log</Property>
-    <Property name="SITESEARCH_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-sitesearch-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="SITESEARCH_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-sitesearch-%i.log.gz</Property>
     <Property name="AUDIT_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-adminaudit.log</Property>
-    <Property name="AUDIT_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-adminaudit-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="AUDIT_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-adminaudit-%i.log.gz</Property>
     <Property name="USERACTIVITY_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-userActivity.log</Property>
-    <Property name="USERACTIVITY_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-userActivity-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="USERACTIVITY_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-userActivity-%i.log.gz</Property>
     <Property name="TEST_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-test.log</Property>
-    <Property name="TEST_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-test-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="TEST_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-test-%i.log.gz</Property>
     <Property name="PUSHPUBLISH_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-pushpublish.log</Property>
-    <Property name="PUSHPUBLISH_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-pushpublish-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="PUSHPUBLISH_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-pushpublish-%i{BundleId}.log.gz</Property>
     <Property name="VELOCITY_LOG_FILE">${sys:DOTCMS_LOGGING_HOME}/dotcms-velocity.log</Property>
-    <Property name="VELOCITY_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/$${date:yyyy-MM}/dotcms-velocity-%d{MM-dd-yyyy}-%i.log.gz</Property>
+    <Property name="VELOCITY_FILENAME_PATTERN">${sys:DOTCMS_LOGGING_HOME}/archive/dotcms-velocity-%i.log.gz</Property>
     <Property name="PATTERN">%-5level %d %c:%M(%L): %m%n</Property>
     <Property name="CONSOLE_PATTERN">%-5level %d %c:%M(%L): %m%n</Property>
     <Property name="MESSAGE_PATTERN">[%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %c{2}: %m%n</Property>

diff --git a/dotCMS/html/common/nav_sub_inc.jsp b/dotCMS/html/common/nav_sub_inc.jsp
@@ -730,7 +730,7 @@ dojo.require("dojo.cookie");
 				<div style="text-align:center;font-size:77%;color:#999;"><%=LanguageUtil.get(pageContext, "Toll-Free") %>+1 877-936-8267</div>
 				<div style="text-align:center;font-size:146.5%;color:#999;"><%=LanguageUtil.get(pageContext, "or") %></div>
 				<div style="text-align:center;">
-					<a href="http://dotcms.org/enterprise/" target="_blank"><%=LanguageUtil.get(pageContext, "Click-here-to-login-to-your-account") %></a>
+					<a href="https://my.dotcms.com" target="_blank"><%=LanguageUtil.get(pageContext, "Click-here-to-login-to-your-account") %></a>
 				</div>
 			</td>
 		</tr></table>

diff --git a/dotCMS/html/js/dotcms/dijit/FileBrowserDialog.js b/dotCMS/html/js/dotcms/dijit/FileBrowserDialog.js
@@ -79,8 +79,8 @@ dojo.declare("dotcms.dijit.FileBrowserDialog", [dijit._Widget, dijit._Templated]
 	_initialized: false,
 	addFileTitle: 'Upload a file',
 	allowFileUpload: true,
-	sortBy: "title",
-	sortByDesc: false,
+	sortBy: "modDate",
+	sortByDesc: true,
 	_browserFolderTree: null,
 
 	postCreate: function () {

diff --git a/dotCMS/html/portlet/ext/contentlet/contentlet_assign_comment.jsp b/dotCMS/html/portlet/ext/contentlet/contentlet_assign_comment.jsp
@@ -235,9 +235,15 @@ function validate() {
 					</div>
 				<%}%>
 			<div class="buttonRow">
-				<button dojoType="dijit.form.Button" iconClass="saveAssignIcon" onClick="validate()" type="button">
-					<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "save")) %>
-				</button>
+                <% if(hasPushPublishActionlet){ %>
+                    <button dojoType="dijit.form.Button" iconClass="sServerIcon" onClick="validate()" type="button">
+                        <%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "publisher_dialog_push")) %>
+                    </button>
+                <% } else { %>
+                    <button dojoType="dijit.form.Button" iconClass="saveAssignIcon" onClick="validate()" type="button">
+                        <%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "save")) %>
+                    </button>
+                <% } %>
 				<button dojoType="dijit.form.Button" iconClass="cancelIcon" onClick="dijit.byId('contentletWfDialog').hide()" type="button">
 					<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "cancel")) %>
 					</button>

diff --git a/src/com/dotcms/publisher/business/PublishAuditStatus.java b/src/com/dotcms/publisher/business/PublishAuditStatus.java
@@ -1,5 +1,6 @@
 package com.dotcms.publisher.business;
 
+import com.dotmarketing.util.PushPublishLogger;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -55,13 +56,14 @@ public PublishAuditStatus() {}
 	public PublishAuditStatus(String bundleId) {
 		this.bundleId = bundleId;
 		this.createDate = new Date();
+		PushPublishLogger.log(this.getClass(), "Status Update: Pending.");
 		this.status = Status.BUNDLE_REQUESTED;
 	}
 
 	/**
 	 * Useful to build a Audit Status with new status attribute
 	 * from an existing status
-	 * @param bundleId
+	 * @param origin
 	 * @param status
 	 */
 	public PublishAuditStatus(PublishAuditStatus origin, Status status) {