Author: liem_nguyen Date: 2009-12-11 06:19:40 -0500 (Fri, 11 Dec 2009) New Revision: 990 Modified: portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml Log: GTNPORTAL-363 Remove RegistryService usage (a fews files more) Modified: portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml =================================================================== --- portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 11:19:40 UTC (rev 990) @@ -48,13 +48,5 @@ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> </component> - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="system"/> - </properties-param> - </init-params> - </component> + </configuration> Modified: portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml 2009-12-11 11:19:40 UTC (rev 990) @@ -23,18 +23,8 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="system"/> - </properties-param> - </init-params> - </component> - + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> <type>org.exoplatform.portal.pom.config.POMDataStorage</type> Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-12-11 11:19:40 UTC (rev 990) @@ -19,20 +19,19 @@ package org.exoplatform.portal.config; -import java.util.ArrayList; -import java.util.Collection; - import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.services.jcr.ext.registry.RegistryService; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.GroupEventListener; import org.exoplatform.services.organization.GroupHandler; import org.exoplatform.services.organization.OrganizationService; +import java.util.ArrayList; +import java.util.Collection; + /** * Created by The eXo Platform SARL * Author : Nhu Dinh Thuan @@ -64,8 +63,8 @@ * it I hope that this issues will be fixed when we use the lastest * version of PicoContainer Comment by Hoa Pham. */ - RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); - registryService.start(); + // RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); + // registryService.start(); UserPortalConfigService portalConfigService = (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class); DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java 2009-12-11 11:19:40 UTC (rev 990) @@ -25,7 +25,6 @@ import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.services.jcr.ext.registry.RegistryService; import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.UserEventListener; @@ -55,8 +54,8 @@ * hope that this issues will be fixed when we use the lastest version of * PicoContainer Comment by Hoa Pham. */ - RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); - registryService.start(); + // RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); + // registryService.start(); UserPortalConfigService portalConfigService = (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class); DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); Modified: portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 11:19:40 UTC (rev 990) @@ -46,17 +46,7 @@ <component> <key>org.exoplatform.services.jcr.RepositoryService</key> <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="system"/> - </properties-param> - </init-params> - </component> + </component> <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>