You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2009/03/30 19:35:45 UTC
svn commit: r760065 - in /portals/jetspeed-2/portal/trunk/components:
jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/
jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/
jetspeed-statistics/src/main/java/org/apache/j...
Author: taylor
Date: Mon Mar 30 17:35:45 2009
New Revision: 760065
URL: http://svn.apache.org/viewvc?rev=760065&view=rev
Log:
search should return empty set and not null (causing exceptions under PAM in test cases)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/audit/impl/AuditActivityImpl.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java?rev=760065&r1=760064&r2=760065&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java Mon Mar 30 17:35:45 2009
@@ -35,10 +35,9 @@
public class PortletApplicationHandler extends AbstractObjectHandler
{
private static final String KEY_PREFIX = "PortletApplication::";
- private static final String ID = "ID";
{
- fields.add(ID);
+ fields.add(ParsedObject.ID);
}
/**
@@ -64,7 +63,7 @@
result.setClassName(pa.getClass().getName());
MultiHashMap fieldMap = new MultiHashMap();
- fieldMap.put(ID, pa.getName());
+ fieldMap.put(ParsedObject.ID, pa.getName());
Collection fields = pa.getMetadata().getFields();
for (Iterator fieldIter = fields.iterator(); fieldIter.hasNext();)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java?rev=760065&r1=760064&r2=760065&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java Mon Mar 30 17:35:45 2009
@@ -38,11 +38,10 @@
public class PortletDefinitionHandler extends AbstractObjectHandler
{
private static final String KEY_PREFIX = "PortletDefinition::";
- private static final String ID = "ID";
private static final String PORTLET_APPLICATION = "portlet_application";
{
- fields.add(ID);
+ fields.add(ParsedObject.ID);
fields.add(PORTLET_APPLICATION);
}
@@ -70,7 +69,7 @@
//TODO: this is common to PAs as well, possible refactor
MultiHashMap fieldMap = new MultiHashMap();
- fieldMap.put(ID, pd.getPortletName());
+ fieldMap.put(ParsedObject.ID, pd.getPortletName());
PortletApplication pa = (PortletApplication)pd.getApplication();
fieldMap.put(PORTLET_APPLICATION, pa.getName());
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java?rev=760065&r1=760064&r2=760065&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java Mon Mar 30 17:35:45 2009
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -412,8 +413,9 @@
}
catch (ParseException e)
{
- //logger.info("Failed to parse query " + query);
- return null;
+ List<ParsedObject> resultList = new ArrayList<ParsedObject>();
+ SearchResults results = new SearchResultsImpl(resultList);
+ return results;
}
try
@@ -422,12 +424,13 @@
}
catch (IOException e)
{
- //logger.error("Error while peforming search.", e);
- return null;
+ List<ParsedObject> resultList = new ArrayList<ParsedObject>();
+ SearchResults results = new SearchResultsImpl(resultList);
+ return results;
}
int hitNum = hits.length();
- ArrayList resultList = new ArrayList(hitNum);
+ List<ParsedObject> resultList = new ArrayList<ParsedObject>(hitNum);
for(int i=0; i<hitNum; i++)
{
ParsedObject result = new BaseParsedObject();
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/audit/impl/AuditActivityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/audit/impl/AuditActivityImpl.java?rev=760065&r1=760064&r2=760065&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/audit/impl/AuditActivityImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/audit/impl/AuditActivityImpl.java Mon Mar 30 17:35:45 2009
@@ -96,6 +96,15 @@
}
}
+ public void logAdminRegistryActivity(String adminUser, String ipAddress, String activity, String description)
+ {
+ if (enabled)
+ {
+ logAdminActivity(adminUser, ipAddress, "", activity, description, AuditActivity.CAT_ADMIN_REGISTRY_MAINTENANCE, "", "", "");
+ }
+ }
+
+
protected void logAdminActivity(String adminName, String ipAddress, String targetUser, String activity, String description, String category, String name, String beforeValue, String afterValue)
{
Connection con = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org