Author: mpodolin Date: 2010-04-06 05:44:10 -0400 (Tue, 06 Apr 2010) New Revision: 2486 Modified: portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml Log: JBEPP-238: GTNPORTAL-891 ported to the branch Modified: portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2010-04-06 09:35:49 UTC (rev 2485) +++ portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2010-04-06 09:44:10 UTC (rev 2486) @@ -51,18 +51,7 @@ <portlet-name>NavigationPortlet</portlet-name> <skin-name>Default</skin-name> <css-path>/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - - - <!-- PortalNavigationPortlet skins --> - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>PortalNavigationPortlet2</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - + </portlet-skin> <!-- SiteMapPortlet skins --> Modified: portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml 2010-04-06 09:35:49 UTC (rev 2485) +++ portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml 2010-04-06 09:44:10 UTC (rev 2486) @@ -201,38 +201,6 @@ </portlet> <portlet> - <description xml:lang="EN">Portal Navigation Portlet</description> - <portlet-name>PortalNavigationPortlet2</portlet-name> - <display-name xml:lang="EN">Portal Navigation Portlet</display-name> - <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class> - - <init-param> - <name>webui.configuration</name> - <value>/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml</value> - </init-param> - - <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>help</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <resource-bundle>locale.portlet.portal.PortalNavigationPortlet</resource-bundle> - <portlet-info> - <title>Portal Navigation Portlet</title> - <short-title>Portal Navigation Portlet</short-title> - <keywords>System</keywords> - </portlet-info> - <portlet-preferences> - <preference> - <name>useAJAX</name> - <value>false</value> - <read-only>false</read-only> - </preference> - </portlet-preferences> - </portlet> - - <portlet> <description xml:lang="EN">SiteMap Portlet</description> <portlet-name>SiteMapPortlet</portlet-name> <display-name xml:lang="EN">Site Map Portlet</display-name> Modified: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2010-04-06 09:35:49 UTC (rev 2485) +++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2010-04-06 09:44:10 UTC (rev 2486) @@ -297,10 +297,6 @@ <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> </param> <param> - <js-module>eXo.portal.UIPortalNavigation2</js-module> - <js-path>/javascript/eXo/portal/UIPortalNavigation2.js</js-path> - </param> - <param> <js-module>eXo.portal.UIMaskWorkspace</js-module> <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> </param> @@ -316,4 +312,4 @@ <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> </param> </javascript> -</gatein-resources> \ No newline at end of file +</gatein-resources>