[gatein-commits] gatein SVN: r666 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/portal and 1 other directory.

Author: liem_nguyen Date: 2009-11-19 03:08:58 -0500 (Thu, 19 Nov 2009) New Revision: 666 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml Log: GTNPORTAL-219 show duplicate "gadget" category when click " Import Applications" Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-19 07:19:28 UTC (rev 665) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-19 08:08:58 UTC (rev 666) @@ -239,6 +239,15 @@ { UIApplicationOrganizer uiOrganizer = event.getSource(); ApplicationRegistryService service = uiOrganizer.getApplicationComponent(ApplicationRegistryService.class); + + // Remove preconfig application to prevent duplicating + List<Application> preConfigApplications = service.getAllApplications(); + if (preConfigApplications!=null) { + for (Application application : preConfigApplications) { + service.remove(application); + } + } + service.importAllPortlets(); service.importExoGadgets(); uiOrganizer.reload(); Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-11-19 07:19:28 UTC (rev 665) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-11-19 08:08:58 UTC (rev 666) @@ -378,11 +378,11 @@ </object-param> <object-param> - <name>eXoGadgets</name> + <name>Gadgets</name> <description>Gadgets</description> <object type="org.exoplatform.application.registry.ApplicationCategory"> <field name="name"> - <string>eXoGadgets</string> + <string>Gadgets</string> </field> <field name="displayName"> <string>Gadgets</string> @@ -402,7 +402,7 @@ <value> <object type="org.exoplatform.application.registry.Application"> <field name="categoryName"> - <string>eXoGadgets</string> + <string>Gadgets</string> </field> <field name="applicationName"> <string>Todo</string> @@ -431,7 +431,7 @@ <value> <object type="org.exoplatform.application.registry.Application"> <field name="categoryName"> - <string>eXoGadgets</string> + <string>Gadgets</string> </field> <field name="applicationName"> <string>Calendar</string> @@ -462,7 +462,7 @@ <value> <object type="org.exoplatform.application.registry.Application"> <field name="categoryName"> - <string>eXoGadgets</string> + <string>Gadgets</string> </field> <field name="applicationName"> <string>Calculator</string> @@ -493,7 +493,7 @@ <value> <object type="org.exoplatform.application.registry.Application"> <field name="categoryName"> - <string>eXoGadgets</string> + <string>Gadgets</string> </field> <field name="applicationName"> <string>rssAggregator</string>