[gatein-commits] gatein SVN: r46 - in components/pc/trunk: build/distrib and 12 other directories.

Author: thomas.heute(a)jboss.com Date: 2009-08-21 09:56:55 -0400 (Fri, 21 Aug 2009) New Revision: 46 Added: components/pc/trunk/build/distrib/GateInPC-README.txt Removed: components/pc/trunk/build/distrib/JBossPC-README.txt components/pc/trunk/jsr168api/build.xml Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java components/pc/trunk/build/distrib/distrib.xml components/pc/trunk/docs/user-guide/en/modules/introduction.xml components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java components/pc/trunk/portal/pom.xml components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp components/pc/trunk/samples/pom.xml components/pc/trunk/samples/src/assemble/samples-basic-portlet.xml components/pc/trunk/samples/src/assemble/samples-eventdebug-portlet.xml components/pc/trunk/samples/src/assemble/samples-google-portlet.xml components/pc/trunk/samples/src/assemble/samples-jsp-portlet.xml components/pc/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml components/pc/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml components/pc/trunk/test/src/test/build.xml Log: More fixes Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java =================================================================== --- components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java 2009-08-21 13:56:55 UTC (rev 46) @@ -122,7 +122,7 @@ if (!opaqueValue.startsWith(JBPNS_PREFIX)) { throw new IllegalArgumentException("Bad format: [" + opaqueValue - + "] was not encoded by JBoss Portal and thus cannot be decoded."); + + "] was not encoded by GateIn Portal and thus cannot be decoded."); } // Copied: components/pc/trunk/build/distrib/GateInPC-README.txt (from rev 41, components/pc/trunk/build/distrib/JBossPC-README.txt) =================================================================== --- components/pc/trunk/build/distrib/GateInPC-README.txt (rev 0) +++ components/pc/trunk/build/distrib/GateInPC-README.txt 2009-08-21 13:56:55 UTC (rev 46) @@ -0,0 +1,15 @@ + +GateIn Portlet Container +LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage) + +GateIn Portlet Container is the next generation portlet container on which GateIn Portal +is based. It provides a standard-compliant implementation of the JSR-286 Portlet 2.0 +specification. It has been developed with reusability in mind so that advanced users, who don't require +a full-fledged portal, can leverage the portlet management services it provides in their own applications. +GateIn Portlet Container is available through the business-friendly LGPL open source license. + +This distribution also contains a simple portal built on top of GateIn Portlet Container. This simple +portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x. + +INSTALLATION AND RUNNING: +For installation, please refer to the user guide available in the 'gateinpc-docs' directory Deleted: components/pc/trunk/build/distrib/JBossPC-README.txt =================================================================== --- components/pc/trunk/build/distrib/JBossPC-README.txt 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/build/distrib/JBossPC-README.txt 2009-08-21 13:56:55 UTC (rev 46) @@ -1,15 +0,0 @@ - -JBoss Portlet Container -LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage) - -JBoss Portlet Container is the next generation portlet container on which future versions of JBoss -Portal will be based. It provides a standard-compliant implementation of the JSR-286 Portlet 2.0 -specification. It has been developed with reusability in mind so that advanced users, who don't require -a full-fledged portal, can leverage the portlet management services it provides in their own applications. -JBoss Portlet Container is available through the business-friendly LGPL open source license. - -This distribution also contains a simple portal built on top of JBoss Portlet Container. This simple -portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x. - -INSTALLATION AND RUNNING: -For installation, please refer to the user guide available in the 'jbosspc-docs' directory \ No newline at end of file Modified: components/pc/trunk/build/distrib/distrib.xml =================================================================== --- components/pc/trunk/build/distrib/distrib.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/build/distrib/distrib.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -1,4 +1,4 @@ -<project default="all" name="JBoss Portlet Container"> +<project default="all" name="GateIn Portlet Container"> <property name="source.dir" value="../.."/> <property name="src.docs.dir" value="${source.dir}/docs"/> @@ -37,7 +37,7 @@ </copy> </target> - <!-- Build JBoss Portlet Container (currently only builds docs as maven build is assumed --> + <!-- Build GateIn Portlet Container (currently only builds docs as maven build is assumed --> <target name="build"/> <!-- Package the different distributions --> @@ -53,7 +53,7 @@ </target> <!-- - | JBoss Portlet Container source distribution + | GateIn Portlet Container source distribution --> <target name="package-src" description="package source distribution" unless="no-src"> <antcall target="__package-distrib"> @@ -69,7 +69,7 @@ </target> <!-- - | JBoss Portlet Container binary distribution for AS 4.2.x + | GateIn Portlet Container binary distribution for AS 4.2.x --> <target name="package-jboss42" description="package AS binary" if="JBOSS_4_2_PATH" unless="no-jboss"> @@ -107,7 +107,7 @@ </target> <!-- - | JBoss Portlet Container binary distribution for AS 5.0.x + | GateIn Portlet Container binary distribution for AS 5.0.x --> <target name="package-jboss50" description="package AS binary" if="JBOSS_5_0_PATH" unless="no-jboss"> @@ -149,7 +149,7 @@ <!-- - | JBoss Portlet Container binary distribution for Tomcat 6.x + | GateIn Portlet Container binary distribution for Tomcat 6.x --> <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_PATH" unless="no-tomcat"> @@ -217,7 +217,7 @@ <target name="__package-distrib"> <mkdir dir="${todir}"/> - <copy file="JBossPC-README.txt" todir="${todir}"/> + <copy file="GateInPC-README.txt" todir="${todir}"/> <antcall target="__package-doc"> <param name="todir" value="${todir}/jbosspc-docs"/> </antcall> Modified: components/pc/trunk/docs/user-guide/en/modules/introduction.xml =================================================================== --- components/pc/trunk/docs/user-guide/en/modules/introduction.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/docs/user-guide/en/modules/introduction.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -15,21 +15,21 @@ <title>Introduction</title> <sect1> <title>Motivation</title> - <para>JBoss Portlet Container is the next generation portlet container on which future versions of JBoss Portal, - and the JBoss Portal platform will be based. It provides a standard-compliant implementation of the JSR-286 + <para>GateIn Portlet Container is the next generation portlet container on which GateIn Portal, + and the next Enterprise Portal Platform will be based. It provides a standard-compliant implementation of the JSR-286 Portlet 2.0 specification. It has been developed with reusability in mind so that advanced users, who don't require a full-fledged portal, can leverage the portlet management services it provides in their own - applications. JBoss Portlet Container is available through the business-friendly LGPL open source license. + applications. GateIn Portlet Container is available through the business-friendly LGPL open source license. </para> </sect1> <sect1> <title>Audience</title> - <para>JBoss Portlet Container is targeted at developers and advanced users who want to be able to deploy + <para>GateIn Portlet Container is targeted at developers and advanced users who want to be able to deploy portlet-based applications but don't need a full-fledged portal. </para> </sect1> <sect1> - <title>Simple Portal: showcasing JBoss Portlet Container</title> + <title>Simple Portal: showcasing GateIn Portlet Container</title> <para>A simple portal has been built on top of the base portlet container. A JSP taglib is also provided to make it easy to display portlet content in JSP pages. We also provide samples of portlets implementing some of the advanced capabilities of JSR-286. @@ -39,11 +39,11 @@ <title>Resources</title> <itemizedlist> <listitem> - <ulink url="http://labs.jboss.com/portletcontainer/">Project website</ulink> + <ulink url="http://www.jboss.org/portletcontainer/">Project website</ulink> </listitem> - <listitem> + <!--listitem> <ulink url="http://labs.jboss.com/wiki/JBPC_Home">Project Wiki</ulink> - </listitem> + </listitem--> </itemizedlist> </sect1> </chapter> Modified: components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml =================================================================== --- components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -15,7 +15,7 @@ <title>Simple Portal</title> <sect1> <title>Motivation</title> - <para>A spin-off of the JBoss Portlet Container product is a portal called<emphasis>Simple Portal</emphasis>. As + <para>A spin-off of the GateIn Portlet Container product is a portal called<emphasis>Simple Portal</emphasis>. As its name implies, Simple Portal provides an easy to use portal for small-sized sites that only require aggregation of portlets in portal pages, without the extra features of a full-fledged portal. In particular the following features are not addressed by Simple Portal: @@ -58,8 +58,8 @@ <sect2> <title>Portlet deployment</title> <para>Simple Portal integrates with a few web containers in order to provide handling of portlet deployment and - runtime. This feature leverages JBoss Portal's Web Service Provider Interface (SPI). In particular, JBoss - Portlet Container uses the Web SPI in order to transparently react to the life cycle of WAR files that + runtime. This feature leverages GateIn Portal's Web Service Provider Interface (SPI). In particular, GateIn + Portlet Container uses the Web SPI (GateIn Web Container Integration (WCI))in order to transparently react to the life cycle of WAR files that contains portlet components as they are deployed or undeployed on the target servlet container. The SPI defines two levels of integrations. </para> @@ -96,7 +96,7 @@ </listitem> </itemizedlist> <page>If you need more advanced page creation capabilities, you should consider using a more advanced portal - product such as JBoss Portal. + product such as GateIn Portal. </page> <sect3> <title>Page creation</title> @@ -148,7 +148,7 @@ <listitem>It defines a scope for the coordination features.</listitem> </itemizedlist> <para>Currently, only one portal page can be specified per JSP file but this should be extended to several - portal pages per JSP file in future versions of JBoss Portlet Container. + portal pages per JSP file in future versions of GateIn Portlet Container. </para> <para>Access to portlet information within a portal page is done by defining a reference to the portlet using the Deleted: components/pc/trunk/jsr168api/build.xml =================================================================== --- components/pc/trunk/jsr168api/build.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/jsr168api/build.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -1,181 +0,0 @@ -<?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"> - ]> - -<!-- $Id: build.xml 7910 2007-08-14 09:46:27Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| 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"> - - <!-- Override the javadoc packages to javax.portlet.* --> - <property name="javadoc.packages" value="javax.portlet.*,org.jboss.portal.*"/> - - <!-- Configure thirdparty libraries --> - &libraries; - <path id="library.classpath"> - <path refid="junit.junit.classpath"/> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.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"/> - - </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="output" - description="Generate all target output." - depends="compile"> - - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/portal-portlet-jsr168api-lib.jar" manifest="${build.etc}/portal-jsr168api-lib-jar.mf"> - <fileset dir="${build.classes}"/> - </jar> - - </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"/> - - <target name="package-tests"></target> - -</project> Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java =================================================================== --- components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2009-08-21 13:56:55 UTC (rev 46) @@ -35,7 +35,7 @@ * - UnavailableExceptionDuringRenderPortlet * * This test is disabled. Specification doesn't defined strictly portal behaviour when - * one of the portlets throws PortletException. Currently in JBoss Portal if one portlet + * one of the portlets throws PortletException. Currently in GateIn Portal if one portlet * throws an PortletException than the rest of portlet of the page is not rendered - code 500 * is returned. Tests are based on different behaviour where rest of portlets are rendered. * Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java =================================================================== --- components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/pc/src/test/java/org/gatein/pc/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java 2009-08-21 13:56:55 UTC (rev 46) @@ -97,7 +97,7 @@ // * - UnavailableExceptionDuringRenderPortlet // * // * This test is disabled. Specification doesn't defined strictly portal behaviour when -// * one of the portlets throws PortletException. Currently in JBoss Portal if one portlet +// * one of the portlets throws PortletException. Currently in GateIn Portal if one portlet // * throws an PortletException than the rest of portlet of the page is not rendered - code 500 // * is returned. Tests are based on different behaviour where rest of portlets are rendered. // */ Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/portal/pom.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -77,7 +77,6 @@ <artifactId>pc-exo-integration</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> @@ -132,6 +131,13 @@ <version>${version.exo.kernel}</version> <scope>provided</scope> </dependency> + + <!-- Temporarly until we get rid of that dependency --> + <dependency> + <groupId>org.exoplatform.portletcontainer</groupId> + <artifactId>exo.pc.component.common</artifactId> + <version>2.1.2</version> + </dependency> </dependencies> <build> Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -42,11 +42,12 @@ <include>org.gatein.pc:pc-pc</include> <include>org.gatein.pc:pc-api</include> <include>org.gatein.pc:pc-federation</include> - <include>javax.ccpp:ccpp</include> <include>javax.portlet:portlet-api</include> <include>org.exoplatform.kernel:exo.kernel.container</include> <include>org.exoplatform.kernel:exo.kernel.commons</include> + <!-- temporarly till we get rid of this dependency --> + <include>org.exoplatform.portletcontainer:exo.pc.component.common</include> <include>picocontainer:picocontainer</include> <include>javax.xml.bind:jaxb-api</include> <include>org.jibx:jibx-run</include> @@ -63,11 +64,11 @@ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> <includes> - <include>org.jboss.portal.common:common-mc</include> - <include>org.gatein.pc:portlet-controller</include> - <include>org.gatein.pc:portlet-mc</include> - <include>org.gatein.pc:portlet-exo</include> - + <include>org.gatein.common:common-mc</include> + <include>org.gatein.pc:pc-controller</include> + <include>org.gatein.pc:pc-mc</include> + <include>org.gatein.pc:pc-exo-integration</include> + <include>org.gatein.pc:pc-samples</include> <include>org.jboss:jboss-common-core</include> <include>org.jboss:jboss-reflect</include> <include>org.jboss:jboss-mdr</include> Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -1,3 +1,26 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2009, 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. + --> + <assembly> <id>jboss50</id> <formats> @@ -18,12 +41,15 @@ <include>org.gatein.common:common-common</include> <include>org.gatein.wci:wci-wci</include> <include>org.gatein.pc:pc-pc</include> - + <include>org.gatein.pc:pc-api</include> + <include>org.gatein.pc:pc-federation</include> <include>javax.ccpp:ccpp</include> <include>javax.portlet:portlet-api</include> <include>org.exoplatform.kernel:exo.kernel.container</include> <include>org.exoplatform.kernel:exo.kernel.commons</include> + <!-- temporarly till we get rid of this dependency --> + <include>org.exoplatform.portletcontainer:exo.pc.component.common</include> <include>picocontainer:picocontainer</include> <include>javax.xml.bind:jaxb-api</include> <include>org.jibx:jibx-run</include> @@ -40,11 +66,11 @@ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> <includes> - <include>org.jboss.portal.common:common-mc</include> - <include>org.gatein.pc:portlet-controller</include> - <include>org.gatein.pc:portlet-mc</include> - <include>org.gatein.pc:portlet-exo</include> - + <include>org.gatein.common:common-mc</include> + <include>org.gatein.pc:pc-controller</include> + <include>org.gatein.pc:pc-mc</include> + <include>org.gatein.pc:pc-exo-integration</include> + <include>org.gatein.pc:pc-samples</include> <include>org.jboss:jboss-common-core</include> <include>org.jboss:jboss-reflect</include> <include>org.jboss:jboss-mdr</include> Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -1,3 +1,26 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2009, 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. + --> + <assembly> <id>tomcat60</id> <formats> @@ -18,9 +41,7 @@ <include>org.gatein.wci:wci-wci</include> <include>org.gatein.pc:pc-pc</include> <include>org.gatein.pc:pc-api</include> - - <include>javax.xml.bind:jaxb-api</include> - <include>apache-log4j:log4j</include> + <include>org.gatein.pc:pc-federation</include> <include>javax.ccpp:ccpp</include> <include>javax.activation:activation</include> <include>javax.portlet:portlet-api</include> @@ -34,6 +55,8 @@ <include>org.exoplatform.kernel:exo.kernel.container</include> <include>org.exoplatform.kernel:exo.kernel.commons</include> + <!-- temporarly till we get rid of this dependency --> + <include>org.exoplatform.portletcontainer:exo.pc.component.common</include> <include>picocontainer:picocontainer</include> <include>javax.xml.bind:jaxb-api</include> <include>org.jibx:jibx-run</include> @@ -50,14 +73,11 @@ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> <includes> - <include>org.jboss.portal.common:common-mc</include> - <include>org.gatein.pc:portlet-controller</include> - <include>org.gatein.pc:portlet-mc</include> - <include>org.gatein.pc:portlet-exo</include> - - <include>jboss:jboss-common-logging-spi</include> - <include>jboss:jboss-common-logging-log4j</include> - <include>jboss:jboss-common-logging-jdk</include> + <include>org.gatein.common:common-mc</include> + <include>org.gatein.pc:pc-controller</include> + <include>org.gatein.pc:pc-mc</include> + <include>org.gatein.pc:pc-exo-integration</include> + <include>org.gatein.pc:pc-samples</include> <include>org.jboss:jboss-common-core</include> <include>org.jboss:jboss-reflect</include> <include>org.jboss:jboss-mdr</include> Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp =================================================================== --- components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp 2009-08-21 13:56:55 UTC (rev 46) @@ -1,4 +1,4 @@ -<%@ page import="org.jboss.portal.common.util.Exceptions" %> +<%@ page import="org.gatein.common.util.Exceptions" %> <%@ page language="java" %> <div class="portlet"> Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp =================================================================== --- components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp 2009-08-21 13:56:55 UTC (rev 46) @@ -4,17 +4,17 @@ <div class="full-width main-content"> <p> <img src="${pageContext.request.contextPath}/images/pc20-picture.gif" alt="" align="right"/> - <a href="http://labs.jboss.com/portletcontainer" target="jboss"> - JBoss Portlet Container</a> is the next generation - portlet container on which future versions of JBoss Portal will be based. It provides a standard-compliant + <a href="http://www.jboss.org/portletcontainer" target="jboss"> + GateIn Portlet Container</a> is the next generation + portlet container on which GateIn Portal versions are based. It provides a standard-compliant implementation of the JSR-286 Portlet 2.0 specification. It has been developed with reusability in mind so that advanced users, who don't require a full-fledged portal, can leverage the portlet management services it provides in - their own applications. JBoss Portlet Container is available through the business-friendly LGPL open source + their own applications. GateIn Portlet Container is available through the business-friendly LGPL open source license. </p> - <p>This simple portal is a demonstration of what can be achieved reasonably quickly by leveraging JBoss Portlet + <p>This simple portal is a demonstration of what can be achieved reasonably quickly by leveraging GateIn Portlet Container.</p> </div> <br/> @@ -27,12 +27,12 @@ <img src="${pageContext.request.contextPath}/images/content-box-head-rt.gif" alt="" class="right"/> </div> <div class="box-content"> - <p>JBoss (a division of Red Hat Inc.) offers various support services tailored to fit your needs. + <p>Red Hat offers various support services tailored to fit your needs. <a target="jboss" href="http://jboss.com/services/index">Explore</a> support and service options for - <a href="http://jboss.com/products/platforms/portals" target="jboss">JBoss Portal</a>.</p> + <a href="http://www.jboss.com/products/platforms/portals/" target="jboss">the Enterprise Portal Platform</a>.</p> </div> </div> - +<!-- <div class="content-box float-left"> <div class="box-header"> <img src="${pageContext.request.contextPath}/images/content-box-head-lt.gif" alt="" class="left"/> @@ -46,7 +46,7 @@ Portal.</p> </div> </div> - +--> <div class="content-box float-left"> <div class="box-header"> <img src="${pageContext.request.contextPath}/images/content-box-head-lt.gif" alt="" class="left"/> @@ -55,22 +55,21 @@ <img src="${pageContext.request.contextPath}/images/content-box-head-rt.gif" alt="" class="right"/> </div> <div class="box-content"> - <p>Learn more about <a href="http://labs.jboss.com/portletcontainer" target="jboss">JBoss Portlet Container</a> - community project, <a href="http://labs.jboss.com/jbossportal" target="jboss">JBoss Portal</a>, - <a href="http://jboss.com/products/platforms/portals" target="jboss">JBoss Portal platform</a></p> + <p>Learn more about <a href="http://iwww.jboss.org/portletcontainer" target="jboss">GateIn Portlet Container</a> + community project, <a href="http://www.jboss.org/gatein" target="jboss">GateIn Portal</a>, + <a href="http://www.jboss.com/products/platforms/portals" target="jboss">Enterprise Portal platform</a></p> </div> </div> <br/> <div class="full-width main-content clear"> - <p>Thank you for downloading and deploying JBoss Portlet Container. We hope your enjoy working with it as much as + <p>Thank you for downloading and deploying GateIn Portlet Container. We hope your enjoy working with it as much as we enjoy developing it!</p> - <p>Baci e abbracci,<br/> - The JBoss Portal Team.</p> + <p>The GateIn developers.</p> </div> </div> -<%@ include file="/layouts/footer.jsp" %> \ No newline at end of file +<%@ include file="/layouts/footer.jsp" %> Modified: components/pc/trunk/samples/pom.xml =================================================================== --- components/pc/trunk/samples/pom.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/pom.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -7,7 +7,7 @@ <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>portlet-samples</artifactId> + <artifactId>pc-samples</artifactId> <packaging>jar</packaging> <name>GateIn - Portlet Container (samples)</name> Modified: components/pc/trunk/samples/src/assemble/samples-basic-portlet.xml =================================================================== --- components/pc/trunk/samples/src/assemble/samples-basic-portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/assemble/samples-basic-portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -14,9 +14,9 @@ <directory>target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org.gatein.pc/samples/basic/**</include> + <include>org/gatein/pc/samples/basic/**</include> </includes> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: components/pc/trunk/samples/src/assemble/samples-eventdebug-portlet.xml =================================================================== --- components/pc/trunk/samples/src/assemble/samples-eventdebug-portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/assemble/samples-eventdebug-portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -14,9 +14,9 @@ <directory>target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org.gatein.pc/samples/eventdebug/**</include> + <include>org/gatein/pc/samples/eventdebug/**</include> </includes> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: components/pc/trunk/samples/src/assemble/samples-google-portlet.xml =================================================================== --- components/pc/trunk/samples/src/assemble/samples-google-portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/assemble/samples-google-portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -14,9 +14,9 @@ <directory>target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org.gatein.pc/samples/google/**</include> + <include>org/gatein/pc/samples/google/**</include> </includes> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: components/pc/trunk/samples/src/assemble/samples-jsp-portlet.xml =================================================================== --- components/pc/trunk/samples/src/assemble/samples-jsp-portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/assemble/samples-jsp-portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -14,9 +14,9 @@ <directory>target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org.gatein.pc/samples/jsp/**</include> + <include>org/gatein/pc/samples/jsp/**</include> </includes> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: components/pc/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml =================================================================== --- components/pc/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -14,9 +14,9 @@ <directory>target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org.gatein.pc/samples/remotecontroller/**</include> + <include>org/gatein/pc/samples/remotecontroller/**</include> </includes> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: components/pc/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml =================================================================== --- components/pc/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -14,9 +14,9 @@ <directory>target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <includes> - <include>org.gatein.pc/samples/shoppingcart/**</include> + <include>org/gatein/pc/samples/shoppingcart/**</include> </includes> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp =================================================================== --- components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp 2009-08-21 13:56:55 UTC (rev 46) @@ -22,29 +22,29 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ page isELIgnored="false" %> <portlet:defineObjects/> <table border="0" cellspacing="2" cellpadding="2"> - <tr> + <!--tr> <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0" - alt="Try the latest release of JBoss Portal, live and online."></a> + alt="Try the latest release of GateIn Portal, live and online."></a> <a href="http://labs.jboss.com/portal/jbossportal/download/index.html&q... target="_blank"><img src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0" alt="Download JBoss Portal and have it up and running in minutes."></a> <a href="http://www.portletswap.com" target="_blank"><img src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0" alt="Download portlets and layouts for your new JBoss Portal installation."></a></td> - </tr> + </tr--> <tr> <td></td> </tr> <tr> <td class="portlet-section-alternate"> - <font class="portlet-font">This is an installation of <b>JBoss Portlet Container 2.0 + <font class="portlet-font">This is an installation of <b>GateIn Portlet Container 2.1 </b>. You may log in at any time, using the <i>Login</i> link at the top-right of this page, with the following credentials:</font> @@ -55,10 +55,10 @@ <b>user/user</b> or <b>admin/admin</b> </td> </tr> - <tr> + <!--tr> <td align="center"> If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view - our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>. + our <a href="http://www.jboss.org/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>. </td> - </tr> + </tr--> </table> Modified: components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -23,10 +23,10 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <portlet-app - xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + 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_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - version="1.0"> + 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>Simple JSP portlet</description> <portlet-name>JSPPortlet</portlet-name> Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2009-08-20 19:05:52 UTC (rev 45) +++ components/pc/trunk/test/src/test/build.xml 2009-08-21 13:56:55 UTC (rev 46) @@ -65,12 +65,11 @@ </path> <path id="portal-common"> - <pathelement path="${dependency.portal-common-mc.jar}"/> + <pathelement path="${dependency.gatein-common-mc.jar}"/> </path> <path id="portal-common-shared"> - <pathelement path="${dependency.portal-common-portal.jar}"/> - <pathelement path="${dependency.portal-common-common.jar}"/> + <pathelement path="${dependency.gatein-common-common.jar}"/> </path> <path id="portal-web"> @@ -81,15 +80,15 @@ </path> <path id="portal-portlet"> - <pathelement path="${dependency.portal-portlet-controller.jar}"/> - <pathelement path="${dependency.portal-portlet-mc.jar}"/> - <pathelement path="${dependency.portal-portlet-tests.jar}"/> + <pathelement path="${dependency.gatein-pc-controller.jar}"/> + <pathelement path="${dependency.gatein-pc-mc.jar}"/> + <pathelement path="${dependency.gatein-pc-tests.jar}"/> </path> <path id="portal-portlet-shared"> - <path location="${dependency.portal-portlet-portlet.jar}"/> - <path location="${dependency.portal-portlet-api.jar}"/> - <path location="${dependency.jsr168api.jar}"/> + <path location="${dependency.gatein-pc-pc.jar}"/> + <path location="${dependency.gatein-pc-api.jar}"/> + <path location="${dependency.gatein-jsr168api.jar}"/> </path> <path id="exo">