initial commit
commit common-portlets project
Merge branch 'master' of https://github.com/liferay/liferay-plugins

Conflicts:
	portlets/akismet-portlet/docroot/WEB-INF/lib/akismet-portlet-service.jar
	portlets/akismet-portlet/docroot/WEB-INF/liferay-plugin-package.properties
	portlets/akismet-portlet/docroot/WEB-INF/releng/icons/90x90.png
	portlets/akismet-portlet/docroot/WEB-INF/service.xml
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataClp.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataModel.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataSoap.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataWrapper.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalService.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceClp.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceUtil.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceWrapper.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataPersistence.java
	portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataUtil.java
	portlets/akismet-portlet/docroot/WEB-INF/sql/indexes.properties
	portlets/akismet-portlet/docroot/WEB-INF/sql/indexes.sql
	portlets/akismet-portlet/docroot/WEB-INF/sql/tables.sql
	portlets/akismet-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml
	portlets/akismet-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml
	portlets/akismet-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditMessageAction.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetMBMessageListener.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetMBMessageLocalServiceImpl.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataCacheModel.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataModelImpl.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/portlet/ModerationPortlet.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceClpInvoker.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/impl/AkismetDataLocalServiceImpl.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/persistence/AkismetDataPersistenceImpl.java
	portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetUtil.java
	portlets/akismet-portlet/docroot/moderation/discussions_action.jsp
	portlets/calendar-portlet/.classpath
	portlets/calendar-portlet/docroot/WEB-INF/lib/.gitignore
	portlets/calendar-portlet/docroot/WEB-INF/lib/calendar-portlet-service.jar
	portlets/calendar-portlet/docroot/WEB-INF/liferay-plugin-package.properties
	portlets/calendar-portlet/docroot/WEB-INF/liferay-portlet.xml
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingLocalService.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingLocalServiceClp.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingLocalServiceUtil.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingLocalServiceWrapper.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingService.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingServiceClp.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingServiceUtil.java
	portlets/calendar-portlet/docroot/WEB-INF/service/com/liferay/calendar/service/CalendarBookingServiceWrapper.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/lar/CalendarPortletDataHandler.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/portlet/CalendarPortlet.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/service/base/CalendarBookingLocalServiceClpInvoker.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/service/base/CalendarBookingServiceClpInvoker.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/service/http/CalendarBookingServiceSoap.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/service/impl/CalendarBookingLocalServiceImpl.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/service/impl/CalendarBookingServiceImpl.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/util/PortletPropsKeys.java
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/util/PortletPropsValues.java
	portlets/calendar-portlet/docroot/WEB-INF/src/content/Language.properties
	portlets/calendar-portlet/docroot/WEB-INF/src/portlet.properties
	portlets/calendar-portlet/docroot/WEB-INF/src/service.properties
	portlets/calendar-portlet/docroot/calendar_action.jsp
	portlets/calendar-portlet/docroot/calendar_resource_action.jsp
	portlets/calendar-portlet/docroot/calendar_resource_group_action.jsp
	portlets/calendar-portlet/docroot/calendar_resource_user_action.jsp
	portlets/calendar-portlet/docroot/configuration.jsp
	portlets/calendar-portlet/docroot/css/main.css
	portlets/calendar-portlet/docroot/init.jsp
	portlets/calendar-portlet/docroot/js/components.js
	portlets/calendar-portlet/docroot/view_calendar.jsp
	portlets/calendar-portlet/docroot/view_calendar_menus.jspf
	portlets/calendar-portlet/docroot/view_calendar_resources.jsp
	portlets/calendar-portlet/docroot/view_calendars.jsp
	portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/portlet/chat-friendly-url-routes.xml
	portlets/chat-portlet/docroot/css/main.css
	portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/portlet/ContactsCenterPortlet.java
	portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/portlet/contacts-friendly-url-routes.xml
	portlets/contacts-portlet/docroot/contacts_center/contacts_center_toolbar.jsp
	portlets/contacts-portlet/docroot/contacts_center/view.jsp
	portlets/ddl-form-portlet/docroot/WEB-INF/liferay-portlet.xml
	portlets/ddl-form-portlet/docroot/WEB-INF/src/com/liferay/ddlform/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
	portlets/ddl-form-portlet/docroot/WEB-INF/src/com/liferay/ddlform/lar/DDLFormPortletDataHandler.java
	portlets/knowledge-base-portlet/docroot/WEB-INF/liferay-portlet.xml
	portlets/knowledge-base-portlet/docroot/WEB-INF/service/com/liferay/knowledgebase/service/permission/KBCommentPermission.java
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/admin/lar/AdminPortletDataHandler.java
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/admin/portlet/admin-friendly-url-routes.xml
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/article/portlet/article-friendly-url-routes.xml
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/article/util/KBArticleAttachmentsUtil.java
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/display/portlet/display-friendly-url-routes.xml
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/hook/upgrade/v1_1_0/UpgradePortletPreferences.java
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/search/portlet/search-friendly-url-routes.xml
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/section/portlet/section-friendly-url-routes.xml
	portlets/knowledge-base-portlet/docroot/WEB-INF/src/com/liferay/knowledgebase/service/impl/KBArticleLocalServiceImpl.java
	portlets/knowledge-base-portlet/docroot/admin/common/view_article.jsp
	portlets/mail-portlet/docroot/WEB-INF/src/com/liferay/mail/portlet/mail-friendly-url-routes.xml
	portlets/microblogs-portlet/docroot/microblogs/css/main.css
	portlets/opensocial-portlet/docroot/WEB-INF/liferay-portlet.xml
	portlets/opensocial-portlet/docroot/WEB-INF/src/com/liferay/opensocial/admin/lar/AdminPortletDataHandler.java
	portlets/opensocial-portlet/docroot/WEB-INF/src/com/liferay/opensocial/shindig/service/LiferayPersonService.java
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/com/liferay/pluginssecuritymanager/util/PluginsSecurityManagerUtil.java
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_ar.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_bg.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_ca.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_cs.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_da.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_de.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_el.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_en.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_es.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_et.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_eu.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_fa.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_fi.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_fr.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_gl.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_hi_IN.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_hr.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_hu.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_in.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_it.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_iw.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_ja.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_ko.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_lo.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_lt.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_nb.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_nl.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_nl_BE.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_pl.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_pt_BR.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_pt_PT.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_ro.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_ru.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_sk.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_sl.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_sr_RS.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_sr_RS_latin.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_sv.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_tr.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_uk.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_vi.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_zh_CN.properties
	portlets/plugins-security-manager-portlet/docroot/WEB-INF/src/content/Language_zh_TW.properties
	portlets/plugins-security-manager-portlet/docroot/view.jsp
	portlets/polls-portlet/docroot/polls_display/css/main.css
	portlets/private-messaging-portlet/docroot/WEB-INF/src/com/liferay/privatemessaging/portlet/private-messaging-friendly-url-routes.xml
	portlets/private-messaging-portlet/docroot/WEB-INF/src/com/liferay/privatemessaging/util/PrivateMessagingUtil.java
	portlets/so-portlet/docroot/WEB-INF/src/com/liferay/so/hook/action/EditUserAction.java
	portlets/so-portlet/docroot/activities/css/main.css
	portlets/so-portlet/docroot/sites/view_sites.jsp
	portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/portlet/svn-friendly-url-routes.xml
	portlets/social-networking-portlet/docroot/WEB-INF/src/com/liferay/socialnetworking/meetups/portlet/meetups-friendly-url-routes.xml
	portlets/social-networking-portlet/docroot/WEB-INF/src/com/liferay/socialnetworking/wall/portlet/wall-friendly-url-routes.xml
	portlets/social-networking-portlet/docroot/summary/view_user.jspf
	portlets/tasks-portlet/docroot/tasks/css/main.css
	portlets/tasks-portlet/docroot/tasks/edit_task.jsp
	portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/test-friendly-url-routes.xml
	portlets/wsrp-portlet/docroot/WEB-INF/liferay-portlet.xml
	portlets/wsrp-portlet/docroot/WEB-INF/src/com/liferay/wsrp/admin/lar/AdminPortletDataHandler.java
	portlets/wsrp-portlet/docroot/WEB-INF/src/com/liferay/wsrp/model/impl/WSRPConsumerImpl.java
	portlets/wsrp-portlet/docroot/WEB-INF/src/com/liferay/wsrp/proxy/TypeConvertorUtil.java
	portlets/youtube-portlet/docroot/css/main.css
	themes/sample-styled-advanced-theme/docroot/WEB-INF/liferay-look-and-feel.xml
	themes/so-theme/docroot/_diffs/css/so-skin-ce.css
	themes/zoe-brochure-theme/docroot/WEB-INF/releng/icons/90x90.png
	themes/zoe-healthcare-theme/docroot/WEB-INF/releng/icons/90x90.png
	themes/zoe-resort-theme/docroot/WEB-INF/releng/icons/90x90.png
	themes/zoe-tech-theme/docroot/WEB-INF/releng/icons/90x90.png
	tools/theme_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
	webs/kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/runtime/util/ClassLoaderUtil.java
	webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java