Author: julien(a)jboss.com Date: 2008-04-11 17:51:59 -0400 (Fri, 11 Apr 2008) New Revision: 10543 Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml Log: first attempt to integrate samples coming from portlet module Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-04-11 21:13:10 UTC (rev 10542) +++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-04-11 21:51:59 UTC (rev 10543) @@ -239,6 +239,12 @@ <fileset dir="${build.classes}" includes="org/jboss/portal/core/samples/weather/**"/> </jar> + <!-- portal-portlet-samples.war --> + <copy todir="${build.resources}/portal-portlet-samples.war"> + <fileset dir="${build.resources}/portal-portlet-samples-war"/> + </copy> + <mkdir dir="${build.resources}/portal-portlet-samples.war/WEB-INF/lib/"/> + <copy file="${jboss.portal/modules/portlet.lib}/portal-portlet-samples-lib.jar" todir="${build.resources}/portal-portlet-samples.war/WEB-INF/lib/"/> <!-- portal-users-samples-lib.jar --> <jar jarfile="${build.lib}/portal-users-samples-lib.jar"> @@ -274,6 +280,9 @@ <implode dir="${build.resources}/portal-users-samples.sar" tofile="${build.lib}/portal-users-samples.sar"/> + <implode + dir="${build.resources}/portal-portlet-samples.war" + tofile="${build.lib}/portal-portlet-samples.war"/> </target> <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed --> @@ -330,6 +339,8 @@ overwrite="true"/> <copy file="${build.lib}/portal-users-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> + <copy file="${build.lib}/portal-portlet-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" + overwrite="true"/> </target> <!-- Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-04-11 21:51:59 UTC (rev 10543) @@ -0,0 +1,71 @@ +<?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> + <if-exists>keep</if-exists> + <page> + <page-name>Samples</page-name> + <display-name xml:lang="en">Samples</display-name> + <display-name xml:lang="fr">Exemples</display-name> +<!-- + <properties> + <property> + <name>order</name> + <value>3</value> + </property> + </properties> +--> + <window> + <window-name>GoogleMapPortletWindow</window-name> + <instance-ref>GoogleMapPortletInstance</instance-ref> + <region>center</region> + <height>1</height> + </window> + <window> + <window-name>GoogleWeatherPortletWindow1</window-name> + <instance-ref>GoogleWeatherPortletInstance</instance-ref> + <region>center</region> + <height>2</height> + </window> + <window> + <window-name>GoogleWeatherPortletWindow2</window-name> + <instance-ref>GoogleWeatherPortletInstance</instance-ref> + <region>center</region> + <height>3</height> + </window> + <window> + <window-name>GoogleWeatherPortletWindow3</window-name> + <instance-ref>GoogleWeatherPortletInstance</instance-ref> + <region>center</region> + <height>4</height> + </window> + </page> + </deployment> +</deployments> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml 2008-04-11 21:51:59 UTC (rev 10543) @@ -0,0 +1,44 @@ +<?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> + <display-name xml:lang="en">Google Map</display-name> + <instance-id>GoogleMapPortletInstance</instance-id> + <portlet-ref>GoogleMap</portlet-ref> + </instance> + </deployment> + <deployment> + <instance> + <display-name xml:lang="en">Google Weather</display-name> + <instance-id>GoogleWeatherPortletInstance</instance-id> + <portlet-ref>GoogleWeather</portlet-ref> + </instance> + </deployment> +</deployments> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet.xml 2008-04-11 21:51:59 UTC (rev 10543) @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2008, 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_2_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + <portlet> + <description>Portlet displaying a location on Google Maps</description> + <portlet-name>GoogleMap</portlet-name> + <display-name>Google Map Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.google.GoogleClippingPortlet</portlet-class> + <expiration-cache>120</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + <portlet-mode>EDIT</portlet-mode> + </supports> + <portlet-info> + <title>Google Map Portlet</title> + <keywords>sample,map,google</keywords> + </portlet-info> + <portlet-preferences> + <preference> + <name>zipcode</name> + <value>94102</value> + <read-only>false</read-only> + </preference> + </portlet-preferences> + <supported-public-render-parameter>zipcode</supported-public-render-parameter> + </portlet> + + <portlet> + <description>Portlet displaying the weather forecast for the specified location</description> + <portlet-name>GoogleWeather</portlet-name> + <display-name>Google Weather Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.google.GoogleWeatherClippingPortlet</portlet-class> + <expiration-cache>120</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + <portlet-mode>EDIT</portlet-mode> + </supports> + <portlet-info> + <title>Google Weather Portlet</title> + <keywords>sample,weather,google</keywords> + </portlet-info> + <portlet-preferences> + <preference> + <name>zipcode</name> + <value>80201</value> + <read-only>false</read-only> + </preference> + </portlet-preferences> + <supported-public-render-parameter>zipcode</supported-public-render-parameter> + </portlet> + + <portlet> + <description>Catalog Portlet</description> + <portlet-name>Catalog</portlet-name> + <display-name>Catalog Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.shoppingcart.CatalogPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>Catalog Portlet</title> + <keywords>sample,event,catalog</keywords> + </portlet-info> + <supported-publishing-event> + <qname xmlns:jbp="urn:jboss:portal:samples:event">jbp:CartEvent</qname> + </supported-publishing-event> + </portlet> + + <portlet> + <description>Cart Portlet</description> + <portlet-name>Cart</portlet-name> + <display-name>Cart Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.shoppingcart.CartPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>Cart Portlet</title> + <keywords>sample,event,cart</keywords> + </portlet-info> + <supported-processing-event> + <qname xmlns:jbp="urn:jboss:portal:samples:event">jbp:CartEvent</qname> + </supported-processing-event> + </portlet> + + <event-definition> + <qname xmlns:jbp="urn:jboss:portal:samples:event">jbp:CartEvent</qname> + <value-type>org.jboss.portal.portlet.samples.shoppingcart.CartEvent</value-type> + </event-definition> + + <public-render-parameter> + <identifier>zipcode</identifier> + <qname xmlns:g="urn:jboss:portal:simple:google">g:zipcode</qname> + </public-render-parameter> + + <public-render-parameter> + <identifier>zipcode</identifier> + <qname xmlns:g="urn:jboss:portal:simple:google">g:zipcode</qname> + </public-render-parameter> + +</portlet-app> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml 2008-04-11 21:51:59 UTC (rev 10543) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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 web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> +</web-app>