JBoss Portal SVN: r9982 - in modules/portlet/trunk/docs/user-guide/en: modules and 1 other directory.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-14 20:58:37 -0500 (Thu, 14 Feb 2008)
New Revision: 9982
Added:
modules/portlet/trunk/docs/user-guide/en/modules/installation.xml
Modified:
modules/portlet/trunk/docs/user-guide/en/master.xml
modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml
Log:
- Started documentation.
Modified: modules/portlet/trunk/docs/user-guide/en/master.xml
===================================================================
--- modules/portlet/trunk/docs/user-guide/en/master.xml 2008-02-15 01:56:01 UTC (rev 9981)
+++ modules/portlet/trunk/docs/user-guide/en/master.xml 2008-02-15 01:58:37 UTC (rev 9982)
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
- "../../docbook-support/support/docbook-dtd/docbookx.dtd" [
- <!ENTITY introduction SYSTEM "modules/introduction.xml">
- ]>
+ "../../docbook-support/support/docbook-dtd/docbookx.dtd" [
+ <!ENTITY introduction SYSTEM "modules/introduction.xml">
+ <!ENTITY installation SYSTEM "modules/installation.xml">
+ ]>
<book lang="en">
<bookinfo>
<title>Simple Portlet Container</title>
@@ -13,8 +14,14 @@
<surname>Viet</surname>
<email>julien(a)jboss.org</email>
</author>
+ <author>
+ <firstname>Chris</firstname>
+ <surname>Laprun</surname>
+ <email>chris.laprun(a)jboss.com</email>
+ </author>
</bookinfo>
<toc/>
<!-- Introduction --> &introduction;
+ <!-- Installation --> &installation;
</book>
Added: modules/portlet/trunk/docs/user-guide/en/modules/installation.xml
===================================================================
--- modules/portlet/trunk/docs/user-guide/en/modules/installation.xml (rev 0)
+++ modules/portlet/trunk/docs/user-guide/en/modules/installation.xml 2008-02-15 01:58:37 UTC (rev 9982)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="installation">
+ <chapterinfo>
+ <author>
+ <firstname>Julien</firstname>
+ <surname>Viet</surname>
+ <email>julien(a)jboss.org</email>
+ </author>
+ <author>
+ <firstname>Chris</firstname>
+ <surname>Laprun</surname>
+ <email>chris.laprun(a)jboss.com</email>
+ </author>
+ </chapterinfo>
+
+ <title>Installation</title>
+ <sect1>
+ <title>Downloading and installing</title>
+ <para>Two bundled versions are provided to showcase JBoss Portlet Container in action with minimum effort. Theses
+ bundles each include a servlet container configured with the Simple Portal demonstration portal along with
+ some JSR-286 compliant portlets. You will need to have Java 5 configured on your machine to run the
+ demonstration portal.
+ You can download Java 5 at<ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">
+ http://java.sun.com/javase/downloads/index_jdk5.jsp</ulink>. Once you have Java installed, you are ready to
+ download one of JBoss Portlet Container bundles. The following link has the list of downloads for JBoss Portlet
+ Container:<ulink url="http://labs.jboss.com/portletcontainer/download">
+ http://labs.jboss.com/portal/portletcontainer/download</ulink>. Two bundles are currently provided: one with
+ Tomcat 6.0.16 and one with JBoss Application Server 4.2.2.GA.
+ </para>
+ <sect2>
+ <title>JBoss AS 4.2.x bundle</title>
+ <para>
+ Of note in the bundle are the following directories:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold">bin</emphasis>
+ - Contains the startup/shutdown commands for JBoss Application Server
+ </listitem>
+ <listitem>
+ <emphasis role="bold">docs</emphasis>
+ - Contains documentation for JBoss Application Server
+ </listitem>
+ <listitem>
+ <emphasis role="bold">jbosspc-docs</emphasis>
+ - Contains documentation for JBoss Portlet Container (this document included)
+ </listitem>
+ <listitem>
+ <emphasis role="bold">server</emphasis>
+ - Contains JBoss Application Server configuration and the
+ <filename>simple-portal.war</filename>
+ file along with several sample portlets in the
+ <filename>deploy</filename>
+ directory of the
+ <emphasis>default</emphasis>
+ configuration
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ To start the demonstration portal, go to the
+ <filename>bin</filename>
+ directory and execute either
+ <filename>run.sh</filename>
+ or
+ <filename>run.bat</filename>
+ (depending on your platform).
+ </para>
+ </sect2>
+ <sect2>
+ <title>Tomcat 6.0.x bundle</title>
+ <para>
+ Of note in the bundle are the following directories:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold">bin</emphasis>
+ - Contains the startup/shutdown commands for Tomcat
+ </listitem>
+ <listitem>
+ <emphasis role="bold">logs</emphasis>
+ - Contains the logs once the servlet container is started (the most interesting one being one with
+ <emphasis>locahost</emphasis>
+ in its name)
+ </listitem>
+ <listitem>
+ <emphasis role="bold">jbosspc-docs</emphasis>
+ - Contains documentation for JBoss Portlet Container (this document included)
+ </listitem>
+ <listitem>
+ <emphasis role="bold">lib</emphasis>
+ - Contains Tomcat libraries to which several support libraries for JBoss Portlet Container have been
+ added
+ </listitem>
+ <listitem>
+ <emphasis role="bold">webapps</emphasis>
+ - Contains Tomcat default applications and the
+ <filename>simple-portal.war</filename>
+ file along with several sample portlets
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ To start the demonstration portal, go to the
+ <filename>bin</filename>
+ directory and execute either
+ <filename>startup.sh</filename>
+ or
+ <filename>startup.bat</filename>
+ (depending on your platform).
+ </para>
+ </sect2>
+ </sect1>
+
+ <sect1>
+ <title>Testing Portal Container's demonstration portal</title>
+ <para>Once the servlet container is started, bring up your web browser and go to the following URL:
+ <ulink url="http://localhost:8080/simple-portal">http://localhost:8080/simple-portal</ulink>.
+ You should see the default page for Portlet Container's demonstration portal:
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="images/simple-portal.png" format="PNG"
+ scale="60" valign="middle"/>
+ </imageobject>
+ <caption>
+ <para>Default page for Portlet Container's demonstration portal.</para>
+ </caption>
+ </mediaobject>
+ </para>
+ </sect1>
+</chapter>
Modified: modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml
===================================================================
--- modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml 2008-02-15 01:56:01 UTC (rev 9981)
+++ modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml 2008-02-15 01:58:37 UTC (rev 9982)
@@ -6,14 +6,44 @@
<surname>Viet</surname>
<email>julien(a)jboss.org</email>
</author>
+ <author>
+ <firstname>Chris</firstname>
+ <surname>Laprun</surname>
+ <email>chris.laprun(a)jboss.com</email>
+ </author>
</chapterinfo>
<title>Introduction</title>
<sect1>
<title>Motivation</title>
- <para></para>
+ <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
+ 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.
+ </para>
</sect1>
<sect1>
- <title>Principles</title>
- <para></para>
+ <title>Audience</title>
+ <para>JBoss 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>
+ <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.
+ </para>
+ </sect1>
+ <sect1>
+ <title>Resources</title>
+ <itemizedlist>
+ <listitem>
+ <ulink url="http://labs.jboss.com/portletcontainer/">Project website</ulink>
+ </listitem>
+ <listitem>
+ <ulink url="http://labs.jboss.com/wiki/JBPC_Home">Project Wiki</ulink>
+ </listitem>
+ </itemizedlist>
+ </sect1>
</chapter>
18 years, 2 months
JBoss Portal SVN: r9981 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: mmcallis
Date: 2008-02-14 20:56:01 -0500 (Thu, 14 Feb 2008)
New Revision: 9981
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
5.2.2.4. JSP Files and the Portlet Tag Library
minor revisions to text explaining the view.jsp file
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-15 00:57:45 UTC (rev 9980)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-15 01:56:01 UTC (rev 9981)
@@ -781,9 +781,9 @@
</para>
</sect3>
<sect3>
- <title>JSP Files and the Portlet Taglib</title>
+ <title>JSP Files and the Portlet Tag Library</title>
<para>
- The <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> and <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename> JSP files are included in the HelloWorldJSPPortlet portlet. The first, <filename>view.jsp</filename>, allows a user to input their name. This is then posted to the <computeroutput>processAction</computeroutput> method in the portlet class, which is set in the <computeroutput>aResponse.setRenderParameter</computeroutput>. The <literal>render</literal> method, <computeroutput>doView</computeroutput>, is invoked, which dispatches to the <filename>view2.jsp</filename> JSP:
+ The <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> and <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename> JSP files are included in the HelloWorldJSPPortlet portlet. The <filename>view.jsp</filename> file allows a user to input their name. This is then posted to the <computeroutput>processAction</computeroutput> method in the portlet class, which is set as a <computeroutput>aResponse.setRenderParameter</computeroutput>. The <literal>render</literal> method, <computeroutput>doView</computeroutput>, is invoked, which dispatches to the <filename>view2.jsp</filename> JSP:
</para>
<para>
<mediaobject>
@@ -825,8 +825,7 @@
</screen></term>
<listitem>
<para>
- Define the portlet taglib. You do <emphasis>NOT</emphasis> need to bundle the portlet taglib,
- JBoss Portal will handle that for you.
+ Define the portlet tag library (taglib). You do not need to bundle the portlet taglib - JBoss Portal handles this for you.
</para>
</listitem>
</varlistentry>
@@ -835,8 +834,8 @@
</screen></term>
<listitem>
<para>
- Calling <literal>defineObjects</literal> makes available implicit objects, such as
- <literal>renderRequest, actionRequest, portletConfig</literal>, in this JSP.
+ Calling <literal>defineObjects</literal> makes available implicit objects in the JSP, such as
+ <literal>renderRequest, actionRequest, portletConfig</literal>.
</para>
</listitem>
</varlistentry>
@@ -846,9 +845,7 @@
</screen></term>
<listitem>
<para>
- We create an HTML form, but generate the URL it will post to using the portlet tag library. In
- this case, notice how we are creating an <literal>actionURL</literal>, which will activate our
- <literal>processAction</literal> method, passing in any input parameters in the form.
+ A HTML form is created. This form posts to the URL defined by the portlet taglib. In this example, an <computeroutput>actionURL</computeroutput> is created, that activates the <literal>processAction</literal> method, which passes the input parameters in the form.
</para>
</listitem>
</varlistentry>
@@ -858,9 +855,7 @@
</screen></term>
<listitem>
<para>
- Likewise, we are able to create a link to our <literal>doView</literal> method, by simply
- creating it with a <literal>renderURL</literal>, that passes in our <literal>yourname</literal>
- parameter.
+ You can create a link to the <computeroutput>doView</computeroutput> method by creating a <computeroutput>renderURL</computeroutput>, that passes the <computeroutput>yourname</computeroutput> parameter.
</para>
</listitem>
</varlistentry>
18 years, 2 months
JBoss Portal SVN: r9980 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: mmcallis
Date: 2008-02-14 19:57:45 -0500 (Thu, 14 Feb 2008)
New Revision: 9980
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
5.2.2.4. JSP Files and the Portlet Taglib
minor revision, replacing itemizedlist with
variablelist
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-15 00:54:09 UTC (rev 9979)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-15 00:57:45 UTC (rev 9980)
@@ -754,7 +754,7 @@
</screen></term>
<listitem>
<para>
- This method is triggered when a user clicks on an <computeroutput>actionURL</computeroutput>, which is defined in the <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> file. This retrieves <computeroutput>yourname</computeroutput> from the HTML form, and passes it as a <literal>renderParameter</literal> to the <literal>doView()</literal> method.
+ This method is triggered when a user clicks on an <computeroutput>actionURL</computeroutput>, which is defined in the <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> file. This retrieves <computeroutput>yourname</computeroutput> from the HTML form, and passes it as a <computeroutput>aResponse.setRenderParameter</computeroutput> to the <literal>doView()</literal> method.
</para>
</listitem>
</varlistentry>
@@ -781,22 +781,23 @@
</para>
</sect3>
<sect3>
- <title>JSP files and the portlet taglib</title>
+ <title>JSP Files and the Portlet Taglib</title>
<para>
- Of importance in this tutorial are the two view JSPs. The first, <literal>view.jsp</literal>, allows the
- user to input his name, which is then posted to the <literal>processAction</literal> method in our
- portlet class, set as a <literal>renderParameter</literal>, then the <literal>render</literal> method is
- invoked (in our case, <literal>doView</literal>, which then dispatches to our
- <literal>view2.jsp</literal>).
+ The <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> and <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename> JSP files are included in the HelloWorldJSPPortlet portlet. The first, <filename>view.jsp</filename>, allows a user to input their name. This is then posted to the <computeroutput>processAction</computeroutput> method in the portlet class, which is set in the <computeroutput>aResponse.setRenderParameter</computeroutput>. The <literal>render</literal> method, <computeroutput>doView</computeroutput>, is invoked, which dispatches to the <filename>view2.jsp</filename> JSP:
+ </para>
+ <para>
<mediaobject>
<imageobject>
<imagedata align="center" fileref="images/tutorials/jsp_portlet/process.gif" valign="middle"/>
</imageobject>
</mediaobject>
- Now let's have a look at our <literal>view.jsp</literal>:
</para>
+ <para>
+ The following is an example of the <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> file:
+ </para>
<para>
- <programlisting><![CDATA[<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<screen><![CDATA[
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<portlet:defineObjects/>
@@ -814,42 +815,57 @@
You can also link to other pages, using a renderURL, like <a
href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo">
</portlet:param></portlet:renderURL>">this</a>.
-</div>]]></programlisting>
- <itemizedlist>
- <listitem>
- <para>
- <programlisting><![CDATA[<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>]]></programlisting>
- Define the portlet taglib. You do <emphasis>NOT</emphasis> need to bundle the portlet taglib,
- JBoss Portal will handle that for you.
- </para>
- </listitem>
- <listitem>
- <para>
- <programlisting><![CDATA[<portlet:defineObjects/>]]></programlisting>
- Calling <literal>defineObjects</literal> makes available implicit objects, such as
- <literal>renderRequest, actionRequest, portletConfig</literal>, in this JSP.
- </para>
- </listitem>
- <listitem>
- <para>
- <programlisting><![CDATA[<form action="<portlet:actionURL><portlet:param name="page" value="mainview"/>
- </portlet:actionURL>" method="POST">]]></programlisting>
- We create an HTML form, but generate the URL it will post to using the portlet tag library. In
- this case, notice how we are creating an <literal>actionURL</literal>, which will activate our
- <literal>processAction</literal> method, passing in any input parameters in the form.
- </para>
- </listitem>
- <listitem>
- <para>
- <programlisting><![CDATA[<a href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo">
-</portlet:param></portlet:renderURL>">]]></programlisting>
- Likewise, we are able to create a link to our <literal>doView</literal> method, by simply
- creating it with a <literal>renderURL</literal>, that passes in our <literal>yourname</literal>
- parameter.
- </para>
- </listitem>
- </itemizedlist>
- </para>
+</div>]]>
+</screen>
+</para>
+<para>
+<variablelist>
+ <varlistentry><term><screen><![CDATA[
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>]]>
+</screen></term>
+<listitem>
+ <para>
+ Define the portlet taglib. You do <emphasis>NOT</emphasis> need to bundle the portlet taglib,
+ JBoss Portal will handle that for you.
+ </para>
+</listitem>
+</varlistentry>
+<varlistentry><term><screen><![CDATA[
+<portlet:defineObjects/>]]>
+</screen></term>
+<listitem>
+ <para>
+ Calling <literal>defineObjects</literal> makes available implicit objects, such as
+ <literal>renderRequest, actionRequest, portletConfig</literal>, in this JSP.
+ </para>
+</listitem>
+</varlistentry>
+<varlistentry><term><screen><![CDATA[
+<form action="<portlet:actionURL><portlet:param name="page" value="mainview"/>
+ </portlet:actionURL>" method="POST">]]>
+</screen></term>
+<listitem>
+ <para>
+ We create an HTML form, but generate the URL it will post to using the portlet tag library. In
+ this case, notice how we are creating an <literal>actionURL</literal>, which will activate our
+ <literal>processAction</literal> method, passing in any input parameters in the form.
+ </para>
+</listitem>
+</varlistentry>
+<varlistentry><term><screen><![CDATA[
+<a href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo">
+</portlet:param></portlet:renderURL>">]]>
+</screen></term>
+<listitem>
+ <para>
+ Likewise, we are able to create a link to our <literal>doView</literal> method, by simply
+ creating it with a <literal>renderURL</literal>, that passes in our <literal>yourname</literal>
+ parameter.
+ </para>
+</listitem>
+</varlistentry>
+</variablelist>
+</para>
</sect3>
<sect3>
<title>Building and deploying your portlet</title>
18 years, 2 months
JBoss Portal SVN: r9979 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-14 19:54:09 -0500 (Thu, 14 Feb 2008)
New Revision: 9979
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java
Log:
- Added state to SF and Denver for consistency.
- Removed commented code.
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java 2008-02-15 00:33:56 UTC (rev 9978)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java 2008-02-15 00:54:09 UTC (rev 9979)
@@ -23,8 +23,6 @@
public class RemoteControlResourcePortlet extends GenericPortlet
{
private static final String ZIPCODE = "zipcode";
- private static int COLOR_INDEX = 0;
- private static final String[] COLORS = {"000", "f00", "0f0", "00f", "ff0", "0ff", "f0f", "fff"};
@Override
protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException
@@ -39,9 +37,6 @@
ResourceURL resource = renderResponse.createResourceURL();
printWriter.print(resource);
printWriter.print("')\">Open remote control!</a></p>");
- /*String color = renderRequest.getPreferences().getValue("color", "000");
- printWriter.print("<p>Preferred color: <span style='border: 1px solid #aaa; background-color:#"
- + color + ";'> </span></p>");*/
}
@Override
@@ -50,7 +45,6 @@
resourceResponse.setContentType("text/html");
PrintWriter writer = resourceResponse.getWriter();
String namespace = resourceResponse.getNamespace();
-// resourceRequest.getPreferences().setValue("color", COLORS[COLOR_INDEX++ % 8]);
writer.print("<html><head><script type='text/javascript'>function openLinkInParent(url){window.open(url,'"
+ namespace + "_parent');}</script>\n<link rel=\"stylesheet\" href='/simple-portal/css/master.css' type=\"text/css\"/></head><body>");
PortletURL url = resourceResponse.createRenderURL();
@@ -66,9 +60,9 @@
writer.print("<br/><ul><li><b>'zipcode'</b> public render parameter value: " + resourceRequest.getParameter(ZIPCODE) + "<br/>");
writer.print("Set value of <b>'zipcode'</b> public render parameter to:</li>");
url.setParameter(ZIPCODE, "80201");
- writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\">Denver</a>");
+ writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\">Denver, CO</a>");
url.setParameter(ZIPCODE, "94102");
- writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\">San Francisco</a>");
+ writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\">San Francisco, CA</a>");
url.setParameter(ZIPCODE, "20001");
writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\">Washington, DC</a>");
writer.print("</ul></div></body></html>");
18 years, 2 months
JBoss Portal SVN: r9978 - in modules/portlet/trunk: test/src/test and 1 other directories.
by portal-commits@lists.jboss.org
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
18 years, 2 months
JBoss Portal SVN: r9977 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: mmcallis
Date: 2008-02-14 19:04:46 -0500 (Thu, 14 Feb 2008)
New Revision: 9977
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
5.2.2.3. Portlet Class
minor revisions, splitting first example for
HelloWorldJSPPorlet.java into two screen elements
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-14 22:43:38 UTC (rev 9976)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-15 00:04:46 UTC (rev 9977)
@@ -141,7 +141,7 @@
<sect3>
<title>Introduction</title>
<para>
- This section describes how to deploy a portlet in JBoss Portal. Before proceeding, download the <ulink
+ This section describes how to deploy a portlet for JBoss Portal. Before proceeding, download the <ulink
url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">HelloWorldPortlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>.
</para>
</sect3>
@@ -264,7 +264,7 @@
</mediaobject>
</para>
<para>
- The following is an example of the <filename>HelloWorldPortlet/WEB-INF/portlet.xml</filename> file:
+ The following is an example of the <filename>HelloWorldPortlet/WEB-INF/portlet.xml</filename> file. In order to create the <filename>WEB-INF/</filename> and <filename>META-INF/</filename> directories, extract the <filename>helloworldportlet.war</filename> file.This file must adhere to its definition in the JSR-168 Portlet Specification. You may define more than one portlet application in this file:
</para>
<para>
<screen><![CDATA[
@@ -289,9 +289,6 @@
</screen>
</para>
<para>
- In order to create the <filename>WEB-INF</filename> and <filename>META-INF</filename> directories, extract the <filename>helloworldportlet.war</filename> file.This file must adhere to its definition in the JSR-168 Portlet Specification. You may define more than one portlet application in this file.
- </para>
- <para>
<variablelist>
<varlistentry><term><screen><![CDATA[
<portlet-name>HelloWorldPortlet</portlet-name>]]></screen></term>
@@ -633,20 +630,20 @@
</sect3>
</sect2>
<sect2>
- <title>An Example JSP Portlet</title>
+ <title>An example JSP Portlet</title>
<sect3>
<title>Introduction</title>
<para>
- This section describes how to deploy a JSP portlet in JBoss Portal. Before proceeding, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldJSPPortlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>. The HelloWorldJSPPortlet demonstrates how to use JSPs for view rendering, and the portlet taglib for generating links.
+ This section describes how to deploy a JSP portlet for JBoss Portal. Before proceeding, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldJSPPortlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>. The HelloWorldJSPPortlet demonstrates how to use JSPs for view rendering, and the portlet taglib for generating links.
</para>
</sect3>
<sect3>
<title>Package Content</title>
<para>
- The application descriptors for the HelloWorldJSPPortlet portlet are similar to those from the HelloWorldPortlet (<xref linkend="first_portlet_descriptors"/>). See <xref linkend="descriptors_portlet"/> for further details about application descriptors.
+ The application descriptors for the HelloWorldJSPPortlet portlet are similar to those from the HelloWorldPortlet (<xref linkend="first_portlet_descriptors"/>). See <xref linkend="descriptors_portlet"/> for further information about application descriptors.
</para>
<para>
- The following is an example of the directory structure of the HelloWorldJSPPortlet portlet. The HelloWorldJSPPortlet portlet contains the traditional portlet and JBoss Portal specific application descriptors:
+ The following is an example of the directory structure of the HelloWorldJSPPortlet portlet. The HelloWorldJSPPortlet portlet contains the traditional portlet and JBoss Portal specific application descriptors. In order to create the <filename>WEB-INF/</filename> and <filename>META-INF/</filename> directories, extract the <filename>helloworldjspportlet.war</filename> file.
</para>
<para>
<mediaobject>
@@ -659,7 +656,7 @@
<sect3>
<title>Portlet Class</title>
<para>
- The <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldJSPPortlet</ulink> contains a <filename>HelloWorldJSPPortlet/src/main/org/jboss/portlet/hello/HelloWorldJSPPortlet.java</filename> file:
+ The <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldJSPPortlet</ulink> contains the <filename>HelloWorldJSPPortlet/src/main/org/jboss/portlet/hello/HelloWorldJSPPortlet.java</filename> file:
</para>
<para>
<screen><![CDATA[
@@ -732,11 +729,11 @@
<para>
<variablelist>
<varlistentry><term><screen><![CDATA[
-protected void doHelp(RenderRequest rRequest, RenderResponse rResponse) { ... }
-
-// And
-
-protected void doEdit(RenderRequest rRequest, RenderResponse rResponse) { ... } ]]>
+protected void doHelp(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException]]>
+</screen><screen><![CDATA[
+protected void doEdit(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException]]>
</screen></term>
<listitem>
<para>
@@ -776,7 +773,7 @@
</screen></term>
<listitem>
<para>
- The <literal>doView</literal> implementation is responsible for dispatching to the appropriate JSP, <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> or <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename>, depending on the existence of the <literal>yourname</literal> parameter passed in from <literal>processAction</literal>.
+ The <literal>doView</literal> implementation is responsible for dispatching to the appropriate JSP, <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename>, or <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename>, depending on the existence of the <literal>yourname</literal> parameter passed in from <literal>processAction</literal>.
</para>
</listitem>
</varlistentry>
18 years, 2 months
JBoss Portal SVN: r9976 - modules/portlet/trunk/build/distrib.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-14 17:43:38 -0500 (Thu, 14 Feb 2008)
New Revision: 9976
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Compress each distrib individually.
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-02-14 22:13:56 UTC (rev 9975)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-02-14 22:43:38 UTC (rev 9976)
@@ -23,7 +23,7 @@
</target>
<!-- Build and compress everything -->
- <target name="all" depends="__check-env,licenses,build,package,zip"
+ <target name="all" depends="__check-env,licenses,build,package"
description="do everything - build source, doc, distro"/>
<!-- Licenses -->
@@ -81,6 +81,9 @@
<fileset dir="${source.dir}" includes="**/*"
excludes="**/target/**,**/.svn/*,**/*.iml,**/*.ipr,**/*.iws,results.txt"/>
</copy>
+ <antcall target="__zip">
+ <param name="release.name" value="${pc.release.name.src}"/>
+ </antcall>
</target>
<!--
@@ -100,6 +103,9 @@
<copy todir="${pc.build.bin.as42}/server/default/deploy/simple-portal">
<fileset dir="${source.dir}/test/target/portal/as42/simple-portal" includes="**/*"/>
</copy>
+ <antcall target="__zip">
+ <param name="release.name" value="${demo.release.name.as42}"/>
+ </antcall>
</target>
<!--
@@ -122,17 +128,7 @@
<copy todir="${pc.build.bin.tomcat6}/webapps">
<fileset dir="${source.dir}/test/target/portal/tomcat/" includes="**/*.war"/>
</copy>
- </target>
-
- <!-- Compress packages -->
- <target name="zip" unless="no-zip">
<antcall target="__zip">
- <param name="release.name" value="${pc.release.name.src}"/>
- </antcall>
- <antcall target="__zip">
- <param name="release.name" value="${demo.release.name.as42}"/>
- </antcall>
- <antcall target="__zip">
<param name="release.name" value="${demo.release.name.tomcat6}"/>
</antcall>
</target>
@@ -186,7 +182,7 @@
</sequential>
</target>
- <target name="__zip">
+ <target name="__zip" unless="no-zip">
<tar destfile="output/${release.name}.tar.gz" compression="gzip">
<tarfileset prefix="${release.name}" filemode="775" dir="output/${release.name}"/>
</tar>
18 years, 2 months
JBoss Portal SVN: r9975 - modules/portlet/trunk/build/distrib.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-14 17:13:56 -0500 (Thu, 14 Feb 2008)
New Revision: 9975
Added:
modules/portlet/trunk/build/distrib/JBossPC-README.txt
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Now create bundled distributions. Requires either (or both) TOMCAT_6_HOME or JBOSS_4_2_HOME to be set.
Copied: modules/portlet/trunk/build/distrib/JBossPC-README.txt (from rev 9970, modules/portlet/trunk/build/distrib/README.txt)
===================================================================
--- modules/portlet/trunk/build/distrib/JBossPC-README.txt (rev 0)
+++ modules/portlet/trunk/build/distrib/JBossPC-README.txt 2008-02-14 22:13:56 UTC (rev 9975)
@@ -0,0 +1,15 @@
+
+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
Property changes on: modules/portlet/trunk/build/distrib/JBossPC-README.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-02-14 19:59:47 UTC (rev 9974)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-02-14 22:13:56 UTC (rev 9975)
@@ -1,29 +1,30 @@
<project default="all" name="JBoss Portlet Container">
<property name="source.dir" value="../.."/>
- <property name="docs.dir" value="${source.dir}/docs"/>
- <property name="release.version" value="2.0.B1"/>
+ <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="pc.release.name" value="jboss-pc-${release.version}"/>
+ <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="pc.release.name.src" value="${pc.release.name}-src"/>
- <property name="pc.release.name.as42" value="${pc.release.name}-jbossas42"/>
- <property name="pc.release.name.tomcat6" value="${pc.release.name}-tomcat6"/>
+ <property name="demo.release.name.as42" value="${demo.release.name}-jbossas42"/>
+ <property name="demo.release.name.tomcat6" value="${demo.release.name}-tomcat6"/>
<!-- -->
<property name="pc.build.src" value="output/${pc.release.name.src}"/>
- <property name="pc.build.bin.as42" value="output/${pc.release.name.as42}"/>
- <property name="pc.build.bin.tomcat6" value="output/${pc.release.name.tomcat6}"/>
+ <property name="pc.build.bin.as42" value="output/${demo.release.name.as42}"/>
+ <property name="pc.build.bin.tomcat6" value="output/${demo.release.name.tomcat6}"/>
- <property environment="env"/>
-
<!-- Clean -->
<target name="clean">
<delete dir="output"/>
</target>
<!-- Build and compress everything -->
- <target name="all" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/>
+ <target name="all" depends="__check-env,licenses,build,package,zip"
+ description="do everything - build source, doc, distro"/>
<!-- Licenses -->
<target name="licenses" unless="no-doc">
@@ -38,11 +39,11 @@
<include name="public-domain.txt"/>
<include name="sun-jaf.txt"/>
</fileset>-->
- <mkdir dir="output/docs/licenses"/>
+ <mkdir dir="output/jbosspc-docs/licenses"/>
<!--<concat destfile="output/docs/licenses/thirdparty-licenses.txt">
<fileset refid="thirdparty-licenses"/>
</concat>-->
- <copy todir="output/docs/licenses">
+ <copy todir="output/jbosspc-docs/licenses">
<!--<fileset refid="thirdparty-licenses"/>-->
<fileset dir="../licences" includes="JBossEULA.txt"/>
</copy>
@@ -54,7 +55,7 @@
<!-- Build JBoss Portlet Container documentation -->
<target name="doc.build" unless="no-doc">
<sequential>
- <ant dir="${docs.dir}/user-guide" antfile="build.xml"/>
+ <ant dir="${src.docs.dir}/user-guide" antfile="build.xml"/>
</sequential>
</target>
@@ -85,25 +86,42 @@
<!--
| JBoss Portlet Container binary distribution for AS 4.2.x
-->
- <target name="package-as42" description="package AS binary">
+ <target name="package-as42" description="package AS binary" if="JBOSS_4_2_HOME">
+ <copy todir="${pc.build.bin.as42}">
+ <fileset dir="${JBOSS_4_2_HOME}" includes="**/*"/>
+ </copy>
<antcall target="__package-binary">
<param name="bin.dir" value="${pc.build.bin.as42}"/>
+ <param name="deploy.dir" value="${pc.build.bin.as42}/server/default/deploy"/>
</antcall>
- <copy todir="${pc.build.bin.as42}/simple-portal">
+ <!--<copy todir="${pc.build.bin.as42}/simple-portal">
<fileset dir="${source.dir}/test/target/portal/as42/simple-portal" includes="**/*"/>
+ </copy>-->
+ <copy todir="${pc.build.bin.as42}/server/default/deploy/simple-portal">
+ <fileset dir="${source.dir}/test/target/portal/as42/simple-portal" includes="**/*"/>
</copy>
</target>
<!--
| JBoss Portlet Container binary distribution for Tomcat 6.x
-->
- <target name="package-tomcat6" description="package Tomcat binary">
+ <target name="package-tomcat6" description="package Tomcat binary" if="TOMCAT_6_HOME">
+ <copy todir="${pc.build.bin.tomcat6}">
+ <fileset dir="${TOMCAT_6_HOME}" includes="**/*"/>
+ </copy>
<antcall target="__package-binary">
<param name="bin.dir" value="${pc.build.bin.tomcat6}"/>
+ <param name="deploy.dir" value="${pc.build.bin.as42}/webapps"/>
</antcall>
- <copy todir="${pc.build.bin.tomcat6}/simple-portal">
+ <!--<copy todir="${pc.build.bin.tomcat6}/simple-portal">
<fileset dir="${source.dir}/test/target/portal/tomcat" includes="**/*"/>
+ </copy>-->
+ <copy todir="${pc.build.bin.tomcat6}/lib">
+ <fileset dir="${source.dir}/test/target/portal/tomcat/copy-to-tomcat-lib" includes="**/*.jar"/>
</copy>
+ <copy todir="${pc.build.bin.tomcat6}/webapps">
+ <fileset dir="${source.dir}/test/target/portal/tomcat/" includes="**/*.war"/>
+ </copy>
</target>
<!-- Compress packages -->
@@ -112,10 +130,10 @@
<param name="release.name" value="${pc.release.name.src}"/>
</antcall>
<antcall target="__zip">
- <param name="release.name" value="${pc.release.name.as42}"/>
+ <param name="release.name" value="${demo.release.name.as42}"/>
</antcall>
<antcall target="__zip">
- <param name="release.name" value="${pc.release.name.tomcat6}"/>
+ <param name="release.name" value="${demo.release.name.tomcat6}"/>
</antcall>
</target>
@@ -126,6 +144,12 @@
<antcall target="__package-distrib">
<param name="todir" value="${bin.dir}"/>
</antcall>
+ <antcall target="__package-bundled-binary">
+ <param name="deploy.dir" value="${deploy.dir}"/>
+ </antcall>
+ </target>
+
+ <target name="__package-standalone-binary" if="bin-alone">
<mkdir dir="${bin.dir}/lib"/>
<copy todir="${bin.dir}/lib" flatten="true">
<fileset dir="${source.dir}" includes="**/target/*.jar" excludes="**/*sources.jar"/>
@@ -135,10 +159,17 @@
</copy>
</target>
+ <target name="__package-bundled-binary" unless="bin-alone">
+ <copy todir="${deploy.dir}" flatten="true">
+ <fileset dir="${source.dir}/test/target/portal/samples" includes="*.war"/>
+ </copy>
+ </target>
+
<target name="__package-distrib">
<mkdir dir="${todir}"/>
+ <copy file="JBossPC-README.txt" todir="${todir}"/>
<antcall target="__package-doc">
- <param name="todir" value="${todir}/docs"/>
+ <param name="todir" value="${todir}/jbosspc-docs"/>
</antcall>
</target>
@@ -147,9 +178,8 @@
<mkdir dir="${todir}"/>
<mkdir dir="${todir}/user-guide"/>
<copy todir="${todir}/user-guide">
- <fileset dir="${docs.dir}/user-guide/build/en/"/>
+ <fileset dir="${src.docs.dir}/user-guide/build/en/"/>
</copy>
- <copy file="README.txt" todir="${todir}"/>
<!--<copy todir="${todir}/docs/licenses">
<fileset dir="output/docs/licenses"/>
</copy>-->
@@ -162,4 +192,30 @@
</tar>
<checksum file="output/${release.name}.tar.gz"/>
</target>
+
+ <target name="__check-env">
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="TOMCAT_6_HOME" value="${env.TOMCAT_6_HOME}">
+ <and>
+ <isset property="env.TOMCAT_6_HOME"/>
+ <not>
+ <isset property="TOMCAT_6_HOME"/>
+ </not>
+ </and>
+ </condition>
+
+ <echo message="Set JBOSS_4_2_HOME and/or TOMCAT_6_HOME variables for binary distributions:"/>
+ <echo message="JBoss AS 4.2.x home: ${JBOSS_4_2_HOME}"/>
+ <echo message="Tomcat 6.x home: ${TOMCAT_6_HOME}"/>
+ </target>
</project>
18 years, 2 months
JBoss Portal SVN: r9974 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2008-02-14 14:59:47 -0500 (Thu, 14 Feb 2008)
New Revision: 9974
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java
Log:
formatting
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java 2008-02-14 19:05:58 UTC (rev 9973)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java 2008-02-14 19:59:47 UTC (rev 9974)
@@ -112,7 +112,7 @@
" </form>\n" +
"</div>" +
"");
- writer.print("<div id=\"repeat-div\" class='half-width float-left'></div>");
+ writer.print("<div id=\"repeat-container\"><div id=\"repeat-div\" class='half-width float-left' style='height:50px'></div></div>");
// "<input type=\"text\" id=\"hidden-input\" value=\"" + resourceURL.toString() + "\" />" +
// "<a href='javascript:" + resp.getNamespace() + "_handle()'>Click me to trigger script</a>" +
writer.print("<br class='clear'/><br class='clear'/><hr/>" +
18 years, 2 months
JBoss Portal SVN: r9973 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: demo and 1 other directory.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2008-02-14 14:05:58 -0500 (Thu, 14 Feb 2008)
New Revision: 9973
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp
Log:
wikipedia formatting
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-14 18:16:15 UTC (rev 9972)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-14 19:05:58 UTC (rev 9973)
@@ -362,4 +362,15 @@
div#container div#content div.content-box div.box-content {
padding: 5px;
+}
+
+/*-------------------------------------Wiki page*/
+
+div#container div#content div.wiki-content {
+ padding: 5px;
+ border-bottom: 1px solid #777777;
+}
+
+div#container div#content div.wiki-content p {
+ padding: 5px;
}
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp 2008-02-14 18:16:15 UTC (rev 9972)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp 2008-02-14 19:05:58 UTC (rev 9973)
@@ -8,7 +8,7 @@
<portal:page>
<portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="32080"/>
- <div class="home-content full-width">
+ <div class="wiki-content full-width">
<div class="third-width float-right">
<jbp:portlet name="GoogleMap" applicationName="samples-google-map-portlet"/>
</div>
18 years, 2 months