LEP-2853

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@6572 05bdf26c-840f-0410-9ced-eb539d925f36
sachinhub · May 29, 2007 · d97c98c · d97c98c
1 parent d3cddc6
commit d97c98c
Show file tree

Hide file tree

Showing 20 changed files with 219 additions and 72 deletions.
diff --git a/definitions/liferay-portlet-app_4_3_0.dtd b/definitions/liferay-portlet-app_4_3_0.dtd
@@ -16,7 +16,7 @@ a Liferay portlet application.
 <!--
 The portlet element contains the declarative data of a portlet.
 -->
-<!ELEMENT portlet (portlet-name, struts-path?, configuration-path?,
+<!ELEMENT portlet (portlet-name, icon?, struts-path?, configuration-path?,
 indexer-class?, open-search-class?, scheduler-class?, portlet-url-class?,
 friendly-url-mapper-class?, url-encoder-class?, portlet-data-handler-class?,
 smtp-message-listener-class?, preferences-company-wide?,
@@ -33,6 +33,11 @@ match the portlet-name specified in portlet.xml.
 -->
 <!ELEMENT portlet-name (#PCDATA)>
 
+<!--
+The icon element specifies an image that represents the portlet.
+-->
+<!ELEMENT icon (#PCDATA)>
+
 <!--
 Supppose the struts-path value is "mail". This tells the portal that all
 requests with the path mail/* are considered part of this portlet's scope. Users

diff --git a/portal-impl/src/com/liferay/portal/model/impl/PortletImpl.java b/portal-impl/src/com/liferay/portal/model/impl/PortletImpl.java
@@ -158,7 +158,7 @@ public PortletImpl(long companyId, String portletId) {
 	 */
 	public PortletImpl(String portletId, PluginPackage pluginPackage,
 					   PluginSetting pluginSetting, long companyId,
-					   String strutsPath, String configurationPath,
+					   String icon, String strutsPath, String configurationPath,
 					   String displayName, String portletClass,
 					   String indexerClass, String openSearchClass,
 					   String schedulerClass, String portletURLClass,
@@ -188,6 +188,7 @@ public PortletImpl(String portletId, PluginPackage pluginPackage,
 		_pluginPackage = pluginPackage;
 		_defaultPluginSetting = pluginSetting;
 		setCompanyId(companyId);
+		_icon = icon;
 		_strutsPath = strutsPath;
 		_configurationPath = configurationPath;
 		_displayName = displayName;
@@ -316,6 +317,24 @@ public void setDefaultPluginSetting(PluginSetting pluginSetting) {
 		_defaultPluginSetting = pluginSetting;
 	}
 
+	/**
+	 * Gets the icon of the portlet.
+	 *
+	 * @return		the icon of the portlet
+	 */
+	public String getIcon() {
+		return _icon;
+	}
+
+	/**
+	 * Sets the icon of the portlet.
+	 *
+	 * @param		icon the icon of the portlet
+	 */
+	public void setIcon(String icon) {
+		_icon = icon;
+	}
+
 	/**
 	 * Gets the struts path of the portlet.
 	 *
@@ -1893,7 +1912,7 @@ public void setServletURLPatterns(List servletURLPatterns) {
 	public Object clone() {
 		return new PortletImpl(
 			getPortletId(), getPluginPackage(), getDefaultPluginSetting(),
-			getCompanyId(), getStrutsPath(), getConfigurationPath(),
+			getCompanyId(), getIcon(), getStrutsPath(), getConfigurationPath(),
 			getDisplayName(), getPortletClass(), getIndexerClass(),
 			getOpenSearchClass(), getSchedulerClass(), getPortletURLClass(),
 			getFriendlyURLMapperClass(), getURLEncoderClass(),
@@ -1944,6 +1963,11 @@ public int compareTo(Object obj) {
 	 */
 	private PluginSetting _defaultPluginSetting;
 
+	/**
+	 * The icon of the portlet.
+	 */
+	private String _icon;
+
 	/**
 	 * The struts path of the portlet.
 	 */

diff --git a/portal-impl/src/com/liferay/portal/service/impl/PortletLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/PortletLocalServiceImpl.java
@@ -942,6 +942,8 @@ private Set _readLiferayPortletXML(
 			Portlet portletModel = (Portlet)portletsPool.get(portletId);
 
 			if (portletModel != null) {
+				portletModel.setIcon(GetterUtil.getString(
+					portlet.elementText("icon"), portletModel.getIcon()));
 				portletModel.setStrutsPath(GetterUtil.getString(
 					portlet.elementText("struts-path"),
 					portletModel.getStrutsPath()));

diff --git a/portal-impl/src/com/liferay/portal/util/ReleaseInfo.java b/portal-impl/src/com/liferay/portal/util/ReleaseInfo.java
@@ -42,7 +42,7 @@ public class ReleaseInfo {
 
 	static String codeName = "Owen";
 
-	static String build = "4105";
+	static String build = "4107";
 
 	static String date = "May 29, 2007";
 

diff --git a/portal-service/src/com/liferay/portal/model/Portlet.java b/portal-service/src/com/liferay/portal/model/Portlet.java
@@ -66,6 +66,10 @@ public void setPluginPackage(
 	public void setDefaultPluginSetting(
 		com.liferay.portal.model.PluginSetting pluginSetting);
 
+	public java.lang.String getIcon();
+
+	public void setIcon(java.lang.String icon);
+
 	public java.lang.String getStrutsPath();
 
 	public void setStrutsPath(java.lang.String strutsPath);

diff --git a/portal-service/src/com/liferay/portal/theme/PortletDisplay.java b/portal-service/src/com/liferay/portal/theme/PortletDisplay.java
@@ -306,6 +306,14 @@ public void setShowMoveIcon(boolean showMoveIcon) {
 		_showMoveIcon = showMoveIcon;
 	}
 
+	public boolean isShowPortletIcon() {
+		return _showPortletIcon;
+	}
+
+	public void setShowPortletIcon(boolean showPortletIcon) {
+		_showPortletIcon = showPortletIcon;
+	}
+
 	public boolean isShowPrintIcon() {
 		return _showPrintIcon;
 	}
@@ -386,6 +394,14 @@ public void setURLMin(String urlMin) {
 		_urlMin = urlMin;
 	}
 
+	public String getURLPortlet() {
+		return _urlPortlet;
+	}
+
+	public void setURLPortlet(String urlPortlet) {
+		_urlPortlet = urlPortlet;
+	}
+
 	public String getURLPrint() {
 		return _urlPrint;
 	}
@@ -454,6 +470,7 @@ public void recycle() {
 		_showMaxIcon = false;
 		_showMinIcon = false;
 		_showMoveIcon = false;
+		_showPortletIcon = false;
 		_showPrintIcon = false;
 		_showRefreshIcon = false;
 		_urlBack = StringPool.BLANK;
@@ -464,6 +481,7 @@ public void recycle() {
 		_urlHelp = StringPool.BLANK;
 		_urlMax = StringPool.BLANK;
 		_urlMin = StringPool.BLANK;
+		_urlPortlet = StringPool.BLANK;
 		_urlPrint = StringPool.BLANK;
 		_urlRefresh = StringPool.BLANK;
 		_restoreCurrentView = false;
@@ -502,6 +520,7 @@ public void copyFrom(PortletDisplay master) {
 		_showMaxIcon = master.isShowMaxIcon();
 		_showMinIcon = master.isShowMinIcon();
 		_showMoveIcon = master.isShowMoveIcon();
+		_showPortletIcon = master.isShowPortletIcon();
 		_showPrintIcon = master.isShowPrintIcon();
 		_showRefreshIcon = master.isShowRefreshIcon();
 		_urlBack = master.getURLBack();
@@ -512,6 +531,7 @@ public void copyFrom(PortletDisplay master) {
 		_urlHelp = master.getURLHelp();
 		_urlMax = master.getURLMax();
 		_urlMin = master.getURLMin();
+		_urlPortlet = master.getURLPortlet();
 		_urlPrint = master.getURLPrint();
 		_urlRefresh = master.getURLRefresh();
 		_restoreCurrentView = master.isRestoreCurrentView();
@@ -550,6 +570,7 @@ public void copyTo(PortletDisplay slave) {
 		slave.setShowMaxIcon(_showMaxIcon);
 		slave.setShowMinIcon(_showMinIcon);
 		slave.setShowMoveIcon(_showMoveIcon);
+		slave.setShowPortletIcon(_showPortletIcon);
 		slave.setShowPrintIcon(_showPrintIcon);
 		slave.setShowRefreshIcon(_showRefreshIcon);
 		slave.setURLBack(_urlBack);
@@ -560,6 +581,7 @@ public void copyTo(PortletDisplay slave) {
 		slave.setURLHelp(_urlHelp);
 		slave.setURLMax(_urlMax);
 		slave.setURLMin(_urlMin);
+		slave.setURLPortlet(_urlPortlet);
 		slave.setURLPrint(_urlPrint);
 		slave.setURLRefresh(_urlRefresh);
 		slave.setRestoreCurrentView(_restoreCurrentView);
@@ -601,6 +623,7 @@ public void copyTo(PortletDisplay slave) {
 	private boolean _showMaxIcon;
 	private boolean _showMinIcon;
 	private boolean _showMoveIcon;
+	private boolean _showPortletIcon;
 	private boolean _showPrintIcon;
 	private boolean _showRefreshIcon;
 	private String _urlBack = StringPool.BLANK;
@@ -611,6 +634,7 @@ public void copyTo(PortletDisplay slave) {
 	private String _urlHelp = StringPool.BLANK;
 	private String _urlMax = StringPool.BLANK;
 	private String _urlMin = StringPool.BLANK;
+	private String _urlPortlet = StringPool.BLANK;
 	private String _urlPrint = StringPool.BLANK;
 	private String _urlRefresh = StringPool.BLANK;
 	private boolean _restoreCurrentView;

diff --git a/portal-web/build.xml b/portal-web/build.xml
@@ -105,6 +105,8 @@
 			<arg value="${jspc.classpath}" />
 			<arg value="${jspc.classes.dir}" />
 		</java>
+
+		<delete file="alfresco.log" />
 	</target>
 
 	<target name="compile-jboss-jetty">