Author: chris.laprun(a)jboss.com Date: 2008-02-14 19:33:56 -0500 (Thu, 14 Feb 2008) New Revision: 9978 Removed: modules/portlet/trunk/build/distrib/README.txt Modified: modules/portlet/trunk/build/distrib/distrib.xml modules/portlet/trunk/test/src/test/build.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp Log: - Fixed issue with samples not being properly copied to tomcat distrib. - Added option to not generate source distrib. - Standardized distrib names. - Added licenses to distrib. - Added JBoss Logging to tomcat lib dir. - Clean-ups. Deleted: modules/portlet/trunk/build/distrib/README.txt =================================================================== --- modules/portlet/trunk/build/distrib/README.txt 2008-02-15 00:04:46 UTC (rev 9977) +++ modules/portlet/trunk/build/distrib/README.txt 2008-02-15 00:33:56 UTC (rev 9978) @@ -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 'docs' directory \ No newline at end of file Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-02-15 00:04:46 UTC (rev 9977) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-02-15 00:33:56 UTC (rev 9978) @@ -3,11 +3,11 @@ <property name="source.dir" value="../.."/> <property name="src.docs.dir" value="${source.dir}/docs"/> <property name="pc.release.version" value="2.0.0.B1"/> - <property name="demo.release.version" value="1.0.0.B1"/> + <property name="demo.release.version" value="2.0.0.B1"/> <!-- --> <property name="pc.release.name" value="jboss-portletcontainer-${pc.release.version}"/> - <property name="demo.release.name" value="jboss-simple-portal-${demo.release.version}"/> + <property name="demo.release.name" value="jboss-portletcontainer-${demo.release.version}"/> <property name="pc.release.name.src" value="${pc.release.name}-src"/> <property name="demo.release.name.as42" value="${demo.release.name}-jbossas42"/> <property name="demo.release.name.tomcat6" value="${demo.release.name}-tomcat6"/> @@ -28,24 +28,9 @@ <!-- Licenses --> <target name="licenses" unless="no-doc"> - <!--<fileset id="thirdparty-licenses" dir="../thirdparty/licenses"> - <include name="apache-2.0.txt"/> - <include name="bsd.txt"/> - <include name="cddl.txt"/> - <include name="cpl-1.0/txt"/> - <include name="gpl.txt"/> - <include name="lgpl.txt"/> - <include name="oswego.txt"/> - <include name="public-domain.txt"/> - <include name="sun-jaf.txt"/> - </fileset>--> <mkdir dir="output/jbosspc-docs/licenses"/> - <!--<concat destfile="output/docs/licenses/thirdparty-licenses.txt"> - <fileset refid="thirdparty-licenses"/> - </concat>--> <copy todir="output/jbosspc-docs/licenses"> - <!--<fileset refid="thirdparty-licenses"/>--> - <fileset dir="../licences" includes="JBossEULA.txt"/> + <fileset dir="../licences" includes="*.txt"/> </copy> </target> @@ -73,7 +58,7 @@ <!-- | JBoss Portlet Container source distribution --> - <target name="package-src" description="package source distribution"> + <target name="package-src" description="package source distribution" unless="no-src"> <antcall target="__package-distrib"> <param name="todir" value="${pc.build.src}"/> </antcall> @@ -117,7 +102,7 @@ </copy> <antcall target="__package-binary"> <param name="bin.dir" value="${pc.build.bin.tomcat6}"/> - <param name="deploy.dir" value="${pc.build.bin.as42}/webapps"/> + <param name="deploy.dir" value="${pc.build.bin.tomcat6}/webapps"/> </antcall> <!--<copy todir="${pc.build.bin.tomcat6}/simple-portal"> <fileset dir="${source.dir}/test/target/portal/tomcat" includes="**/*"/> Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-02-15 00:04:46 UTC (rev 9977) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-15 00:33:56 UTC (rev 9978) @@ -765,6 +765,7 @@ <pathelement path="${dependency.apache-jstl.jar}"/> <pathelement path="${dependency.apache-standard.jar}"/> <pathelement path="${dependency.concurrent.jar}"/> + <path refid="mc.jboss_common_logging_spi"/> <path refid="mc.jaxb-api"/> </path> </copy> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-15 00:04:46 UTC (rev 9977) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-15 00:33:56 UTC (rev 9978) @@ -1,69 +1,76 @@ <%@ page contentType="text/html" %> <%@ include file="/layouts/header.jsp" %> <div style="padding:10px"> -<div class="full-width main-content"> -<!-- Logo floated to the left of text would be good! :) --> -<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 - 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. -</p> + <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 + 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. + </p> -<p>This simple portal is a demonstration of what can be achieved reasonably quickly by leveraging JBoss Portlet - Container.</p> -</div> + <p>This simple portal is a demonstration of what can be achieved reasonably quickly by leveraging JBoss Portlet + Container.</p> + </div> <br/> -<div class="content-box float-left"> - <div class="box-header"> - <img src="${pageContext.request.contextPath}/images/content-box-head-lt.gif" alt="" class="left"/> - <h3>Support Services</h3> - <img src="${pageContext.request.contextPath}/images/content-box-head-rt.gif" alt="" class="right"/> + + <div class="content-box float-left"> + <div class="box-header"> + <img src="${pageContext.request.contextPath}/images/content-box-head-lt.gif" alt="" class="left"/> + + <h3>Support Services</h3> + <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. + <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> + </div> </div> - <div class="box-content"> - <p>JBoss (a division of Red Hat Inc.) 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> - </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"/> - <h3>PortletSwap</h3> - <img src="${pageContext.request.contextPath}/images/content-box-head-rt.gif" alt="" class="right"/> - </div> - <div class="box-content"> - <p><a href="http://www.portletswap.com" target="jboss">Portletswap.com</a> is an open community sponsored + <div class="content-box float-left"> + <div class="box-header"> + <img src="${pageContext.request.contextPath}/images/content-box-head-lt.gif" alt="" class="left"/> + + <h3>PortletSwap</h3> + <img src="${pageContext.request.contextPath}/images/content-box-head-rt.gif" alt="" class="right"/> + </div> + <div class="box-content"> + <p><a href="http://www.portletswap.com" target="jboss">Portletswap.com</a> is an open community sponsored by JBoss to facilitate the exchange of portlets that can be used with JBoss Portlet Container and JBoss Portal.</p> + </div> </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"/> - <h3>Project Information</h3> - <img src="${pageContext.request.contextPath}/images/content-box-head-rt.gif" alt="" class="right"/> + <div class="content-box float-left"> + <div class="box-header"> + <img src="${pageContext.request.contextPath}/images/content-box-head-lt.gif" alt="" class="left"/> + + <h3>Project Information</h3> + <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> + </div> </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> - </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 we - enjoy developing it!</p> - <p>Baci e abbracci,<br/> - The JBoss Portal Team.</p> -</div> + <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 + we + enjoy developing it!</p> + <p>Baci e abbracci,<br/> + The JBoss Portal Team.</p> + </div> + </div> <%@ include file="/layouts/footer.jsp" %> \ No newline at end of file