LEP-1918

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@3504 05bdf26c-840f-0410-9ced-eb539d925f36
sachinhub · Jan 2, 2007 · e1e28be · e1e28be
1 parent ecb5d59
commit e1e28be
Show file tree

Hide file tree

Showing 23 changed files with 541 additions and 35 deletions.
diff --git a/definitions/liferay-portlet-app_4_3_0.dtd b/definitions/liferay-portlet-app_4_3_0.dtd
diff --git a/portal-ejb/src/com/liferay/portal/model/impl/PortletImpl.java b/portal-ejb/src/com/liferay/portal/model/impl/PortletImpl.java
@@ -148,8 +148,8 @@ public PortletImpl(PortletPK pk) {
 	public PortletImpl(String portletId, String companyId, String strutsPath,
 					   String configurationPath, String displayName,
 					   String portletClass, String indexerClass,
-					   String schedulerClass, String portletURLClass,
-					   String friendlyURLPluginClass,
+					   String openSearchClass, String schedulerClass,
+					   String portletURLClass, String friendlyURLPluginClass,
 					   String portletDataHandlerClass,
 					   String smtpMessageListenerClass,
 					   String defaultPreferences, String prefsValidator,
@@ -178,6 +178,7 @@ public PortletImpl(String portletId, String companyId, String strutsPath,
 		_displayName = displayName;
 		_portletClass = portletClass;
 		_indexerClass = indexerClass;
+		_openSearchClass = openSearchClass;
 		_schedulerClass = schedulerClass;
 		_portletURLClass = portletURLClass;
 		_friendlyURLPluginClass = friendlyURLPluginClass;
@@ -335,6 +336,25 @@ public void setIndexerClass(String indexerClass) {
 		_indexerClass = indexerClass;
 	}
 
+	/**
+	 * Gets the name of the open search class of the portlet.
+	 *
+	 * @return		the name of the open search class of the portlet
+	 */
+	public String getOpenSearchClass() {
+		return _openSearchClass;
+	}
+
+	/**
+	 * Sets the name of the open search class of the portlet.
+	 *
+	 * @param		openSearchClass the name of the open search class of the
+	 *				portlet
+	 */
+	public void setOpenSearchClass(String openSearchClass) {
+		_openSearchClass = openSearchClass;
+	}
+
 	/**
 	 * Gets the name of the scheduler class of the portlet.
 	 *
@@ -1704,22 +1724,22 @@ public Object clone() {
 		return new PortletImpl(
 			getPortletId(), getCompanyId(), getStrutsPath(),
 			getConfigurationPath(), getDisplayName(), getPortletClass(),
-			getIndexerClass(), getSchedulerClass(), getPortletURLClass(),
-			getFriendlyURLPluginClass(), getPortletDataHandlerClass(),
-			getSmtpMessageListenerClass(), getDefaultPreferences(),
-			getPreferencesValidator(), isPreferencesCompanyWide(),
-			isPreferencesUniquePerLayout(), isPreferencesOwnedByGroup(),
-			isUseDefaultTemplate(), isShowPortletAccessDenied(),
-			isShowPortletInactive(), isActionURLRedirect(),
-			isRestoreCurrentView(), isMaximizeEdit(), isMaximizeHelp(),
-			isMaximizePrint(), isLayoutCacheable(), isInstanceable(),
-			isPrivateRequestAttributes(), isPrivateSessionAttributes(),
-			getRenderWeight(), isAjaxable(), getHeaderCss(),
-			getHeaderJavaScript(), isAddDefaultResource(), getRoles(),
-			getUnlinkedRoles(), getRoleMappers(), isSystem(), isActive(),
-			isInclude(), getInitParams(), getExpCache(), getPortletModes(),
-			getSupportedLocales(), getResourceBundle(), getPortletInfo(),
-			getUserAttributes(), getCustomUserAttributes(),
+			getIndexerClass(), getOpenSearchClass(), getSchedulerClass(),
+			getPortletURLClass(), getFriendlyURLPluginClass(),
+			getPortletDataHandlerClass(), getSmtpMessageListenerClass(),
+			getDefaultPreferences(), getPreferencesValidator(),
+			isPreferencesCompanyWide(), isPreferencesUniquePerLayout(),
+			isPreferencesOwnedByGroup(), isUseDefaultTemplate(),
+			isShowPortletAccessDenied(), isShowPortletInactive(),
+			isActionURLRedirect(), isRestoreCurrentView(), isMaximizeEdit(),
+			isMaximizeHelp(), isMaximizePrint(), isLayoutCacheable(),
+			isInstanceable(), isPrivateRequestAttributes(),
+			isPrivateSessionAttributes(), getRenderWeight(), isAjaxable(),
+			getHeaderCss(), getHeaderJavaScript(), isAddDefaultResource(),
+			getRoles(), getUnlinkedRoles(), getRoleMappers(), isSystem(),
+			isActive(), isInclude(), getInitParams(), getExpCache(),
+			getPortletModes(), getSupportedLocales(), getResourceBundle(),
+			getPortletInfo(), getUserAttributes(), getCustomUserAttributes(),
 			getServletContextName(), getServletURLPatterns());
 	}
 
@@ -1768,6 +1788,11 @@ public int compareTo(Object obj) {
 	 */
 	private String _indexerClass;
 
+	/**
+	 * The name of the open search class of the portlet.
+	 */
+	private String _openSearchClass;
+
 	/**
 	 * The name of the scheduler class of the portlet.
 	 */

diff --git a/portal-ejb/src/com/liferay/portal/service/impl/PortletLocalServiceImpl.java b/portal-ejb/src/com/liferay/portal/service/impl/PortletLocalServiceImpl.java
@@ -910,6 +910,9 @@ private Set _readLiferayPortletXML(
 				portletModel.setIndexerClass(GetterUtil.getString(
 					portlet.elementText("indexer-class"),
 					portletModel.getIndexerClass()));
+				portletModel.setOpenSearchClass(GetterUtil.getString(
+					portlet.elementText("open-search-class"),
+					portletModel.getOpenSearchClass()));
 				portletModel.setSchedulerClass(GetterUtil.getString(
 					portlet.elementText("scheduler-class"),
 					portletModel.getSchedulerClass()));

diff --git a/portal-ejb/src/com/liferay/portal/util/EntityResolver.java b/portal-ejb/src/com/liferay/portal/util/EntityResolver.java
@@ -139,6 +139,11 @@ else if (systemId != null) {
 			"liferay-portlet-app_4_2_0.dtd"
 		),
 
+		new KeyValuePair(
+			"-//Liferay//DTD Portlet Application 4.3.0//EN",
+			"liferay-portlet-app_4_3_0.dtd"
+		),
+
 		new KeyValuePair(
 			"-//Liferay//DTD Service Builder 4.0.0//EN",
 			"liferay-service-builder_4_0_0.dtd"

diff --git a/portal-kernel/src/com/liferay/portal/kernel/search/OpenSearch.java b/portal-kernel/src/com/liferay/portal/kernel/search/OpenSearch.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2000-2006 Liferay, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.liferay.portal.kernel.search;
+
+/**
+ * <a href="OpenSearch.java.html"><b><i>View Source</i></b></a>
+ *
+ * @author  Brian Wing Shun Chan
+ *
+ */
+public interface OpenSearch {
+
+	public String search(String keywords, int begin, int end)
+		throws SearchException;
+
+}
diff --git a/portal-service/src/com/liferay/portal/model/Portlet.java b/portal-service/src/com/liferay/portal/model/Portlet.java
@@ -53,6 +53,10 @@ public interface Portlet extends PortletModel {
 
 	public void setIndexerClass(java.lang.String indexerClass);
 
+	public java.lang.String getOpenSearchClass();
+
+	public void setOpenSearchClass(java.lang.String openSearchClass);
+
 	public java.lang.String getSchedulerClass();
 
 	public void setSchedulerClass(java.lang.String schedulerClass);

diff --git a/portal-web/docroot/WEB-INF/liferay-portlet.xml b/portal-web/docroot/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/alfresco.war.ext/WEB-INF/liferay-portlet.xml b/portlets/alfresco.war.ext/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-dao-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-dao-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-jsf-facelets-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-jsf-facelets-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-jsf-myfaces-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-jsf-myfaces-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-jsf-sun-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-jsf-sun-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-json-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-json-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-jsp-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-jsp-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-permissions-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-permissions-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-portal-client-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-portal-client-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-portal-service-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-portal-service-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-spring-portlet.war.ext/WEB-INF/liferay-portlet.xml b/portlets/sample-spring-portlet.war.ext/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-struts-global-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-struts-global-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-struts-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-struts-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-tapestry-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-tapestry-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/portlets/sample-test-portlet.war/WEB-INF/liferay-portlet.xml b/portlets/sample-test-portlet.war/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
 	<portlet>

diff --git a/tools/ext_tmpl/ext-web/docroot/WEB-INF/liferay-portlet-ext.xml b/tools/ext_tmpl/ext-web/docroot/WEB-INF/liferay-portlet-ext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_2_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>