JBoss Portal SVN: r9859 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-07 23:18:03 -0500 (Thu, 07 Feb 2008)
New Revision: 9859
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
Log:
adding example about specifying a configuration
eg run.bat/sh -c default
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-02-08 04:01:19 UTC (rev 9858)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-02-08 04:18:03 UTC (rev 9859)
@@ -25,7 +25,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename> directory. On Microsoft Windows, execute <command>run.bat</command>. On Linux, run the <command>./run.sh</command> command.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename> directory. On Microsoft Windows, execute <command>run.bat</command>. On Linux, run the <command>./run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>./run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -125,7 +125,7 @@
</imageobject>
</mediaobject>
<para>
- Copy the Datasource descriptor that matches your database into the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/</filename> directory, where <replaceable>configuration</replaceable> is either all, default or minimal. For example, if you are using the all configuration, copy the Datasource descriptor into the <filename>$JBOSS_HOME/server/all/deploy/</filename> directory.
+ Copy the Datasource descriptor that matches your database into the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/</filename> directory, where <replaceable>configuration</replaceable> is either all, default, minimal or production. The production configuration only exists on JBoss EAP, and not JBoss AS. For example, if you are using the all configuration, copy the Datasource descriptor into the <filename>$JBOSS_HOME/server/all/deploy/</filename> directory.
</para>
<para>
After the Datasource descriptor has been copied into the <filename>deploy</filename> directory, make sure the username, password, connection-url, and driver-class are correct for your chosen database. Datasource descriptor files can be deployed to test before being used in production. The following is an example Datasource descriptor for the PostgreSQL database:
@@ -161,7 +161,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On Microsoft Windows, execute <command>run.bat</command>. On Linux, run the <command>./run.sh</command> command.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On Microsoft Windows, execute <command>run.bat</command>. On Linux, run the <command>./run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>./run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -348,7 +348,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> directory is the directory where the JBoss Portal source code was downloaded to. Then, Microsoft Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>./build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, Microsoft Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>./build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -441,7 +441,7 @@
</imageobject>
</mediaobject>
<para>
- Copy the Datasource descriptor that matches your database into the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/</filename> directory, where <replaceable>configuration</replaceable> is either all, default, minimal, or production. For example, if you are using the production configuration, copy the Datasource descriptor into the <filename>$JBOSS_HOME/server/production/deploy/</filename> directory.
+ Copy the Datasource descriptor that matches your database into the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/</filename> directory, where <replaceable>configuration</replaceable> is either all, default, minimal, or production. For example, if you are using the production configuration, copy the Datasource descriptor into the <filename>$JBOSS_HOME/server/production/deploy/</filename> directory. The production configuration only exists on JBoss EAP installations, and not JBoss AS.
</para>
<para>
After the Datasource descriptor has been copied into the <filename>deploy</filename> directory, make sure the username, password, connection-url, and driver-class are correct for your chosen database. Datasource descriptor files can be deployed to test before being used in production. The following is an example Datasource descriptor for the PostgreSQL database:
16 years, 4 months
JBoss Portal SVN: r9858 - modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-02-07 23:01:19 -0500 (Thu, 07 Feb 2008)
New Revision: 9858
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
Log:
dont need it
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-08 03:56:42 UTC (rev 9857)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-08 04:01:19 UTC (rev 9858)
@@ -38,10 +38,10 @@
</div>
<div id="content">
<portal:page>
- <div class="left-col third-width float-left">
+ <div class="third-width float-left">
<jbp:portlet name="RemoteControl" applicationName="remotecontrol-portlet" />
</div>
- <div class="right-col two-third-width float-left">
+ <div class="two-third-width float-left">
<jbp:portlet name="GoogleMap" applicationName="google-map-portlet" />
<jbp:portlet name="GoogleWeather" applicationName="google-weather-portlet" />
</div>
16 years, 4 months
JBoss Portal SVN: r9857 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-07 22:56:42 -0500 (Thu, 07 Feb 2008)
New Revision: 9857
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
fixing up references to directories, eg install directory /
source directory
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-02-08 03:53:46 UTC (rev 9856)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-02-08 03:56:42 UTC (rev 9857)
@@ -348,7 +348,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_HOME_DIRECTORY/build/</filename> directory. Then, Microsoft Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>./build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> directory is the directory where the JBoss Portal source code was downloaded to. Then, Microsoft Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>./build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -375,7 +375,7 @@
<orderedlist>
<listitem>
<para>
- Change into the <filename>JBOSS_PORTAL_HOME_DIRECTORY/build/</filename> directory, and run the following command:
+ Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, and run the following command:
</para>
<para>
<screen>
@@ -385,7 +385,7 @@
</listitem>
<listitem>
<para>
- Change into the <filename>JBOSS_PORTAL_HOME_DIRECTORY/core/</filename> directory, and run the following command:
+ Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/core/</filename> directory, and run the following command:
</para>
<para>
<screen>
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-08 03:53:46 UTC (rev 9856)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-08 03:56:42 UTC (rev 9857)
@@ -149,7 +149,7 @@
<title>Package Structure</title>
<para>
Like other Java EE applications, portlets are packaged in WAR files. A typical portlet WAR file can also
- include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPorlet portlet:
+ include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet:
</para>
<para>
<mediaobject>
@@ -162,7 +162,7 @@
<sect3>
<title>Portlet Class</title>
<para>
- The following is the <filename>HelloWorldPortlet\src\main\org\jboss\portlet\hello\HelloWorldPortlet.java</filename> java source file, which comes bundled with the <ulink
+ The following is the <filename>HelloWorldPortlet/src/main/org/jboss/portlet/hello/HelloWorldPortlet.java</filename> java source file, which comes bundled with the <ulink
url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">HelloWorldPortlet</ulink>:
</para>
<para>
@@ -170,39 +170,25 @@
package org.jboss.portlet.hello;
-
import javax.portlet.GenericPortlet;
-
import javax.portlet.PortletException;
-
import javax.portlet.RenderRequest;
-
import javax.portlet.RenderResponse;
-
import javax.portlet.UnavailableException;
-
import java.io.IOException;
-
import java.io.PrintWriter;
-
public class HelloWorldPortlet extends GenericPortlet
{
-
protected void doView(RenderRequest rRequest, RenderResponse rResponse)
throws PortletException, IOException, UnavailableException
{
-
rResponse.setContentType("text/html");
-
PrintWriter writer = rResponse.getWriter();
-
writer.write("Hello World!");
-
writer.close();
-
}
} ]]>
16 years, 4 months
JBoss Portal SVN: r9856 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: images and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-02-07 22:53:46 -0500 (Thu, 07 Feb 2008)
New Revision: 9856
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/nav-bg.gif
Log:
new nav
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-08 03:32:17 UTC (rev 9855)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-08 03:53:46 UTC (rev 9856)
@@ -148,11 +148,11 @@
background-position: top left;
border-top: 1px solid #878787;
border-bottom: 1px solid #383838;
- height:23px;
+ height:24px;
}
div#container div.nav ul {
- height:23px;
+ height:24px;
margin: 0 0 0 10px;
}
@@ -160,14 +160,15 @@
display: inline;
float: left;
text-align: center;
- height: 21px;
- border: 1px solid #929292;
+ height: 24px;
+ /*border: 1px solid #929292;*/
}
div#container div.nav ul li a,
div#container div.nav ul li a:hover {
display: block;
- padding: 4px 12px 4px 12px;
+ height:16px;
+ padding: 5px 14px 4px 14px;
background-repeat: repeat-x;
background-position: top left;
text-decoration:none;
@@ -175,14 +176,14 @@
}
div#container div.nav ul li a{
- color: #353535;
- background-image: url( /simple/images/inactive-button-bg.gif );
+ color: #fff;
+ /*background-image: url( /simple/images/inactive-button-bg.gif );*/
}
div#container div.nav ul li a:hover,
div#container div.nav ul li a.selected{
- color: #000;
- background-image: url( /simple/images/active-button-bg.gif );
+ color: #fff;
+ background-image: url( /simple/images/active-button2-bg.gif );
}
div#container div#content {
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/nav-bg.gif
===================================================================
(Binary files differ)
16 years, 4 months
JBoss Portal SVN: r9855 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-07 22:32:17 -0500 (Thu, 07 Feb 2008)
New Revision: 9855
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
trying to commit changes for 5.2.1.2. Package Structure and
5.2.1.3. Portlet Class after running tutorials.xml through
unix2dos line break fixing...
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-08 03:24:09 UTC (rev 9854)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-08 03:32:17 UTC (rev 9855)
@@ -100,7 +100,7 @@
<title>Tutorials</title>
<para>
The tutorials contained in this chapter are targetted toward portlet developers. Although they are a good
- starting and reference point, it is heavily recommend that portlet developers read and understand the
+ starting and reference point, it is highly recommend that portlet developers read and understand the
<ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>. Use the <ulink url="http://jboss.org/index.html?module=bb&op=viewforum&f=215">JBoss Portal User Forums</ulink> for user-to-user help.
</para>
<!--<sect2 id="build_instructions">
@@ -148,9 +148,8 @@
<sect3>
<title>Package Structure</title>
<para>
- Portlets are packaged in WAR files, just like other JEE applications. A typical portlet WAR file can also
- include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files you would
- commonly include.
+ Like other Java EE applications, portlets are packaged in WAR files. A typical portlet WAR file can also
+ include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPorlet portlet:
</para>
<para>
<mediaobject>
@@ -163,84 +162,108 @@
<sect3>
<title>Portlet Class</title>
<para>
- Included in the
- <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">
- download bundle</ulink> you should have one java source file:
- <literal>HelloWorldPortlet\src\main\org\jboss\portlet\hello\HelloWorldPortlet.java</literal>, and it
- should contain the following:
- <programlisting><![CDATA[package org.jboss.portlet.hello;
+ The following is the <filename>HelloWorldPortlet\src\main\org\jboss\portlet\hello\HelloWorldPortlet.java</filename> java source file, which comes bundled with the <ulink
+ url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">HelloWorldPortlet</ulink>:
+ </para>
+ <para>
+<screen><![CDATA[
+package org.jboss.portlet.hello;
+
+
import javax.portlet.GenericPortlet;
+
import javax.portlet.PortletException;
+
import javax.portlet.RenderRequest;
+
import javax.portlet.RenderResponse;
+
import javax.portlet.UnavailableException;
+
import java.io.IOException;
+
import java.io.PrintWriter;
+
public class HelloWorldPortlet extends GenericPortlet
+
{
- protected void doView(RenderRequest rRequest, RenderResponse rResponse)
- throws PortletException, IOException, UnavailableException
- {
- rResponse.setContentType("text/html");
- PrintWriter writer = rResponse.getWriter();
- writer.write("Hello World!");
- writer.close();
- }
-}]]>
- </programlisting>
- Now let's dissect our simplest of portlets:
- <itemizedlist>
- <listitem>
- <para>
- <programlisting>public class HelloWorldPortlet extends GenericPortlet</programlisting>
- All Portlets MUST implement the <literal>javax.portlet.Portlet</literal> interface. The Portlet
- API also provides a convenience implementation of this interface in the form of the
- <literal>javax.portlet.GenericPortlet</literal> class which, among other things, implements
+
+ protected void doView(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException
+
+ {
+
+ rResponse.setContentType("text/html");
+
+ PrintWriter writer = rResponse.getWriter();
+
+ writer.write("Hello World!");
+
+ writer.close();
+
+ }
+
+} ]]>
+</screen>
+ </para>
+ <para>
+ <variablelist>
+ <varlistentry><term><screen>
+public class HelloWorldPortlet extends GenericPortlet</screen></term>
+ <listitem>
+ <para>
+ All portlets must implement the <literal>javax.portlet.Portlet</literal> interface. The portlet
+ API provides a convenient implementation of this interface, in the form of the
+ <literal>javax.portlet.GenericPortlet</literal> class, which among other things, implements
the <literal>Portlet render</literal> method to dispatch to abstract mode-specific methods to
- make it easier to support the standard portlet modes. It also provides
+ make it easier to support the standard portlet modes. As well, it provides
a default implementation for <literal>processAction</literal>, <literal>init</literal> and
- <literal>destory</literal> methods. It is recommended to extend <literal>GenericPortlet</literal>
+ <literal>destroy</literal> methods. It is recommended to extend <literal>GenericPortlet</literal>
for most cases.
- </para>
- </listitem>
- <listitem>
- <para>
- <programlisting>protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws
- PortletException, IOException, UnavailableException</programlisting>
- As we extend from <literal>GenericPortlet</literal> and we are only interested in supported the
- <literal>VIEW</literal> mode, we only need to implement the <literal>doView</literal> method,
- and <literal>GenericPortlet</literal>'s <literal>render</literal> implementation will call our
- implementation when the <literal>VIEW</literal> mode is requested.
- </para>
- </listitem>
- <listitem>
- <para>
- <programlisting>rResponse.setContentType("text/html");</programlisting>
- Just like in the servlet-world, you must declare what content-type the portlet will be
- responding in. You need to do this before starting to write content or the portlet will throw
- an exception.
- </para>
- </listitem>
- <listitem>
- <para>
- <programlisting><![CDATA[
-PrintWriter writer = rResponse.getWriter();
-writer.write("Hello World!");
-writer.close();]]></programlisting>
- Here we output the text
- <literal>Hello World!</literal>
- in our portlet window.
- <note>
- Portlets are responsible for generating markup fragments, as they are included on a page and
- surrounded by other portlets. In particular, this means that a portlet outputting HTML MUST
- not output any markup that cannot be found in a <literal>body</literal> element.
- </note>
- </para>
- </listitem>
- </itemizedlist>
- </para>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term><screen>
+protected void doView(RenderRequest rRequest, RenderResponse rResponse)
+throws PortletException, IOException, UnavailableException</screen></term>
+ <listitem>
+ <para>
+ As we extend from <literal>GenericPortlet</literal>, and are only interested in supporting the <literal>VIEW</literal> mode, only the <literal>doView</literal> method needs to be implemented, and the <literal>GenericPortlet</literal> <literal>render</literal> implemention calls our implementation when the <literal>VIEW</literal> mode is requested.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term><screen>
+rResponse.setContentType("text/html");</screen></term>
+ <listitem>
+ <para>
+ As in the servlet-world, you must declare what content-type the portlet will be
+ responding in. Do this before starting to write content or the portlet will throw an exception.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term><screen>
+PrintWriter writer = rResponse.getWriter();
+writer.write("Hello World!");
+writer.close();</screen></term>
+ <listitem>
+ <para>
+ This produces the <literal>Hello World!</literal> text in our portlet window.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</para>
+<para>
+ <note>
+ <para>
+ Portlets are responsible for generating markup fragments, as they are included on a page and are
+ surrounded by other portlets. In particular, this means that a portlet outputting HTML must
+ not output any markup that cannot be found in a <literal><body></literal> element.
+ </para>
+ </note>
+</para>
</sect3>
<sect3 id="first_portlet_descriptors">
<title>Application Descriptors</title>
16 years, 4 months
JBoss Portal SVN: r9854 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-02-07 22:24:09 -0500 (Thu, 07 Feb 2008)
New Revision: 9854
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
Log:
layout changes
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-02-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-02-08 03:24:09 UTC (rev 9854)
@@ -1,6 +1,6 @@
<%@ tag body-content="scriptless" %>
-<%@ attribute name="name" required="true" %>
-<%@ attribute name="applicationName" required="true" %>
+<%@ attribute name="name" rtexprvalue="true" required="true" %>
+<%@ attribute name="applicationName" rtexprvalue="true" required="true" %>
<%@ attribute name="content" fragment="true" required="false" %>
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
@@ -11,12 +11,20 @@
<div class="portlet-frame">
<div class="header full-width">
<div class="header-layer full-width">
- <div class="title half-width float-left"><portal:portlettitle/></div>
- <div class="controls half-width float-right">
+ <div class="title two-third-width float-left"><h2><portal:portlettitle/></h2></div>
+ <div class="controls third-width float-right">
+ <span class="mode-button">
<a href="<portal:portleturl windowState='maximized'/>"><img src="/simple/images/icon-maximize.gif" alt=""/></a>
+ </span>
+ <span class="mode-button">
<a href="<portal:portleturl windowState='normal'/>"><img src="images/icon-normal.gif" alt=""/></a>
+ </span>
+ <span class="mode-button">
<a href="<portal:portleturl windowState='minimized'/>"><img src="images/icon-minimize.gif" alt=""/></a>
+ </span>
+ <span class="mode-button">
<a title="Edit" href="<portal:portleturl mode='edit'/>">Edit</a>
+ </span>
</div>
</div>
</div>
@@ -26,4 +34,4 @@
</div>
</div>
-</portal:portlet>
\ No newline at end of file
+</portal:portlet>
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-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-08 03:24:09 UTC (rev 9854)
@@ -201,6 +201,7 @@
background-color: #e2e2e2;
padding: 2px;
float:left;
+ margin:10px;
}
div#container div#content div.portlet-frame{
@@ -223,7 +224,7 @@
height:20px;
}
-div#container div#content div.portlet div.header div.header-layer div.title{
+div#container div#content div.portlet div.header div.header-layer div.title h2{
font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
color: #fff;
padding: 2px;
@@ -231,5 +232,10 @@
div#container div#content div.portlet div.header div.header-layer div.controls{
text-align: right;
- padding: 3px 3px 0 0;
+ padding: 3px 0 0 0;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button{
+ text-align: right;
+ padding: 0 5px 0 0;
}
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-08 03:24:09 UTC (rev 9854)
@@ -38,13 +38,14 @@
</div>
<div id="content">
<portal:page>
- <jbp:portlet name="GoogleMap" applicationName="google-map-portlet" >
-<%--
- <a href="<portal:portleturl><portal:param name='zipcode' value='20855'/></portal:portleturl>">Derwood</a>
---%>
- </jbp:portlet>
- <jbp:portlet name="GoogleWeather" applicationName="google-weather-portlet" />
- <jbp:portlet name="RemoteControl" applicationName="remotecontrol-portlet" />
+ <div class="left-col third-width float-left">
+ <jbp:portlet name="RemoteControl" applicationName="remotecontrol-portlet" />
+ </div>
+ <div class="right-col two-third-width float-left">
+ <jbp:portlet name="GoogleMap" applicationName="google-map-portlet" />
+ <jbp:portlet name="GoogleWeather" applicationName="google-weather-portlet" />
+ </div>
+
</portal:page>
</div>
<br class="clear"/>
16 years, 4 months
JBoss Portal SVN: r9853 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-07 21:40:24 -0500 (Thu, 07 Feb 2008)
New Revision: 9853
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java
Log:
fix bug with page state in PAGE resource serving
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-08 02:36:13 UTC (rev 9852)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-08 02:40:24 UTC (rev 9853)
@@ -267,7 +267,7 @@
parameters.put(WINDOW_STATE, resourceURL.getWindowState().toString());
}
- if (cacheability == CacheLevel.PAGE)
+ if (cacheability == CacheLevel.PAGE && pageState != null)
{
parameters.put(PAGE_STATE, pageState);
}
16 years, 4 months
JBoss Portal SVN: r9852 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp: taglib and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-07 21:36:13 -0500 (Thu, 07 Feb 2008)
New Revision: 9852
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java
Log:
forgot to check in a class
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java 2008-02-08 02:31:52 UTC (rev 9851)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java 2008-02-08 02:36:13 UTC (rev 9852)
@@ -52,9 +52,6 @@
/** . */
private int count = 0;
- /** . */
- private final MutableOut out;
-
public PortalResponse(
HttpServletResponse response,
PagePortletControllerContext portletControllerContext,
@@ -65,7 +62,6 @@
//
this.portletControllerContext = portletControllerContext;
this.pageState = pageState;
- this.out = new MutableOut(this);
}
/**
@@ -145,16 +141,6 @@
// buffer.close();
// }
- public void setMuted(boolean muted)
- {
- out.setMuted(muted);
- }
-
- public boolean isMuted()
- {
- return out.isMuted();
- }
-
public String nextId()
{
return "" + count++;
Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java 2008-02-08 02:36:13 UTC (rev 9852)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.test.jsp.taglib;
+
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortalBodyTagSupport extends BodyTagSupport
+{
+ protected final PortalResponse getPortalResponse()
+ {
+ return (PortalResponse)pageContext.getResponse();
+ }
+}
16 years, 4 months
JBoss Portal SVN: r9851 - modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-07 21:31:52 -0500 (Thu, 07 Feb 2008)
New Revision: 9851
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml
Log:
make EL work
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld 2008-02-08 01:51:39 UTC (rev 9850)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld 2008-02-08 02:31:52 UTC (rev 9851)
@@ -21,23 +21,28 @@
<attribute>
<name>name</name>
<required>true</required>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>applicationName</name>
<required>true</required>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>initialMode</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>supportedModes</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>supportedWindowStates</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
@@ -60,10 +65,12 @@
<body-content>JSP</body-content>
<attribute>
<name>mode</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>windowState</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
@@ -74,10 +81,12 @@
<body-content>empty</body-content>
<attribute>
<name>name</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>value</name>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-08 01:51:39 UTC (rev 9850)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-08 02:31:52 UTC (rev 9851)
@@ -22,10 +22,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<filter>
<filter-name>ControllerFilter</filter-name>
<filter-class>org.jboss.portal.portlet.test.jsp.ControllerFilter</filter-class>
16 years, 4 months
JBoss Portal SVN: r9850 - in tags/JBoss_Portal_2_6_4: wsrp/src/main/org/jboss/portal/test/wsrp/consumer and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-07 20:51:39 -0500 (Thu, 07 Feb 2008)
New Revision: 9850
Modified:
tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java
tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
Log:
- JBPORTAL-1877: ConsumerRegistryService was not properly updated when the producer info id was updated.
Modified: tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-02-08 01:51:33 UTC (rev 9849)
+++ tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-02-08 01:51:39 UTC (rev 9850)
@@ -113,13 +113,20 @@
else
{
consumer = registry.getConsumer(id);
- EndpointConfigurationInfo endpoint = getProducerInfo().getEndpointConfigurationInfo();
- serviceDescription = endpoint.getServiceDescriptionURL();
- markup = endpoint.getMarkupURL();
- portletManagement = endpoint.getPortletManagementURL();
- registration = endpoint.getRegistrationURL();
- wsdl = endpoint.getWsdlDefinitionURL();
- useWSDL = endpoint.usesWSDL();
+ if (consumer != null)
+ {
+ EndpointConfigurationInfo endpoint = getProducerInfo().getEndpointConfigurationInfo();
+ serviceDescription = endpoint.getServiceDescriptionURL();
+ markup = endpoint.getMarkupURL();
+ portletManagement = endpoint.getPortletManagementURL();
+ registration = endpoint.getRegistrationURL();
+ wsdl = endpoint.getWsdlDefinitionURL();
+ useWSDL = endpoint.usesWSDL();
+ }
+ else
+ {
+ beanContext.createErrorMessage("Couldn't find consumer '" + id + "'!");
+ }
}
}
@@ -469,4 +476,4 @@
registrationLocallyModified = isOldAndNewEqual(event.getOldValue(), event.getNewValue());
}
}
-}
\ No newline at end of file
+}
Modified: tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java
===================================================================
--- tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java 2008-02-08 01:51:33 UTC (rev 9849)
+++ tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java 2008-02-08 01:51:39 UTC (rev 9850)
@@ -113,8 +113,22 @@
TransactionAssert.commitTransaction();
}
- public void testPersist()
+ public void testUpdateProducerInfo()
{
-// registry.persistConsumer();
+ // create a foo consumer
+ TransactionAssert.beginTransaction();
+ String id = "foo";
+ WSRPConsumer consumer = registry.createConsumer(id, null);
+ ProducerInfo info = consumer.getProducerInfo();
+ TransactionAssert.commitTransaction();
+
+ TransactionAssert.beginTransaction();
+ // change the id on the consumer's producer info and save it
+ info.setId("bar");
+ registry.updateProducerInfo(info);
+
+ assertNull(registry.getConsumer(id));
+ assertEquals(consumer, registry.getConsumer("bar"));
+ TransactionAssert.commitTransaction();
}
}
Modified: tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
===================================================================
--- tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-02-08 01:51:33 UTC (rev 9849)
+++ tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-02-08 01:51:39 UTC (rev 9850)
@@ -233,7 +233,28 @@
Session session = sessionFactory.getCurrentSession();
try
{
- session.update(producerInfo);
+
+ // Retrieve the previous id of the given ProducerInfo to update local consumers map if needed
+ String oldId = null;
+ ProducerInfo old = (ProducerInfo)session.get(ProducerInfo.class, producerInfo.getKey());
+ if (old != null)
+ {
+ oldId = old.getId();
+ if (producerInfo.getId().equals(oldId))
+ {
+ oldId = null; // reset oldId as the ProducerInfo's id hasn't been modified
+ }
+ }
+
+ // merge old producer info with new data
+ session.merge(producerInfo);
+
+ // if we updated and oldId is not null, we need to update the local consumers map
+ if (oldId != null)
+ {
+ WSRPConsumer consumer = consumers.remove(oldId);
+ consumers.put(producerInfo.getId(), consumer);
+ }
}
catch (HibernateException e)
{
16 years, 4 months