Author: thomas.heute(a)jboss.com Date: 2007-02-13 07:50:17 -0500 (Tue, 13 Feb 2007) New Revision: 6244 Modified: trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java trunk/cms/src/main/org/jboss/portal/cms/search/CMSResult.java trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java trunk/core-search/src/resources/portal-search-war/WEB-INF/default-object.xml Log: Cleanup Modified: trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java 2007-02-13 11:35:34 UTC (rev 6243) +++ trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java 2007-02-13 12:50:17 UTC (rev 6244) @@ -46,12 +46,15 @@ private CMS cms; private Info info; private String id; + private String urlPrefix; - public CMSFederatedSearch(Portlet portlet, String id) + public CMSFederatedSearch(String id) { this.id = id; info = new Info(); info.setStatus(Info.Status.AVAILABLE); + + this.urlPrefix = "portal/content"; } public void setCMS(CMS cms) @@ -91,7 +94,7 @@ while (it.hasNext()) { File file = (File)it.next(); - results.add(new CMSResult(file)); + results.add(new CMSResult(file, urlPrefix)); } return results; } Modified: trunk/cms/src/main/org/jboss/portal/cms/search/CMSResult.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/search/CMSResult.java 2007-02-13 11:35:34 UTC (rev 6243) +++ trunk/cms/src/main/org/jboss/portal/cms/search/CMSResult.java 2007-02-13 12:50:17 UTC (rev 6244) @@ -36,10 +36,10 @@ private File file; private ResultURL url; - public CMSResult(File file) + public CMSResult(File file, String prefix) { this.file = file; - this.url = new CMSResultURL("portal/content", file); + this.url = new CMSResultURL(prefix, file); } public float getScore() Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java =================================================================== --- trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2007-02-13 11:35:34 UTC (rev 6243) +++ trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2007-02-13 12:50:17 UTC (rev 6244) @@ -148,7 +148,7 @@ SearchFederation searchFederationService = (SearchFederation)getPortletContext().getAttribute("SearchFederationService"); if (searchFederationService.getSearchFederated(CMSConstants.SEARCH_ID) == null) { - CMSFederatedSearch federatedSearch = new CMSFederatedSearch(this, CMSConstants.SEARCH_ID); + CMSFederatedSearch federatedSearch = new CMSFederatedSearch(CMSConstants.SEARCH_ID); federatedSearch.setCMS(CMSService); searchFederationService.register(federatedSearch); } Modified: trunk/core-search/src/resources/portal-search-war/WEB-INF/default-object.xml =================================================================== --- trunk/core-search/src/resources/portal-search-war/WEB-INF/default-object.xml 2007-02-13 11:35:34 UTC (rev 6243) +++ trunk/core-search/src/resources/portal-search-war/WEB-INF/default-object.xml 2007-02-13 12:50:17 UTC (rev 6244) @@ -30,7 +30,7 @@ <deployment> <parent-ref>default</parent-ref> <page> - <page-name>search</page-name> + <page-name>Search</page-name> <window> <window-name>SearchPortletWindow</window-name> <instance-ref>SearchPortletInstance</instance-ref>