natecavanaugh · ipeychev · Jun 27, 2012 · Jun 25, 2012 · Jun 26, 2012 · Jun 26, 2012
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/liferay-plugin-package.properties b/hooks/mongodb-hook/docroot/WEB-INF/liferay-plugin-package.properties
@@ -1,7 +1,7 @@
 name=MongoDB
 module-group-id=liferay
 module-incremental-version=1
-tags=
+tags=db, expando, ha, json, nosql, redundancy, sql
 short-description=This hook uses MongoDB to persist custom attributes.
 change-log=
 page-url=http://www.liferay.com

diff --git a/hooks/mongodb-hook/docroot/WEB-INF/liferay-releng.properties b/hooks/mongodb-hook/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/hooks/mongodb-hook/docroot/WEB-INF/releng/screenshots/1.jpg b/hooks/mongodb-hook/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/releng/screenshots/2.jpg b/hooks/mongodb-hook/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/releng/screenshots/3.jpg b/hooks/mongodb-hook/docroot/WEB-INF/releng/screenshots/3.jpg
diff --git a/hooks/so-hook/docroot/WEB-INF/liferay-plugin-package.properties b/hooks/so-hook/docroot/WEB-INF/liferay-plugin-package.properties
@@ -1,7 +1,7 @@
 name=Social Office
 module-group-id=liferay
 module-incremental-version=1
-tags=
+tags=collaboration, communication, office, so, social, social office, team
 short-description=
 change-log=
 page-url=http://www.liferay.com

diff --git a/hooks/so-hook/docroot/WEB-INF/liferay-releng.properties b/hooks/so-hook/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Productivity
 compatibility=6.2.0
 demo-url=
 labs=false

diff --git a/hooks/so-hook/docroot/WEB-INF/src/com/liferay/so/util/InstanceUtil.java b/hooks/so-hook/docroot/WEB-INF/src/com/liferay/so/util/InstanceUtil.java
@@ -302,6 +302,9 @@ protected static void setupLayoutSetPrototypeSite(long companyId)
 		LayoutUtil.addPortlets(
 			group, layout, "/forums", PortletPropsKeys.SITE_PROTOTYPE_PORTLETS);
 
+		LayoutUtil.removePortletBorder(layout, "73");
+		LayoutUtil.removePortletBorder(layout, "19");
+
 		LayoutUtil.configureAssetPublisher(layout);
 		LayoutUtil.configureMessageBoards(layout);
 

diff --git a/hooks/so-hook/docroot/WEB-INF/src/portlet.properties b/hooks/so-hook/docroot/WEB-INF/src/portlet.properties
@@ -47,7 +47,7 @@
 
     site.prototype.portlets.column-1[/documents]=20
 
-    site.prototype.portlets.column-1[/forums]=19
+    site.prototype.portlets.column-1[/forums]=73,19
 
     site.prototype.portlets.column-1[/members]=2_WAR_soportlet,4_WAR_contactsportlet
 

diff --git a/hooks/social-bookmarks-hook/docroot/WEB-INF/liferay-plugin-package.properties b/hooks/social-bookmarks-hook/docroot/WEB-INF/liferay-plugin-package.properties
@@ -1,7 +1,7 @@
 name=Social Bookmarks
 module-group-id=liferay
 module-incremental-version=1
-tags=
+tags=bookmarks, social, social bookmarks
 short-description=
 change-log=
 page-url=http://www.liferay.com

diff --git a/hooks/social-bookmarks-hook/docroot/WEB-INF/liferay-releng.properties b/hooks/social-bookmarks-hook/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/hooks/social-bookmarks-hook/docroot/WEB-INF/releng/screenshots/1.jpg b/hooks/social-bookmarks-hook/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/hooks/social-bookmarks-hook/docroot/WEB-INF/releng/screenshots/2.jpg b/hooks/social-bookmarks-hook/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/hooks/social-bookmarks-hook/docroot/WEB-INF/releng/screenshots/3.jpg b/hooks/social-bookmarks-hook/docroot/WEB-INF/releng/screenshots/3.jpg
diff --git a/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties b/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,9 @@
+name=1-2-1 Columns Template
+module-group-id=liferay
+module-incremental-version=1
+tags=layout, template, ui
+short-description=This plugin is a 1-2-1 columns layout template.
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
diff --git a/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties b/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg b/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg b/layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties b/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,9 @@
+name=1-3-1 Columns Template
+module-group-id=liferay
+module-incremental-version=1
+tags=layout, template, ui
+short-description=This plugin is a 1-3-1 columns layout template.
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
diff --git a/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties b/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg b/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg b/layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties b/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,9 @@
+name=1-3-2 Columns Template
+module-group-id=liferay
+module-incremental-version=1
+tags=layout, template, ui
+short-description=This plugin is a 1-3-2 columns layout template.
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
diff --git a/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties b/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg b/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg b/layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties b/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,9 @@
+name=2-1-2 Columns Template
+module-group-id=liferay
+module-incremental-version=1
+tags=layout, template, ui
+short-description=This plugin is a 2-1-2 columns layout template.
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
diff --git a/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties b/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg b/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg b/layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties b/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,9 @@
+name=3-2-3 Columns Template
+module-group-id=liferay
+module-incremental-version=1
+tags=layout, template, ui
+short-description=This plugin is a 3-2-3 columns layout template.
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
diff --git a/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties b/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/liferay-releng.properties
@@ -1,5 +1,5 @@
 bundle=false
-category=
+category=Utility
 compatibility=6.2.0
 demo-url=
 labs=true

diff --git a/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg b/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/releng/screenshots/1.jpg
diff --git a/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg b/layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/releng/screenshots/2.jpg
diff --git a/portlets/ams-portlet/docroot/WEB-INF/lib/ams-portlet-service.jar b/portlets/ams-portlet/docroot/WEB-INF/lib/ams-portlet-service.jar
diff --git a/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/AssetClp.java b/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/AssetClp.java
@@ -62,6 +62,7 @@ public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
+	@Override
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -79,6 +80,7 @@ public Map<String, Object> getModelAttributes() {
 		return attributes;
 	}
 
+	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long assetId = (Long)attributes.get("assetId");
 

diff --git a/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/CheckoutClp.java b/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/CheckoutClp.java
@@ -62,6 +62,7 @@ public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
+	@Override
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -79,6 +80,7 @@ public Map<String, Object> getModelAttributes() {
 		return attributes;
 	}
 
+	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long checkoutId = (Long)attributes.get("checkoutId");
 

diff --git a/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/DefinitionClp.java b/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/DefinitionClp.java
@@ -63,6 +63,7 @@ public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
+	@Override
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -83,6 +84,7 @@ public Map<String, Object> getModelAttributes() {
 		return attributes;
 	}
 
+	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long definitionId = (Long)attributes.get("definitionId");
 

diff --git a/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/TypeClp.java b/portlets/ams-portlet/docroot/WEB-INF/service/com/liferay/ams/model/TypeClp.java
@@ -60,6 +60,7 @@ public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
+	@Override
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -70,6 +71,7 @@ public Map<String, Object> getModelAttributes() {
 		return attributes;
 	}
 
+	@Override
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long typeId = (Long)attributes.get("typeId");
 

diff --git a/portlets/calendar-portlet/docroot/WEB-INF/lib/calendar-portlet-service.jar b/portlets/calendar-portlet/docroot/WEB-INF/lib/calendar-portlet-service.jar
diff --git a/portlets/calendar-portlet/docroot/WEB-INF/liferay-portlet.xml b/portlets/calendar-portlet/docroot/WEB-INF/liferay-portlet.xml
@@ -4,7 +4,18 @@
 <liferay-portlet-app>
 	<portlet>
 		<portlet-name>1</portlet-name>
-		<configuration-action-class>com.liferay.portal.kernel.portlet.DefaultConfigurationAction</configuration-action-class>
+		<configuration-action-class>com.liferay.calendar.action.ConfigurationActionImpl</configuration-action-class>
+		<scheduler-entry>
+			<scheduler-event-listener-class>com.liferay.calendar.messaging.CheckBookingsMessageListener</scheduler-event-listener-class>
+			<trigger>
+				<simple>
+					<property-key>calendar.notification.check.interval</property-key>
+					<time-unit>minute</time-unit>
+				</simple>
+			</trigger>
+		</scheduler-entry>
+		<preferences-unique-per-layout>false</preferences-unique-per-layout>
+		<preferences-owned-by-group>true</preferences-owned-by-group>
 		<header-portlet-css>/css/main.css</header-portlet-css>
 		<header-portlet-javascript>/js/components.js</header-portlet-javascript>
 		<header-portlet-javascript>/js/javascript.js</header-portlet-javascript>

diff --git a/portlets/calendar-portlet/docroot/WEB-INF/service.xml b/portlets/calendar-portlet/docroot/WEB-INF/service.xml
@@ -83,8 +83,10 @@
 		<column name="endDate" type="Date" />
 		<column name="allDay" type="boolean" />
 		<column name="recurrence" type="String" />
-		<column name="firstReminder" type="int" />
-		<column name="secondReminder" type="int" />
+		<column name="firstReminder" type="long" />
+		<column name="firstReminderType" type="String" />
+		<column name="secondReminder" type="long" />
+		<column name="secondReminderType" type="String" />
 		<column name="status" type="int" />
 		<column name="statusByUserId" type="long" />
 		<column name="statusByUserName" type="String" />
@@ -176,6 +178,10 @@
 		<finder name="Active" return-type="Collection">
 			<finder-column name="active" />
 		</finder>
+		<finder name="G_C" return-type="Collection">
+			<finder-column name="groupId" arrayable-operator="OR" />
+			<finder-column name="code" />
+		</finder>
 		<finder name="G_A" return-type="Collection">
 			<finder-column name="groupId" />
 			<finder-column name="active" />
@@ -184,11 +190,6 @@
 			<finder-column name="classNameId" />
 			<finder-column name="classPK" />
 		</finder>
-		<finder name="G_C_A" return-type="Collection">
-			<finder-column name="groupId" arrayable-operator="OR" />
-			<finder-column name="code" comparator="LIKE" />
-			<finder-column name="active" />
-		</finder>
 		<finder name="G_N_A" return-type="Collection">
 			<finder-column name="groupId" arrayable-operator="OR" />
 			<finder-column name="name" comparator="LIKE" />
@@ -211,6 +212,7 @@
 		<exception>CalendarBookingStartDate</exception>
 		<exception>CalendarBookingTitle</exception>
 		<exception>CalendarName</exception>
+		<exception>CalendarResourceCode</exception>
 		<exception>DuplicateCalendarResource</exception>
 	</exceptions>
 </service-builder>
diff --git a/...r-portlet/docroot/WEB-INF/service/com/liferay/calendar/CalendarResourceCodeException.java b/...r-portlet/docroot/WEB-INF/service/com/liferay/calendar/CalendarResourceCodeException.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.calendar;
+
+import com.liferay.portal.kernel.exception.PortalException;
+
+/**
+ * @author Eduardo Lundgren
+ */
+public class CalendarResourceCodeException extends PortalException {
+
+	public CalendarResourceCodeException() {
+		super();
+	}
+
+	public CalendarResourceCodeException(String msg) {
+		super(msg);
+	}
+
+	public CalendarResourceCodeException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+
+	public CalendarResourceCodeException(Throwable cause) {
+		super(cause);
+	}
+
+}
diff --git a/.../calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/model/CalendarBooking.java b/.../calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/model/CalendarBooking.java
@@ -39,10 +39,14 @@ public com.liferay.calendar.model.CalendarResource getCalendarResource()
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	public com.liferay.calendar.notification.NotificationType getFirstReminderNotificationType();
+
 	public com.liferay.calendar.model.CalendarBooking getParentCalendarBooking()
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	public com.liferay.calendar.notification.NotificationType getSecondReminderNotificationType();
+
 	public java.util.Date getUTCEndDate()
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;