Permalink
Browse files

Prepare regenerated files on master

  • Loading branch information...
CAustin582 authored and brianchandotcom committed Sep 18, 2013
1 parent 377728c commit bd44c906f731f0cdf19d675c5db32a7e79105cad
Showing with 5,386 additions and 4,908 deletions.
  1. +0 −84 hooks/so-activities-hook/docroot/WEB-INF/src/META-INF/javadocs-all.xml
  2. +47 −0 portlets/calendar-portlet/docroot/WEB-INF/src/META-INF/javadocs-all.xml
  3. +1 −1 portlets/calendar-portlet/docroot/WEB-INF/src/META-INF/javadocs-rt.xml
  4. +22 −0 portlets/marketplace-portlet/docroot/WEB-INF/src/META-INF/javadocs-all.xml
  5. +19 −1 portlets/notifications-portlet/docroot/WEB-INF/src/META-INF/javadocs-all.xml
  6. +31 −31 portlets/sample-struts-liferay-portlet/docroot/WEB-INF/liferay-portlet.xml
  7. +7 −7 portlets/sample-struts-portlet/docroot/WEB-INF/liferay-display.xml
  8. +25 −25 portlets/sample-struts-portlet/docroot/WEB-INF/liferay-portlet.xml
  9. +7 −7 portlets/sample-tapestry-portlet/docroot/WEB-INF/liferay-display.xml
  10. +24 −24 portlets/sample-tapestry-portlet/docroot/WEB-INF/liferay-portlet.xml
  11. +7 −7 portlets/sample-ui-search-container-taglib-portlet/docroot/WEB-INF/liferay-display.xml
  12. +24 −24 portlets/sample-ui-search-container-taglib-portlet/docroot/WEB-INF/liferay-portlet.xml
  13. +7 −7 portlets/sample-ui-taglibs-portlet/docroot/WEB-INF/liferay-display.xml
  14. +24 −24 portlets/sample-ui-taglibs-portlet/docroot/WEB-INF/liferay-portlet.xml
  15. +8 −8 portlets/sample-wap-portlet/docroot/WEB-INF/liferay-display.xml
  16. +28 −28 portlets/sample-wap-portlet/docroot/WEB-INF/liferay-portlet.xml
  17. +8 −8 portlets/social-coding-portlet/docroot/WEB-INF/liferay-display.xml
  18. +6 −6 portlets/social-coding-portlet/docroot/WEB-INF/liferay-hook.xml
  19. +55 −55 portlets/social-coding-portlet/docroot/WEB-INF/liferay-portlet.xml
  20. +227 −227 portlets/social-coding-portlet/docroot/WEB-INF/service.xml
  21. +42 −42 ...ding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/portlet/svn-friendly-url-routes.xml
  22. +14 −14 portlets/social-networking-portlet/docroot/WEB-INF/liferay-display.xml
  23. +6 −6 portlets/social-networking-portlet/docroot/WEB-INF/liferay-hook.xml
  24. +83 −83 portlets/social-networking-portlet/docroot/WEB-INF/liferay-portlet.xml
  25. +130 −130 portlets/social-networking-portlet/docroot/WEB-INF/service.xml
  26. +8 −8 ...-portlet/docroot/WEB-INF/src/com/liferay/socialnetworking/map/portlet/map-friendly-url-routes.xml
  27. +13 −13 .../docroot/WEB-INF/src/com/liferay/socialnetworking/meetups/portlet/meetups-friendly-url-routes.xml
  28. +12 −12 ...ortlet/docroot/WEB-INF/src/com/liferay/socialnetworking/wall/portlet/wall-friendly-url-routes.xml
  29. +7 −7 portlets/stocks-portlet/docroot/WEB-INF/liferay-display.xml
  30. +28 −28 portlets/stocks-portlet/docroot/WEB-INF/liferay-portlet.xml
  31. +10 −10 portlets/sun-tour-ipc-portlet/docroot/WEB-INF/liferay-display.xml
  32. +32 −32 portlets/sun-tour-ipc-portlet/docroot/WEB-INF/liferay-portlet.xml
  33. +5 −5 portlets/tasks-portlet/docroot/WEB-INF/liferay-hook.xml
  34. +37 −37 portlets/tasks-portlet/docroot/WEB-INF/liferay-portlet.xml
  35. +73 −73 portlets/tasks-portlet/docroot/WEB-INF/service.xml
  36. +7 −7 portlets/test-clp-portlet/docroot/WEB-INF/liferay-display.xml
  37. +23 −23 portlets/test-clp-portlet/docroot/WEB-INF/liferay-portlet.xml
  38. +23 −23 portlets/test-dependency-able-portlet/docroot/WEB-INF/liferay-portlet.xml
  39. +23 −23 portlets/test-dependency-baker-portlet/docroot/WEB-INF/liferay-portlet.xml
  40. +23 −23 portlets/test-dependency-charlie-portlet/docroot/WEB-INF/liferay-portlet.xml
  41. +23 −23 portlets/test-dependency-dog-portlet/docroot/WEB-INF/liferay-portlet.xml
  42. +23 −23 portlets/test-dependency-easy-portlet/docroot/WEB-INF/liferay-portlet.xml
  43. +23 −23 portlets/test-dependency-fox-portlet/docroot/WEB-INF/liferay-portlet.xml
  44. +7 −7 portlets/test-hook-portlet/docroot/WEB-INF/liferay-display.xml
  45. +11 −11 portlets/test-hook-portlet/docroot/WEB-INF/liferay-hook.xml
  46. +23 −23 portlets/test-hook-portlet/docroot/WEB-INF/liferay-portlet.xml
  47. +7 −7 portlets/test-http-client-portlet/docroot/WEB-INF/liferay-display.xml
  48. +10 −10 portlets/test-http-client-portlet/docroot/WEB-INF/liferay-plugin-package.properties
  49. +23 −23 portlets/test-http-client-portlet/docroot/WEB-INF/liferay-portlet.xml
  50. +7 −7 portlets/test-kaleo-portlet/docroot/WEB-INF/liferay-display.xml
  51. +23 −23 portlets/test-kaleo-portlet/docroot/WEB-INF/liferay-portlet.xml
  52. +276 −276 ...lets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/category-specific-definition.xml
  53. +36 −36 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/incoming-initial-state.xml
  54. +198 −198 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/legal-marketing-definition.xml
  55. +35 −35 .../test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/less-than-two-outgoing-condition.xml
  56. +40 −40 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/less-than-two-outgoing-fork.xml
  57. +32 −32 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/multiple-initial-states.xml
  58. +35 −35 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-incoming-condition.xml
  59. +62 −62 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-incoming-fork.xml
  60. +25 −25 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-incoming-state.xml
  61. +34 −34 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-incoming-task.xml
  62. +21 −21 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-initial-state.xml
  63. +16 −16 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-outgoing-initial-state.xml
  64. +16 −16 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-outgoing-start-node.xml
  65. +37 −37 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/no-terminal-states.xml
  66. +139 −139 ...rtlet/docroot/WEB-INF/src/META-INF/definitions/single-approver-definition-scripted-assignment.xml
  67. +154 −154 portlets/test-kaleo-portlet/docroot/WEB-INF/src/META-INF/definitions/single-approver-definition.xml
  68. +9 −9 portlets/test-localized-portlet/docroot/WEB-INF/liferay-display.xml
  69. +8 −8 portlets/test-localized-portlet/docroot/WEB-INF/liferay-hook.xml
  70. +24 −24 portlets/test-localized-portlet/docroot/WEB-INF/liferay-portlet.xml
  71. +7 −7 portlets/test-misc-portlet/docroot/WEB-INF/liferay-display.xml
  72. +36 −36 portlets/test-misc-portlet/docroot/WEB-INF/liferay-portlet.xml
  73. +19 −19 ...s/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/test-friendly-url-routes.xml
  74. +8 −8 portlets/test-opensocial-pubsub-portlet/docroot/WEB-INF/liferay-display.xml
  75. +26 −26 portlets/test-opensocial-pubsub-portlet/docroot/WEB-INF/liferay-portlet.xml
  76. +7 −7 portlets/test-pacl-portlet/docroot/WEB-INF/liferay-display.xml
  77. +45 −45 portlets/test-pacl-portlet/docroot/WEB-INF/liferay-hook.xml
  78. +23 −23 portlets/test-pacl-portlet/docroot/WEB-INF/liferay-portlet.xml
  79. +50 −50 portlets/test-pacl-portlet/docroot/WEB-INF/service.xml
  80. +131 −131 portlets/test-resources-importer-portlet/docroot/WEB-INF/src/test/resource/sitemap.json
  81. +7 −7 portlets/test-transaction-portlet/docroot/WEB-INF/liferay-display.xml
  82. +23 −23 portlets/test-transaction-portlet/docroot/WEB-INF/liferay-portlet.xml
  83. +7 −7 portlets/test-user-attributes-portlet/docroot/WEB-INF/liferay-display.xml
  84. +23 −23 portlets/test-user-attributes-portlet/docroot/WEB-INF/liferay-portlet.xml
  85. +9 −9 portlets/tich-portlet/docroot/WEB-INF/liferay-display.xml
  86. +25 −25 portlets/tich-portlet/docroot/WEB-INF/liferay-portlet.xml
  87. +7 −7 portlets/twitter-portlet/docroot/WEB-INF/liferay-display.xml
  88. +5 −5 portlets/twitter-portlet/docroot/WEB-INF/liferay-hook.xml
  89. +35 −35 portlets/twitter-portlet/docroot/WEB-INF/liferay-portlet.xml
  90. +35 −35 portlets/twitter-portlet/docroot/WEB-INF/service.xml
  91. +7 −7 portlets/vimeo-portlet/docroot/WEB-INF/liferay-display.xml
  92. +28 −28 portlets/vimeo-portlet/docroot/WEB-INF/liferay-portlet.xml
  93. +7 −7 portlets/weather-portlet/docroot/WEB-INF/liferay-display.xml
  94. +26 −26 portlets/weather-portlet/docroot/WEB-INF/liferay-portlet.xml
  95. +7 −7 portlets/web-form-portlet/docroot/WEB-INF/liferay-display.xml
  96. +28 −28 portlets/web-form-portlet/docroot/WEB-INF/liferay-portlet.xml
  97. +9 −9 portlets/westminster-catechism-portlet/docroot/WEB-INF/liferay-display.xml
  98. +25 −25 portlets/westminster-catechism-portlet/docroot/WEB-INF/liferay-portlet.xml
  99. +8 −8 portlets/wiki-navigation-portlet/docroot/WEB-INF/liferay-display.xml
  100. +5 −5 portlets/wiki-navigation-portlet/docroot/WEB-INF/liferay-hook.xml
  101. +37 −37 portlets/wiki-navigation-portlet/docroot/WEB-INF/liferay-portlet.xml
  102. +8 −8 portlets/wsrp-portlet/docroot/WEB-INF/liferay-display.xml
  103. +5 −5 portlets/wsrp-portlet/docroot/WEB-INF/liferay-hook.xml
  104. +39 −39 portlets/wsrp-portlet/docroot/WEB-INF/liferay-portlet.xml
  105. +120 −120 portlets/wsrp-portlet/docroot/WEB-INF/service.xml
  106. +7 −7 portlets/youtube-portlet/docroot/WEB-INF/liferay-display.xml
  107. +28 −28 portlets/youtube-portlet/docroot/WEB-INF/liferay-portlet.xml
  108. BIN shared/deploy-listener-shared/lib/portal-compat-shared.jar
  109. BIN shared/gogo-commands-shared/lib/portal-compat-shared.jar
  110. BIN shared/http-service-shared/lib/portal-compat-shared.jar
  111. BIN shared/ip-geocoder-shared/lib/portal-compat-shared.jar
  112. BIN shared/localization-shared/lib/portal-compat-shared.jar
  113. BIN shared/log-bridge-shared/lib/portal-compat-shared.jar
  114. BIN shared/servlet-jsp-compiler-shared/lib/portal-compat-shared.jar
  115. BIN shared/servlet-jstl-shared/lib/portal-compat-shared.jar
  116. BIN shared/test-module-framework-shared/lib/portal-compat-shared.jar
  117. +4 −4 source_formatter_line_length_exclusions.properties
  118. +249 −249 themes/build-common-theme.xml
  119. +8 −8 themes/sample-html4-theme/docroot/WEB-INF/liferay-look-and-feel.xml
  120. +82 −82 themes/sample-html4-theme/docroot/_diffs/templates/portal_normal.ftl
  121. +82 −82 themes/sample-html4-theme/docroot/_diffs/templates/portal_normal.vm
  122. +28 −28 themes/sample-html4-theme/docroot/_diffs/templates/portlet.ftl
  123. +10 −10 themes/sample-styled-minimal-theme/docroot/WEB-INF/liferay-plugin-package.properties
  124. +10 −10 themes/test-servlet-context-include-filter-theme/docroot/WEB-INF/liferay-plugin-package.properties
  125. +7 −7 themes/welcome-theme/build.xml
  126. +8 −8 themes/welcome-theme/docroot/WEB-INF/liferay-look-and-feel.xml
  127. +17 −17 themes/welcome-theme/docroot/WEB-INF/liferay-plugin-package.properties
  128. +29 −29 themes/welcome-theme/docroot/WEB-INF/src/resources-importer/sitemap.json
  129. +4 −4 tools/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/liferay-portlet-ext.xml
  130. +4 −4 tools/hook_tmpl/docroot/WEB-INF/liferay-hook.xml
  131. +11 −11 tools/layouttpl_tmpl/docroot/WEB-INF/liferay-layout-templates.xml
  132. +5 −5 tools/portlet_jsf_tmpl/docroot/WEB-INF/liferay-hook.xml
  133. +7 −7 tools/portlet_tmpl/docroot/WEB-INF/liferay-display.xml
  134. +27 −27 tools/portlet_tmpl/docroot/WEB-INF/liferay-portlet.xml
  135. +15 −15 tools/theme_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
  136. +279 −279 webs/kaleo-web/docroot/WEB-INF/src/META-INF/definitions/category-specific-definition.xml
  137. +201 −201 webs/kaleo-web/docroot/WEB-INF/src/META-INF/definitions/legal-marketing-definition.xml
  138. +152 −152 ...o-web/docroot/WEB-INF/src/META-INF/definitions/single-approver-definition-scripted-assignment.xml
  139. +156 −156 webs/kaleo-web/docroot/WEB-INF/src/META-INF/definitions/single-approver-definition.xml
  140. +70 −3 webs/kaleo-web/docroot/WEB-INF/src/META-INF/javadocs-all.xml
  141. +8 −8 webs/kaleo-web/docroot/WEB-INF/src/portal.properties
  142. +408 −0 webs/solr4-web/docroot/WEB-INF/src/META-INF/javadocs-all.xml
  143. +4 −4 webs/solr4-web/docroot/WEB-INF/src/com/liferay/portal/search/solr/SolrQuerySuggester.java
  144. +26 −26 webs/theme-loader-web/docroot/WEB-INF/liferay-theme-loader.xml
@@ -177,18 +177,6 @@
<comment><![CDATA[]]></comment>
</return>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_COMMENT</name>
- <comment><![CDATA[{@link com.liferay.portlet.blogs.social.BlogsActivityKeys#ADD_COMMENT}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_ADD_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.portlet.blogs.social.BlogsActivityKeys#ADD_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_UPDATE_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.portlet.blogs.social.BlogsActivityKeys#UPDATE_ENTRY}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -373,14 +361,6 @@
<comment><![CDATA[]]></comment>
</return>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.portlet.bookmarks.social.BookmarksActivityKeys#ADD_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_UPDATE_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.portlet.bookmarks.social.BookmarksActivityKeys#UPDATE_ENTRY}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -507,14 +487,6 @@
<comment><![CDATA[]]></comment>
</return>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_EVENT</name>
- <comment><![CDATA[{@link com.liferay.portlet.calendar.social.CalendarActivityKeys#ADD_EVENT}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_UPDATE_EVENT</name>
- <comment><![CDATA[{@link com.liferay.portlet.calendar.social.CalendarActivityKeys#UPDATE_EVENT}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -765,14 +737,6 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_FILE_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.portlet.documentlibrary.social.DLActivityKeys#ADD_FILE_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_UPDATE_FILE_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.portlet.documentlibrary.social.DLActivityKeys#UPDATE_FILE_ENTRY}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -999,14 +963,6 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_MESSAGE</name>
- <comment><![CDATA[{@link com.liferay.portlet.messageboards.social.MBActivityKeys#ADD_MESSAGE}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_REPLY_MESSAGE</name>
- <comment><![CDATA[{@link com.liferay.portlet.messageboards.social.MBActivityKeys#REPLY_MESSAGE}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -1279,18 +1235,6 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.microblogs.microblogs.social.MicroblogsActivityKeys#ADD_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_REPLY_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.microblogs.microblogs.social.MicroblogsActivityKeys#REPLY_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_REPOST_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.microblogs.microblogs.social.MicroblogsActivityKeys#REPOST_ENTRY}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -1927,22 +1871,6 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.tasks.social.TasksActivityKeys#ADD_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_REOPEN_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.tasks.social.TasksActivityKeys#REOPEN_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_RESOLVE_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.tasks.social.TasksActivityKeys#RESOLVE_ENTRY}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_UPDATE_ENTRY</name>
- <comment><![CDATA[{@link com.liferay.tasks.social.TasksActivityKeys#UPDATE_ENTRY}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -2325,18 +2253,6 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
- <field>
- <name>_ACTIVITY_KEY_ADD_COMMENT</name>
- <comment><![CDATA[{@link com.liferay.portlet.wiki.social.WikiActivityKeys#ADD_COMMENT}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_ADD_PAGE</name>
- <comment><![CDATA[{@link com.liferay.portlet.wiki.social.WikiActivityKeys#ADD_PAGE}]]></comment>
- </field>
- <field>
- <name>_ACTIVITY_KEY_UPDATE_PAGE</name>
- <comment><![CDATA[{@link com.liferay.portlet.wiki.social.WikiActivityKeys#UPDATE_PAGE}]]></comment>
- </field>
<field>
<name>_CLASS_NAMES</name>
</field>
@@ -2117,6 +2117,32 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
+ <method>
+ <name>getEditCalendarURL</name>
+ <param>
+ <name>actionRequest</name>
+ <type>javax.portlet.ActionRequest</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <param>
+ <name>actionResponse</name>
+ <type>javax.portlet.ActionResponse</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <param>
+ <name>calendar</name>
+ <type>com.liferay.calendar.model.Calendar</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <return>
+ <comment><![CDATA[]]></comment>
+ </return>
+ <throws>
+ <name>Exception</name>
+ <type>java.lang.Exception</type>
+ <comment><![CDATA[]]></comment>
+ </throws>
+ </method>
<method>
<name>getJCalendar</name>
<param>
@@ -2794,6 +2820,27 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
+ <method>
+ <name>getCalendarBookings</name>
+ <param>
+ <name>calendarId</name>
+ <type>long</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <param>
+ <name>statuses</name>
+ <type>int[]</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <return>
+ <comment><![CDATA[]]></comment>
+ </return>
+ <throws>
+ <name>SystemException</name>
+ <type>com.liferay.portal.kernel.exception.SystemException</type>
+ <comment><![CDATA[]]></comment>
+ </throws>
+ </method>
<method>
<name>getCalendarBookings</name>
<param>

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1288,6 +1288,28 @@
<name>STORE</name>
</field>
</javadoc>
+ <javadoc>
+ <name>PortletPropsKeys</name>
+ <type>com.liferay.marketplace.util.PortletPropsKeys</type>
+ <author><![CDATA[Ryan Park]]></author>
+ <field>
+ <name>MARKETPLACE_STORE_ENABLED</name>
+ </field>
+ <field>
+ <name>MARKETPLACE_URL_LOGOUT</name>
+ </field>
+ </javadoc>
+ <javadoc>
+ <name>PortletPropsValues</name>
+ <type>com.liferay.marketplace.util.PortletPropsValues</type>
+ <author><![CDATA[Ryan Park]]></author>
+ <field>
+ <name>MARKETPLACE_STORE_ENABLED</name>
+ </field>
+ <field>
+ <name>MARKETPLACE_URL_LOGOUT</name>
+ </field>
+ </javadoc>
<javadoc>
<name>AppTitleComparator</name>
<type>com.liferay.marketplace.util.comparator.AppTitleComparator</type>
@@ -37,7 +37,7 @@
</throws>
</method>
<method>
- <name>setNewUserNotificationsCount</name>
+ <name>setUserNotificationsCount</name>
<param>
<name>pollerRequest</name>
<type>com.liferay.portal.kernel.poller.PollerRequest</type>
@@ -113,6 +113,24 @@
<comment><![CDATA[]]></comment>
</throws>
</method>
+ <method>
+ <name>updateUserNotificationDelivery</name>
+ <param>
+ <name>actionRequest</name>
+ <type>javax.portlet.ActionRequest</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <param>
+ <name>actionResponse</name>
+ <type>javax.portlet.ActionResponse</type>
+ <comment><![CDATA[]]></comment>
+ </param>
+ <throws>
+ <name>Exception</name>
+ <type>java.lang.Exception</type>
+ <comment><![CDATA[]]></comment>
+ </throws>
+ </method>
</javadoc>
<javadoc>
<name>PortletKeys</name>
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
-
-<liferay-portlet-app>
- <portlet>
- <portlet-name>1</portlet-name>
- <struts-path>sample_struts_liferay_portlet</struts-path>
- <use-default-template>true</use-default-template>
- <instanceable>true</instanceable>
- <private-request-attributes>false</private-request-attributes>
- </portlet>
- <role-mapper>
- <role-name>administrator</role-name>
- <role-link>Administrator</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>guest</role-name>
- <role-link>Guest</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>power-user</role-name>
- <role-link>Power User</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>user</role-name>
- <role-link>User</role-link>
- </role-mapper>
- <custom-user-attribute>
- <name>user.name.test</name>
- <custom-class>com.liferay.samplestrutsliferay.portlet.SampleUserAttributes</custom-class>
- </custom-user-attribute>
+<?xml version="1.0"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
+
+<liferay-portlet-app>
+ <portlet>
+ <portlet-name>1</portlet-name>
+ <struts-path>sample_struts_liferay_portlet</struts-path>
+ <use-default-template>true</use-default-template>
+ <instanceable>true</instanceable>
+ <private-request-attributes>false</private-request-attributes>
+ </portlet>
+ <role-mapper>
+ <role-name>administrator</role-name>
+ <role-link>Administrator</role-link>
+ </role-mapper>
+ <role-mapper>
+ <role-name>guest</role-name>
+ <role-link>Guest</role-link>
+ </role-mapper>
+ <role-mapper>
+ <role-name>power-user</role-name>
+ <role-link>Power User</role-link>
+ </role-mapper>
+ <role-mapper>
+ <role-name>user</role-name>
+ <role-link>User</role-link>
+ </role-mapper>
+ <custom-user-attribute>
+ <name>user.name.test</name>
+ <custom-class>com.liferay.samplestrutsliferay.portlet.SampleUserAttributes</custom-class>
+ </custom-user-attribute>
</liferay-portlet-app>
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
-
-<display>
- <category name="category.sample">
- <portlet id="1" />
- </category>
+<?xml version="1.0"?>
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
+
+<display>
+ <category name="category.sample">
+ <portlet id="1" />
+ </category>
</display>
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
-
-<liferay-portlet-app>
- <portlet>
- <portlet-name>1</portlet-name>
- <portlet-url-class>com.liferay.portal.apache.bridges.struts.LiferayStrutsPortletURLImpl</portlet-url-class>
- <use-default-template>true</use-default-template>
- </portlet>
- <role-mapper>
- <role-name>administrator</role-name>
- <role-link>Administrator</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>guest</role-name>
- <role-link>Guest</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>power-user</role-name>
- <role-link>Power User</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>user</role-name>
- <role-link>User</role-link>
- </role-mapper>
+<?xml version="1.0"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
+
+<liferay-portlet-app>
+ <portlet>
+ <portlet-name>1</portlet-name>
+ <portlet-url-class>com.liferay.portal.apache.bridges.struts.LiferayStrutsPortletURLImpl</portlet-url-class>
+ <use-default-template>true</use-default-template>
+ </portlet>
+ <role-mapper>
+ <role-name>administrator</role-name>
+ <role-link>Administrator</role-link>
+ </role-mapper>
+ <role-mapper>
+ <role-name>guest</role-name>
+ <role-link>Guest</role-link>
+ </role-mapper>
+ <role-mapper>
+ <role-name>power-user</role-name>
+ <role-link>Power User</role-link>
+ </role-mapper>
+ <role-mapper>
+ <role-name>user</role-name>
+ <role-link>User</role-link>
+ </role-mapper>
</liferay-portlet-app>
Oops, something went wrong.

0 comments on commit bd44c90

Please sign in to comment.