Author: woonsan Date: Mon Jul 26 16:20:26 2010 New Revision: 979344 URL: http://svn.apache.org/viewvc?rev=979344&view=rev Log: JS2-1205: Adding a button to allow administrator to refresh the search index for the portlet application.
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/DetailsPanel.java portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/DetailsPanel.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/DetailsPanel.java?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/DetailsPanel.java (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/DetailsPanel.java Mon Jul 26 16:20:26 2010 @@ -30,12 +30,14 @@ import org.apache.jetspeed.om.page.Secur import org.apache.jetspeed.om.portlet.Description; import org.apache.jetspeed.om.portlet.JetspeedServiceReference; import org.apache.jetspeed.om.portlet.PortletApplication; +import org.apache.jetspeed.om.portlet.PortletDefinition; import org.apache.jetspeed.page.PageManager; import org.apache.jetspeed.portlets.JetspeedServiceLocator; import org.apache.jetspeed.portlets.prm.KeyVal; import org.apache.jetspeed.portlets.prm.PortletApplicationNodeBean; import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication; import org.apache.jetspeed.portlets.wicket.component.JavascriptEventConfirmation; +import org.apache.jetspeed.search.SearchEngine; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -191,7 +193,49 @@ public class DetailsPanel extends Panel reloadResourceBundlesButton.setEnabled(!StringUtils.isBlank(app.getResourceBundle())); form.add(reloadResourceBundlesButton); + + Button refreshSearchIndexButton = new Button("refreshSearchIndex", new ResourceModel("pam.details.search.index.refresh")) + { + @Override + public void onSubmit() + { + FeedbackPanel feed = (FeedbackPanel) getPage().get("feedback"); + + try + { + SearchEngine searchEngine = ((AbstractAdminWebApplication) getApplication()).getServiceLocator().getSearchEngine(); + PortletRegistry registry = ((AbstractAdminWebApplication) getApplication()).getServiceLocator().getPortletRegistry(); + + PortletApplication app = registry.getPortletApplication(paNodeBean.getApplicationName()); + List<PortletDefinition> portletDefList = app.getPortlets(); + + List<Object> list = new ArrayList<Object>(); + list.addAll(portletDefList); + list.add(app); + + searchEngine.remove(list); + + list.clear(); + list.add(app); + list.addAll(portletDefList); + + searchEngine.add(list); + } + catch (Exception e) + { + logger.error("Failed to refresh the search index of application.", e); + StringResourceModel resModel = new StringResourceModel("pam.details.action.status.search.index.refreshFailure", this, null, new Object [] { paNodeBean.getApplicationName(), e.getMessage() } ); + feed.info(resModel.getString()); + } + } + }; + + refreshSearchIndexButton.add(new JavascriptEventConfirmation("onclick", new ResourceModel("pam.details.search.index.refresh.confirm"))); + refreshSearchIndexButton.setEnabled(true); + + form.add(refreshSearchIndexButton); + add(form); } Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html Mon Jul 26 16:20:26 2010 @@ -57,6 +57,10 @@ <span wicket:id="resourceBundle"></span> <input type="submit" wicket:id="reloadResourceBundle" /> </div> + <div> + <wicket:message key="pam.details.search.index"/>: + <input type="submit" wicket:id="refreshSearchIndex" /> + </div> </form> </wicket:panel> </body> Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties Mon Jul 26 16:20:26 2010 @@ -40,6 +40,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=Please Chooose a Portlet pam.details.edit=Update Selected pam.details.remove=Remove Selected Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=Per favor esculli un portlet pam.details.edit=Actualitzar seleccionat pam.details.remove=Esborrar seleccionat Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=Please Chooose a Portlet pam.details.edit=Update Selected pam.details.remove=Remove Selected Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=Por favor escoja un portlet pam.details.edit=Actualizar seleccionado pam.details.remove=Borrar seleccionado Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=K\u00e9rem v\u00e1lassza ki a Portletet pam.details.edit=Kiv\u00e1lasztot m\u00f3dos\u00edt\u00e1sa pam.details.remove=Kiv\u00e1lasztott t\u00f6rl\u00e9se Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=Scegli una Portlet pam.details.edit=Aggiorna selezione pam.details.remove=Rimuovi Selezioni Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties Mon Jul 26 16:20:26 2010 @@ -40,6 +40,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=\u30DD\u30FC\u30C8\u30EC\u30C3\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 pam.details.edit=\u7DE8\u96C6 pam.details.remove=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664 Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=\uc0c pam.details.resource.bundle.reload.confirm=\ub9ac\uc18c\uc2a4 \ubc88\ub4e4\uc744 \uc0c8\ub85c \uace0\uce58\uc2dc\uaca0\uc2b5\ub2c8\uae4c? pam.details.action.status.resource.bundle.reloadFailure={0}\uc758 \ub9ac\ub85c\uc2a4 \ubc88\ub4e4\uc744 \uc0c8\ub85c \uace0\uce60 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=\ud3ec\ud2c0\ub9bf\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. pam.details.edit=\uc120\ud0dd\ub41c \ud56d\ubaa9\ub4e4 \ubcc0\uacbd pam.details.remove=\uc120\ud0dd\ub41c \ud56d\ubaa9\ub4e4 \uc81c\uac70 Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=\u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u043f\u043e\u0440\u0442\u043b\u0435\u0442 pam.details.edit=\u041e\u043d\u043e\u0432\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043d\u0435 pam.details.remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043d\u0435 Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=\u8bf7\u9009\u62e9\u4e00\u4e2aPortlet pam.details.edit=\u66f4\u65b0\u9009\u4e2d\u6761\u76ee pam.details.remove=\u5220\u9664\u9009\u4e2d\u6761\u76ee Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties?rev=979344&r1=979343&r2=979344&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties Mon Jul 26 16:20:26 2010 @@ -42,6 +42,11 @@ pam.details.resource.bundle.reload=Reloa pam.details.resource.bundle.reload.confirm=Are sure you want to reload the resource bundles? pam.details.action.status.resource.bundle.reloadFailure=Cannot reload resource bundles cache of {0}. {1} +pam.details.search.index=Search Index +pam.details.search.index.refresh=Refresh +pam.details.search.index.refresh.confirm=Are sure you want to refresh the search index? +pam.details.action.status.search.index.refreshFailure=Cannot refresh search index of {0}. {1} + pam.details.choose_portlet=\u8acb\u9078\u64c7\u4e00\u500bPortlet pam.details.edit=\u66f4\u65b0\u9078\u4e2d\u689d\u76ee pam.details.remove=\u522a\u9664\u9078\u4e2d\u689d\u76ee --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org