[portal-commits] JBoss Portal SVN: r6191 - in trunk/portal-search: src and 11 other directories.

Author: thomas.heute(a)jboss.com Date: 2007-02-08 14:27:00 -0500 (Thu, 08 Feb 2007) New Revision: 6191 Added: trunk/portal-search/.classpath trunk/portal-search/.project trunk/portal-search/build.bat trunk/portal-search/build.sh trunk/portal-search/build.xml trunk/portal-search/src/ trunk/portal-search/src/main/ trunk/portal-search/src/main/org/ trunk/portal-search/src/main/org/jboss/ trunk/portal-search/src/main/org/jboss/portal/ trunk/portal-search/src/main/org/jboss/portal/search/ trunk/portal-search/src/main/org/jboss/portal/search/SearchConstants.java trunk/portal-search/src/main/org/jboss/portal/search/SearchPortlet.java trunk/portal-search/src/resources/ trunk/portal-search/src/resources/portal-search-sar/ trunk/portal-search/src/resources/portal-search-sar/META-INF/ trunk/portal-search/src/resources/portal-search-sar/META-INF/jboss-service.xml trunk/portal-search/src/resources/portal-search-war/ trunk/portal-search/src/resources/portal-search-war/WEB-INF/ trunk/portal-search/src/resources/portal-search-war/WEB-INF/default-object.xml trunk/portal-search/src/resources/portal-search-war/WEB-INF/jboss-portlet.xml trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/ trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/search.jsp trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/viewResults.jsp trunk/portal-search/src/resources/portal-search-war/WEB-INF/portal-lib.tld trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet.xml Log: 3rd try... let's put it at the correct place this time... - Search Federation prototype JBPORTAL-1155 - CMS Search prototype - Eclipse project files update Added: trunk/portal-search/.classpath =================================================================== --- trunk/portal-search/.classpath (rev 0) +++ trunk/portal-search/.classpath 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/api"/> + <classpathentry combineaccessrules="false" kind="src" path="/core"/> + <classpathentry combineaccessrules="false" kind="src" path="/search"/> + <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> + <classpathentry combineaccessrules="false" kind="src" path="/cms"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/portal-search/.project =================================================================== --- trunk/portal-search/.project (rev 0) +++ trunk/portal-search/.project 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>portal-search</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/portal-search/build.bat =================================================================== --- trunk/portal-search/build.bat (rev 0) +++ trunk/portal-search/build.bat 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,54 @@ +@echo off +rem +rem Invokes a script of the same name in the 'tools' module. +rem +rem The 'tools' module is expected to be a peer directory of the directory +rem in which this script lives. +rem +rem @author Jason Dillon <jason(a)planet57.com&gt; +rem + +rem $Id: build.bat 1015 2005-11-04 20:15:13Z mholzner $ + +setlocal + +set PROGNAME=%~nx0 +set DIRNAME=%~dp0 + +rem Legacy shell support +if x%PROGNAME%==x set PROGNAME=build.bat +if x%DIRNAME%==x set DIRNAME=.\ + +set MODULE_ROOT=%DIRNAME% +if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools +set TARGET=%TOOLS_ROOT%\bin\build.bat +set ARGS=%* + +rem Start'er up yo +goto main + +:debug +if not x%DEBUG%==x echo %PROGNAME%: %* +goto :EOF + +:main +call :debug PROGNAME=%PROGNAME% +call :debug DIRNAME=%DIRNAME% +call :debug TOOLS_ROOT=%TOOLS_ROOT% +call :debug TARGET=%TARGET% + +if exist %TARGET% call :call-script & goto :EOF +rem else fail, we can not go on + +echo %PROGNAME%: *ERROR* The target executable does not exist: +echo %PROGNAME%: +echo %PROGNAME%: %TARGET% +echo %PROGNAME%: +echo %PROGNAME%: Please make sure you have checked out the 'tools' module +echo %PROGNAME%: and make sure it is up to date. +goto :EOF + +:call-script +call :debug Executing %TARGET% %ARGS% +call %TARGET% %ARGS% +goto :EOF Property changes on: trunk/portal-search/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/portal-search/build.sh =================================================================== --- trunk/portal-search/build.sh (rev 0) +++ trunk/portal-search/build.sh 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,49 @@ +#!/bin/sh +## +## Invokes a script of the same name in the 'tools' module. +## +## The 'tools' module is expected to be a peer directory of the directory +## in which this script lives. +## +## @author Jason Dillon <jason(a)planet57.com&gt; +## + +# $Id: build.sh 1015 2005-11-04 20:15:13Z mholzner $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` + +# Buss it yo +main() { + if [ "x$TOOLS_ROOT" = "x" ]; then + TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` + fi + + MODULE_ROOT=`cd $DIRNAME; pwd` + export TOOLS_ROOT MODULE_ROOT DEBUG TRACE + + # Where is the target script? + target="$TOOLS_ROOT/bin/$PROGNAME" + if [ ! -f "$target" ]; then + echo "${PROGNAME}: *ERROR* The target executable does not exist:" + echo "${PROGNAME}:" + echo "${PROGNAME}: $target" + echo "${PROGNAME}:" + echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" + echo "${PROGNAME}: and make sure it is up to date." + exit 2 + fi + + # Get busy yo! + if [ "x$DEBUG" != "x" ]; then + echo "${PROGNAME}: Executing: /bin/sh $target $@" + fi + if [ "x$TRACE" = "x" ]; then + exec /bin/sh $target "$@" + else + exec /bin/sh -x $target "$@" + fi +} + +# Lets get ready to rumble! +main "$@" Property changes on: trunk/portal-search/build.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/portal-search/build.xml =================================================================== --- trunk/portal-search/build.xml (rev 0) +++ trunk/portal-search/build.xml 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,327 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> + +<!--+======================================================================+--> +<!--| JBoss Portal (The OpenSource Portal) Build File |--> +<!--| |--> +<!--| Distributable under LGPL license. |--> +<!--| See terms of license at http://www.gnu.org. |--> +<!--| |--> +<!--| This file has been designed to work with the 'tools' module and |--> +<!--| Buildmagic extentions. |--> +<!--+======================================================================+--> + +<project default="main" name="JBoss Portal"> + + <!--+====================================================================+--> + <!--| Setup |--> + <!--| |--> + <!--| Include the common build elements. |--> + <!--| |--> + <!--| This defines several different targets, properties and paths. |--> + <!--| It also sets up the basic extention tasks amoung other things. |--> + <!--+====================================================================+--> + + &buildmagic; + &modules; + &defaults; + &tools; + &targets; + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <!-- + | Initialize the build system. Must depend on '_buildmagic:init'. + | Other targets should depend on 'init' or things will mysteriously fail. + --> + + <target name="init" unless="init.disable" depends="_buildmagic:init"> + </target> + + <!--+====================================================================+--> + <!--| Configuration |--> + <!--| |--> + <!--| This target is invoked by the Buildmagic initialization logic |--> + <!--| and should contain module specific configuration elements. |--> + <!--+====================================================================+--> + + <target name="configure" unless="configure.disable"> + + <!-- Configure some properties --> + <property name="jboss-junit-configuration" value=""/> + <property name="junit.formatter.usefile" value="true"/> + + <!-- Configure thirdparty libraries --> + &libraries; + + <path id="library.classpath"> + <path refid="jboss.jbossxb.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="hibernate.hibernate.classpath"/> + <path refid="apache.ant.classpath"/> + <path refid="apache.myfaces.classpath"/> + <path refid="apache.tomahawk.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="sun.servlet.classpath"/> + <path refid="jakarta.cactus.classpath"/> + <path refid="apache.fileupload.classpath"/> + <path refid="jakarta.io.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="jwebunit.jwebunit.classpath"/> + <path refid="dbunit.dbunit.classpath"/> + <path refid="sun.jaf.classpath"/> + <path refid="portals.bridges.classpath"/> + <path refid="beanshell.beanshell.classpath"/> + <path refid="facelets.facelets.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="jboss.aop.classpath"/> + <path refid="trove.trove.classpath"/> + <path refid="qdox.qdox.classpath"/> + <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> + <!-- jbpm integration --> + <path refid="jbpm.jbpm.classpath"/> + </path> + + <!-- Configure modules --> + <call target="configure-modules"/> + <path id="dependentmodule.classpath"> + <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal-cms.classpath"/> + <path refid="jboss.portal-server.classpath"/> + <path refid="jboss.portal-search.classpath"/> + <path refid="jboss.portal-portlet.classpath"/> + <path refid="jboss.portal-jems.classpath"/> + <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portlet-api.classpath"/> + <path refid="jboss.portal-security.classpath"/> + <path refid="jboss.portal-theme.classpath"/> + <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal-core.classpath"/> + <path refid="jboss.portal-workflow.classpath"/> + </path> + + <!--+=======================================+--> + <!--| Override any default properties here. |--> + <!--+=======================================+--> + + <!-- Configure defaults & build tools --> + <call target="configure-defaults"/> + <call target="configure-tools"/> + + <!--+=======================================+--> + <!--| Define module specific elements here. |--> + <!--+=======================================+--> + <property name="javadoc.private" value="true"/> + <property name="javadoc.protected" value="false"/> + + <path id="hibernate.classpath"> + <path refid="apache.commons.classpath"/> + <path refid="asm.asm.classpath"/> + <path refid="cglib.cglib.classpath"/> + <path refid="antlr.antlr.classpath"/> + <path refid="odmg.odmg.classpath"/> + <path refid="ehcache.ehcache.classpath"/> + <path refid="hibernate.hibernate.classpath"/> + </path> + + <path id="aop.classpath"> + <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> + <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> + <path refid="javassist.javassist.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="trove.trove.classpath"/> + <path refid="qdox.qdox.classpath"/> + </path> + + <taskdef name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> + <taskdef name="implode" + classname="org.jboss.portal.common.ant.Implode" + classpathref="explode.task.classpath"/> + + </target> + + <target name="configure-explode"> + <path id="explode.task.classpath"> + <pathelement location="${project.tools}/lib/explode.jar"/> + <path refid="apache.ant.classpath"/> + </path> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> + </target> + + <!--+====================================================================+--> + <!--| Compile |--> + <!--| |--> + <!--| This target should depend on other compile-* targets for each |--> + <!--| different type of compile that needs to be performed, short of |--> + <!--| documentation compiles. |--> + <!--+====================================================================+--> + + <target name="compile" + description="Compile all source files." + depends="_default:compile-classes, + _default:compile-etc, + _default:compile-resources"> + <!-- Add module specific elements here. --> + + </target> + + <!--+====================================================================+--> + <!--| Generate Output |--> + <!--| |--> + <!--| Generates the target output for this module. Target output is |--> + <!--| the output which is ment to be released or used by external |--> + <!--| modules. |--> + <!--+====================================================================+--> + + <target name="artifacts" + description="Generate all target output." + depends="compile"> + + <mkdir dir="${build.lib}"/> + + <!-- portal-jbp-search-lib.jar --> + <jar jarfile="${build.lib}/portal-jbp-search-lib.jar"> + <fileset dir="${build.classes}"> + </fileset> + </jar> + + <!-- portal-search.sar --> + <copy todir="${build.resources}/portal-search"> + <!--fileset dir="${source.bin}/portal-search-sar"/--> + <fileset dir="${build.resources}/portal-search-sar"/> + </copy> + <copy todir="${build.resources}/portal-search/lib"> + <fileset dir="${build.lib}" includes="portal-jbp-search-lib.jar"/> + <fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/> + </copy> + + <!-- portal-search.war --> + <copy todir="${build.resources}/portal-search/portal-search.war"> + <!--fileset dir="${source.bin}/portal-search-war"/--> + <fileset dir="${build.resources}/portal-search-war"/> + </copy> + + </target> + + + + <!-- Build the portal-search.sar --> + <target name="output" depends="artifacts"> + + <!-- Build configurations --> + <copy todir="${build.resources}/portal-search.sar"> + <fileset dir="${build.resources}/portal-search" excludes="**/*.xml"/> + </copy> + + <copy todir="${build.resources}/portal-search.sar"> + <filterset> + <filtersfile file="../build/etc/single.properties"/> + </filterset> + <fileset dir="${build.resources}/portal-search" includes="**/*.xml"/> + </copy> + <!-- Build archives --> + <implode + dir="${build.resources}/portal-search.sar" + tofile="${build.lib}/portal-search.sar"/> + </target> + + <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed --> + <target name="package-tests" depends="init"> + </target> + + <!-- ================================================================== --> + <!-- Cleaning --> + <!-- ================================================================== --> + + <!-- Clean up all build output --> + <target name="clean" depends="_default:clean"> + <!-- Add module specific elements here. --> + </target> + + <!--+====================================================================+--> + <!--| Documents |--> + <!--| |--> + <!--| Generate all documentation for this module. |--> + <!--+====================================================================+--> + + <target name="docs" depends="_default:docs"> + <!-- Add module specific elements here. --> + </target> + + <!-- ================================================================== --> + <!-- Misc. --> + <!-- ================================================================== --> + + <target name="main" depends="most"/> + <target name="all" depends="_default:all"/> + <target name="most" depends="_default:most"/> + <target name="help" depends="_default:help"/> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- + | Deploy the application + --> + + <target name="deploy" + description="Deploy." + depends="output"> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> + <copy file="${build.lib}/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> + </target> + + <!-- + | Undeploy the application + --> + <target name="undeploy" + description="Undeploy." + depends="init"> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> + <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/> + </target> + + <target name="tests" depends="init, _buildmagic:configure:deployment"> + </target> +</project> Added: trunk/portal-search/src/main/org/jboss/portal/search/SearchConstants.java =================================================================== --- trunk/portal-search/src/main/org/jboss/portal/search/SearchConstants.java (rev 0) +++ trunk/portal-search/src/main/org/jboss/portal/search/SearchConstants.java 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,35 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.search; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class SearchConstants +{ + public static final String OP_DOSEARCH = "do_search"; + public static final String OP_VIEWSEARCHRESULTS = "view_search_results"; + public static String SEARCH_JSP_PATH = "/WEB-INF/jsp"; + +} Added: trunk/portal-search/src/main/org/jboss/portal/search/SearchPortlet.java =================================================================== --- trunk/portal-search/src/main/org/jboss/portal/search/SearchPortlet.java (rev 0) +++ trunk/portal-search/src/main/org/jboss/portal/search/SearchPortlet.java 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,105 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.search; + +import java.io.IOException; +import java.util.List; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletException; + +import org.jboss.portal.api.node.PortalNode; +import org.jboss.portal.search.federation.SearchFederation; +import org.jboss.portal.search.query.Query; +import org.jboss.portlet.JBossPortlet; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossRenderResponse; + + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class SearchPortlet extends JBossPortlet +{ + + private SearchFederation searchService; + + public void init() + { + searchService = (SearchFederation)getPortletContext().getAttribute("SearchService"); + } + + + public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, IOException + { + rRes.setContentType("text/html"); + String op = rReq.getParameter("op"); + + if ((op == null) || ("".equals(op))) + { + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(SearchConstants.SEARCH_JSP_PATH + "/search.jsp"); + try + { + prd.include(rReq, rRes); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + else if (op.equals(SearchConstants.OP_VIEWSEARCHRESULTS)) + { + rRes.setContentType("text/html"); + + String textQuery = rReq.getParameter("search"); + + Query query = QueryConverter.convert(textQuery); + + List results = searchService.search(query); + + rReq.setAttribute("results", results); + + + PortalNode root = rReq.getPortalNode().getRoot(); + + rReq.setAttribute("rootNode", root); + rReq.setAttribute("JBossRenderResponse", rRes); + + + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(SearchConstants.SEARCH_JSP_PATH + "/viewResults.jsp"); + prd.include(rReq, rRes); + } + + } + + public void processAction(ActionRequest aReq, ActionResponse aRes) + { + String search = (String) aReq.getParameter("search"); + + aRes.setRenderParameter("search", search); + aRes.setRenderParameter("op", SearchConstants.OP_VIEWSEARCHRESULTS); + + } +} Added: trunk/portal-search/src/resources/portal-search-sar/META-INF/jboss-service.xml =================================================================== --- trunk/portal-search/src/resources/portal-search-sar/META-INF/jboss-service.xml (rev 0) +++ trunk/portal-search/src/resources/portal-search-sar/META-INF/jboss-service.xml 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<server> + + <mbean + code="org.jboss.portal.search.federation.impl.SearchFederationService" + name="portal:service=SearchFederationService" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> + +</server> Property changes on: trunk/portal-search/src/resources/portal-search-sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/default-object.xml =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/default-object.xml (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/default-object.xml 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE deployments PUBLIC + "-//JBoss Portal//DTD Portal Object 2.6//EN" + "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> + +<deployments> + <deployment> + <parent-ref>default</parent-ref> + <page> + <page-name>default</page-name> + <window> + <window-name>SearchPortletWindow</window-name> + <instance-ref>SearchPortletInstance</instance-ref> + <region>center</region> + <height>1</height> + </window> + </page> + </deployment> +</deployments> Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/jboss-portlet.xml (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/jboss-portlet.xml 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,41 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE portlet-app PUBLIC + "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> + +<portlet-app> + <portlet> + <portlet-name>SearchPortlet</portlet-name> + <transaction> + <trans-attribute>Required</trans-attribute> + </transaction> + </portlet> + <service> + <service-name>SearchService</service-name> + <service-class>org.jboss.portal.search.federation.SearchFederation</service-class> + <service-ref>:service=SearchFederationService</service-ref> + </service> + +</portlet-app> Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/search.jsp =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/search.jsp (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/search.jsp 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,19 @@ +<%@ page import="org.jboss.portal.search.SearchConstants" %> +<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ page isELIgnored="false" %> + +<portlet:defineObjects/> + + +<form method="post" action="<portlet:actionURL> + <portlet:param name="op" value="<%= SearchConstants.OP_DOSEARCH %>"/> + </portlet:actionURL>"> + <input type="text" + size="15" + maxlength="80" + name="search" + class="portlet-form-input-field"/> + <input type="submit" name="search" value="${n:i18n("SEARCH_SEARCH")}" class="portlet-form-button"/> +</form> Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/viewResults.jsp =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/viewResults.jsp (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/jsp/viewResults.jsp 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,50 @@ +<%@ page import="org.jboss.portal.search.SearchConstants" %> +<%@ page import="org.jboss.portal.search.result.ResultSet" %> +<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ page isELIgnored="false" %> + +<%@page import="java.util.Iterator"%> +<%@page import="org.jboss.portal.search.result.Result"%> +<%@page import="org.jboss.portal.search.result.impl.SimpleResult"%> +<%@page import="org.jboss.portal.cms.model.File"%> +<%@page import="org.jboss.portal.api.node.PortalNode"%> +<%@page import="org.jboss.portal.api.node.PortalNodeURL"%> +<%@page import="org.jboss.portlet.JBossRenderResponse"%> +<%@page import="java.util.List"%> +<portlet:defineObjects/> + + +<% + List listResults = (List)request.getAttribute("results"); + PortalNode rootNode = (PortalNode)request.getAttribute("rootNode"); + JBossRenderResponse jbossResponse = (JBossRenderResponse)request.getAttribute("JBossRenderResponse"); + + + Iterator listIt = listResults.iterator(); + while (listIt.hasNext()) + { + ResultSet results = (ResultSet)listIt.next(); + Iterator it = results.iterator(); + + out.println("<h2>" + results.getSearchFederated().getName(renderRequest.getLocale()) + "</h2>"); + + out.println("<table>"); + out.println("<tr><td>Name</td></tr>"); + + while (it.hasNext()) + { + Result result = (Result)it.next(); +// PortalNode node = rootNode.resolve("default/default/CMSWindow"); +// PortalNode node = rootNode.resolve(result.getURL().getTargetWindow()); +// PortalNodeURL windowURL = jbossResponse.createRenderURL(node); +// windowURL.setParameter("path", file.getBasePath()); + out.println("<tr><td><a href=\"" + result.getURL().toString() +"\">" + result.getTitle() + "</a></td>"); + out.println("</tr>"); + } + out.println("</table>"); + } + +%> + Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/portal-lib.tld =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/portal-lib.tld (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/portal-lib.tld 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,104 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + version="2.0"> + <tlib-version>1.1</tlib-version> + <short-name>JBoss-Portal-tags</short-name> + + <tag> + <name>if</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>ctx</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>iterate</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>ctx</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>include</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>error</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>key</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>errors</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class> + <body-content>JSP</body-content> + </tag> + + <tag> + <name>success</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class> + <body-content>JSP</body-content> + </tag> + <function> + <name>i18n</name> + <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class> + <function-signature>java.lang.String getMessage(java.lang.String)</function-signature> + </function> + + <function> + <name>out</name> + <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class> + <function-signature>java.lang.String out(java.lang.String)</function-signature> + </function> + + <function> + <name>i18nout</name> + <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class> + <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature> + </function> + +</taglib> Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,36 @@ +<?xml version="1.0" standalone="yes"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE deployments PUBLIC + "-//JBoss Portal//DTD Portlet Instances 2.6//EN" + "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd"> + +<deployments> + <deployment> + <instance> + <instance-id>SearchPortletInstance</instance-id> + <portlet-ref>SearchPortlet</portlet-ref> + </instance> + </deployment> +</deployments> \ No newline at end of file Property changes on: trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet.xml =================================================================== --- trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet.xml (rev 0) +++ trunk/portal-search/src/resources/portal-search-war/WEB-INF/portlet.xml 2007-02-08 19:27:00 UTC (rev 6191) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<portlet-app + xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + version="1.0"> + <portlet> + <description>Search Portlet</description> + <portlet-name>SearchPortlet</portlet-name> + <display-name>Search Portlet</display-name> + + <portlet-class>org.jboss.portal.search.SearchPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>Search Portlet</title> + </portlet-info> + </portlet> +</portlet-app>