gatein SVN: r8562 - epp/docs/branches/5.2/User_Guide/en-US/modules/account.
by do-not-reply@jboss.org
Author: jaredmorgs
Date: 2012-03-12 00:20:44 -0400 (Mon, 12 Mar 2012)
New Revision: 8562
Modified:
epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml
Log:
Fixed minor spelling mistake in User Guide Captcha section
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml 2012-03-12 04:19:37 UTC (rev 8561)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml 2012-03-12 04:20:44 UTC (rev 8562)
@@ -176,7 +176,7 @@
</para>
<section id="Captcha_Behavior">
<title><remark>BZ#794451 </remark>Captcha Behavior</title>
- <para>You can set whether Captcha is used to verify the an actual person. The Captcha behavior is enabled by default in the Register Account portlet.</para>
+ <para>You can set whether Captcha is used to verify whether an account creation event has been initiated by an actual person. The Captcha behavior is enabled by default in the Register Account portlet.</para>
<task id="task-Set_Register_Account_Capcha_Behavior_1">
<title><remark>BZ#794451 </remark>Task: Disable "Register New Account" Captcha Behavior</title>
<tasksummary>
12 years, 9 months
gatein SVN: r8561 - epp/docs/branches/5.2/Installation_Guide/en-US.
by do-not-reply@jboss.org
Author: jaredmorgs
Date: 2012-03-12 00:19:37 -0400 (Mon, 12 Mar 2012)
New Revision: 8561
Modified:
epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/EMailServiceConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/GadgetProxyConfig.xml
epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml
Log:
https://bugzilla.redhat.com/show_bug.cgi?id=801245 - Converted Gadget Proxy info into task-based format.
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>9</pubsnumber>
+ <pubsnumber>11</pubsnumber>
<abstract>
<para>This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform and its add-ons. It forms part of the complete document suite along with the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
</para>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -3,7 +3,7 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-Reference_Guide-Clustering_Configuration">
+<section id="Clustering_Configuration">
<title>Clustering Configuration</title>
<para>JBoss Enterprise Portal Platform supports high availability and high horizontal and vertical scalability.
The setup instructions have been kept to a minimum, however, a good understanding of clustering services in
@@ -22,7 +22,7 @@
<para>All cluster nodes must be configured to point to the IDM and JCR shared databases. Refer to <xref linkend="sect-Reference_Guide-Database_Configuration"/> for detailed database set up procedures.</para>
</listitem>
</itemizedlist>
- <section id="sect-Reference_Guide-Clustering_Properties">
+ <section id="Clustering_Configure">
<title>Configure</title>
<task>
<title>Task: Configure Clustering Properties</title>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -40,7 +40,6 @@
<title><remark>BZ#794386</remark>Task: Provision JCR and IDM Production Databases</title>
<tasksummary>
<para>Read and understand the guideline steps in this task to prepare production databases for JBoss Enterprise Portal Platform. </para>
- <para/>
</tasksummary>
<taskprerequisites>
<title>Prerequisites</title>
@@ -365,7 +364,7 @@
</procedure>
</task>
</section>
- <section>
+ <section id="First_Run_Database_Schema">
<title>First-run Database Schema Creation</title>
<para>When you start JBoss Enterprise Portal Platform for the first time,
it will create the proper database schema based on the database configuration you specified in <xref linkend="Single_Portal_JCR_IDM"/> or <xref linkend="Multiple_Portal_JRC_IDM"/>.</para>
@@ -373,9 +372,9 @@
<para>JBoss Enterprise Portal Platform assumes the default encoding for your database is
<literal>latin1</literal>.</para>
</note>
- <para>Before starting the server for the first time, continue to <xref linkend="sect-Reference_Guide-EMail_Service_Configuration"/> for the next mandatory configuration requirement.</para>
+ <para>Before starting the server for the first time, continue to <xref linkend="EMail_Service_Configuration"/> for the next mandatory configuration requirement.</para>
</section>
- <section>
+ <section id="MySQL_JCR_IDM_Example">
<title><remark>BZ#794386 and BZ#794687 </remark>MySQL Server 5.1 JCR and IDM Example</title>
<para>This section describes an example how to configure MySQL to work with a single portal container. Refer to <xref linkend="Multiple_Portal_JRC_IDM"/> if you need to configure multiple portal containers in your installation, or intend to use Site Publisher. </para>
<para>More information about setting up other datasources can be found in the JBoss Enterprise Application Platform <citetitle>Getting Started Guide</citetitle>, in the <citetitle>Using Other Databases</citetitle> chapter. </para>
@@ -394,7 +393,7 @@
The <literal>mysql-java-connector</literal> package is available through <ulink url="https://www.redhat.com/wapps/sso/rhn/login.html?redirect=http%3A%2F%2Frhn..." type="http">Red Hat Network</ulink>. </para>
<note>
<title>Note: Database Names</title>
- <para>The configuration examples that follow assume the database names to be <replaceable>gateinjcr</replaceable> and <replaceable>gateinidm</replaceable>. If you change the database names, update the <filename>gatein-ds.xml</filename> datasource descriptor file accordingly (for each server configuration used).
+ <para>The configuration examples assume the database names are <replaceable>gateinjcr</replaceable> and <replaceable>gateinidm</replaceable>. If you change the database names, update the <filename>gatein-ds.xml</filename> datasource descriptor file accordingly (for each server configuration used).
</para>
</note>
</tasksummary>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/EMailServiceConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/EMailServiceConfiguration.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/EMailServiceConfiguration.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -3,7 +3,7 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-Reference_Guide-EMail_Service_Configuration">
+<section id="EMail_Service_Configuration">
<title>E-Mail Service Configuration</title>
<section id="sect-Reference_Guide-EMail_Service_Configuration-Overview">
<title>Overview</title>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/GadgetProxyConfig.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/GadgetProxyConfig.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/GadgetProxyConfig.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -3,31 +3,37 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<section>
- <title>Gadget Proxy Configuration</title>
- <section>
- <title>Overview</title>
- <para>
- Gadget consumption requires a local anonymous proxy to route access to elements used by the gadgets.
+<section id="Gadget_Proxy_Configuration">
+ <title><remark>BZ#801245 </remark>Gadget Proxy Configuration</title>
+ <para>To work around web browser security mechanisms, gadget consumption requires a local anonymous proxy to route access to elements used by the gadgets.
</para>
- <para>
- This must be done to work around web-browser security mechanisms.
- </para>
- </section>
- <section>
- <title>Setup the Filter</title>
- <para>
- The anonymous proxy can be setup to accept or refuse certain hosts.
- </para>
- <para>
+ <para>The anonymous proxy is configured to accept or refuse certain hosts by specifying a white-list (of allowed hosts) and a black-list (of denied hosts).
+
By default, the proxy is closed to any host except the domain on which the gadget server is installed.
</para>
- <para>
- To modify the filtering of domain names, modify: <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/common/common-configuration.xml</filename>
- </para>
- <example>
- <title>common-configuration.xml</title>
- <programlisting language="XML" role="XML"><![CDATA[<component>
+ <task>
+ <title>Task: Specify White-list and Black-list Gadget Proxy Resources</title>
+ <tasksummary>
+ <para>Complete this task to configure the gadget proxy filter to allow a specific list of gadget resources.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You have installed the platform, and performed all configuration tasks up to this task.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Navigate to <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/common/</filename></para>
+ </step>
+ <step>
+ <para>Open <filename>common-configuration.xml</filename> in a text editor.</para>
+ </step>
+ <step>
+ <para>Append the ProxyFilterService <component> block to the file.</para>
+ <programlisting language="XML"><![CDATA[<component>
<key>org.exoplatform.web.security.proxy.ProxyFilterService</key>
<type>org.exoplatform.web.security.proxy.ProxyFilterService</type>
<init-params>
@@ -41,24 +47,34 @@
<value></value>
</values-param>
</init-params>
- </component> ]]>
-</programlisting>
- </example>
- <para>
- The proxy will deny access to a resource that is on the blacklist. If the domain name does not match any of the blacklist, the proxy filter will verify if the domain name is on the white list.
- </para>
- <para>
- If the domain name is not defined in either the white list or black list, access will be denied.
- </para>
- <para>
- Multiple values can be added for each list and wildcards can also be used.
- </para>
- <para>
- Below is an example of a valid configuration:
- </para>
- <example>
- <title>Valid Proxy Configuration</title>
- <programlisting language="XML" role="XML"><![CDATA[<component>
+ </component> ]]></programlisting>
+ </step>
+ <step>
+ <para>In the <markup><name></markup>white-list<markup></name></markup> block, specify the name of the domains you want to grant access to by adding <markup><value></markup> directives for each domain name. </para>
+ <important>
+ <para>A required resource must be explicitly defined in the white-list. Failure to do so will result in the resource being treated as black-listed.</para>
+ </important>
+ <para>Wildcard characters can be used to simplify configuration. For example, <literal>*.example.com</literal> would allow all domains with <literal>example.com</literal> as the suffix.</para>
+ </step>
+ <step>
+ <para>In the <markup><name></markup>black-list<markup></name></markup> block, specify the name of the domains you want to deny access to by adding <markup><value></markup> directives for each domain name. </para>
+ <para>Wildcard characters can be used to simplify configuration. For example, <literal>*.example.com</literal> would deny all domains with <literal>example.com</literal> as the suffix.</para>
+ </step>
+ <step>
+ <para>Save and close <filename>common-configuration.xml</filename>.</para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>You have specified the gadget domains required in your installation.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ <taskrelated>
+ <title>Related Information</title>
+ <example>
+ <title>Valid Proxy Configuration</title>
+ <programlisting language="XML" role="XML"><![CDATA[<component>
<key>org.exoplatform.web.security.proxy.ProxyFilterService</key>
<type>org.exoplatform.web.security.proxy.ProxyFilterService</type>
<init-params>
@@ -66,15 +82,15 @@
<!-- The white list -->
<name>white-list</name>
<value>*.example.com</value>
- <value>www.example.net</value>
+ <value>www.example.net</value>
</values-param>
<values-param>
<name>black-list</name>
- <value>evil.example.com</value>
+ <value>forbidden.example.com</value>
</values-param>
</init-params>
- </component> ]]>
-</programlisting>
- </example>
- </section>
+</component>]]></programlisting>
+ </example>
+ </taskrelated>
+ </task>
</section>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -3,7 +3,7 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-Installation_Guide-HTTPS_Configuration">
+<section id="HTTPS_Configuration">
<title><remark>BZ#794440 </remark>HTTPS Configuration</title>
<remark>https://bugzilla.redhat.com/show_bug.cgi?id=794440 - 20120221 - Reworked the entire section to cover keystore and truststore configuration specific to EPP. </remark>
<para>JBoss Enterprise Portal Platform runs by default in HTTP mode. For security purposes, configure your production platform to run in HTTPS mode. </para>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -4,7 +4,7 @@
JBPAPP-4551 - WS CXF Installation
-->
-<chapter id="Installation_With_ZIP_Download">
+<chapter id="Platform_Installation_ZIP">
<title>ZIP Installation from the Red Hat Customer Portal</title>
<para>The Red Hat Customer Portal at <ulink url="http://access.redhat.com">http://access.redhat.com</ulink>
provides access to the value of the Red Hat Subscription, including knowledge base articles, support case management,
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -95,7 +95,7 @@
</para>
</listitem>
</itemizedlist>
- <section>
+ <section id="Native_Components_RHEL">
<title>Red Hat Enterprise Linux-specific notes</title>
<para>
Red Hat Enterprise Linux includes some of the Native Components in the base operating system.
@@ -111,7 +111,7 @@
/opt/user/jboss-epp-<replaceable>VERSION</replaceable>/native/lib.
</programlisting>
</section>
- <section>
+ <section id="Native_Components_Solaris">
<title>Solaris-specific notes</title>
<para>
Both the 32-bit and 64-bit versions of <filename>jboss-ep-native</filename> can be installed on the same
@@ -195,7 +195,7 @@
</step>
<step>
<para>Click the
- <filename>JBoss EAP <replaceable>VERSION</replaceable> Native Components for <replaceable>OPERATING_SYSTEM</replaceable><replaceable> OS_ARCHITECTURE</replaceable> </filename>
+ <filename>JBoss EAP <replaceable>VERSION</replaceable> Native Components for <replaceable>OPERATING_SYSTEM</replaceable><replaceable> OS_ARCHITECTURE</replaceable></filename>
download link that corresponds with your native operating system.</para>
</step>
<step>
@@ -238,7 +238,7 @@
<formalpara>
<title>Result</title>
<para>You have installed the native components into the correct directory. </para>
- </formalpara>
+ </formalpara>
</step>
</procedure>
<taskrelated>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -5,7 +5,7 @@
]>
<chapter id="Post_Installation_Configuration">
<title>Post Installation Configuration</title>
- <section id="server-config-differences">
+ <section id="Choose_a_Server_Profile">
<title>Choose a Server Profile</title>
<para>The server profiles shipped with the platform include: <literal>minimal</literal>, <literal>default</literal>, <literal>production</literal>, <literal>all</literal>, <literal>standard</literal> and <literal>web</literal>.
</para>
@@ -80,7 +80,7 @@
<programlisting>-Xms1303m -Xmx1303m -XX:MaxPermSize=256m ....</programlisting>
</para>
</section>
- <section id="Post-Installation">
+ <section id="Configure_Security">
<title>Configure Security </title>
<para>
When installed from the zip archive, authentication is required to access the majority of JBoss services, including administrative services. User accounts have not been set up to eliminate the possibility of default username/password based attacks.
@@ -101,7 +101,7 @@
</listitem>
</itemizedlist>
</section>
- <section id="Disabling_Authentication">
+ <section id="Disable_Authentication">
<title>Disable Authentication</title>
<para>The JBoss Enterprise Application Platform <citetitle>Installation Guide</citetitle> features a comprehensive chapter about <citetitle>Disabling Authentication</citetitle>. Refer to this chapter for the guidance on the following configuration tasks:</para>
<itemizedlist>
@@ -119,7 +119,7 @@
</listitem>
</itemizedlist>
</section>
- <section>
+ <section id="Disable_Pre-Configured_Accounts">
<title>Disable Pre-configured Accounts</title>
<para>
JBoss Enterprise Portal Platform includes four pre-configured user accounts for testing and evaluation purposes. These accounts can be used for direct access to the portal.
@@ -164,7 +164,7 @@
<step>
<formalpara>
<title>Result</title>
- <para>The login links on the front page of the portal main screen are not displayed, and the accounts are not available for use.
+ <para>The login links on the front page of the portal main screen will not display, and the accounts are not available for use.
</para>
</formalpara>
</step>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-11</revnumber>
+ <date>Mon Mar 12 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Reworked Gadget Proxy Configuration section as part of https://bugzilla.redhat.com/show_bug.cgi?id=801245. Added id attributes to all sections so it looks better when displayed online.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-9</revnumber>
<date>Wed Mar 7 2012</date>
<author>
@@ -18,8 +32,8 @@
</author>
<revdescription>
<simplelist>
+ <member>Updated Clustering section to be task based as part of https://bugzilla.redhat.com/show_bug.cgi?id=801244. Also added cluster start-up instructions to the Test Your Installation section, and further improved the related task in this section.</member>
<member>Removed $JBOSS_HOME section as part of https://bugzilla.redhat.com/show_bug.cgi?id=801248. </member>
- <member>Updated Clustering section to be task based as part of https://bugzilla.redhat.com/show_bug.cgi?id=801244. Also added cluster start-up instructions to the Test Your Installation section, and further improved the related task in this section.</member>
</simplelist>
</revdescription>
</revision>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -22,7 +22,7 @@
If you do not already have a subscription to JBoss Enterprise Portal Platform, you will need to obtain one in addition to your Site Publisher subscription in order to install and run Site Publisher.
</para>
</note>
- <section id="sect-Site_Publisher_Installation_Guide-Installing_Site_Publisher-Configuration_Locations">
+ <section id="Site_Publisher_Configuration_Locations">
<title>Configuration Locations</title>
<para>Site Publisher requires configuration files to be copied to the configuration location of the clean JBoss Enterprise Portal Platform instance.
</para>
@@ -61,7 +61,7 @@
<para>If you intend using a custom configuration profile, copy the files into the corresponding location of your profile.
</para>
</section>
- <section>
+ <section id="Site_Publisher_Install">
<title>Install</title>
<para>Read this section to learn the steps required to install Site Publisher.</para>
<task>
@@ -76,7 +76,7 @@
<para>Complete <xref linkend="task-Install_The_Platform"/> </para>
</listitem>
<listitem>
- <para>You understand the available Site Publisher configuration locations as described in <xref linkend="sect-Site_Publisher_Installation_Guide-Installing_Site_Publisher-Configuration_Locations"/>.</para>
+ <para>You understand the available Site Publisher configuration locations as described in <xref linkend="Site_Publisher_Configuration_Locations"/>.</para>
</listitem>
</itemizedlist>
</taskprerequisites>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<chapter id="Test_your_Installation">
- <title><remark>BZ#794687 and BZ#801244</remark>Test your Installation</title>
+ <title><remark>BZ#794687 and BZ#801244 </remark>Test your Installation</title>
<para>After you have installed JBoss Enterprise Portal Platform and completed the relevant post installation configuration steps, verify your configuration is correct by starting the platform.
</para>
<remark>BZ#801244 - 20120309 - Refined task information to include note about sybase startup commands, cluster URL, portal screens dependent on add-ons. One task to cover all start up scenarios.</remark>
@@ -17,7 +17,7 @@
<title>Prerequisites</title>
<itemizedlist>
<listitem>
- <para>Complete all tasks in <xref linkend="Installation_With_ZIP_Download"/>.</para>
+ <para>Complete all tasks in <xref linkend="Platform_Installation_ZIP"/>.</para>
</listitem>
<listitem>
<para>Complete all tasks in <xref linkend="Site_Publisher_Installation"/>, if you intend running Site Publisher.</para>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-03-10 10:25:18 UTC (rev 8560)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-03-12 04:19:37 UTC (rev 8561)
@@ -13,7 +13,7 @@
<title>Prerequisites</title>
<itemizedlist>
<listitem>
- <para>A JBoss Enterprise Portal Platform instance, originally installed using the <xref linkend="Installation_With_ZIP_Download"/> method.</para>
+ <para>A JBoss Enterprise Portal Platform instance, originally installed using the <xref linkend="Platform_Installation_ZIP"/> method.</para>
</listitem>
</itemizedlist>
</taskprerequisites>
12 years, 9 months
gatein SVN: r8560 - in components/wsrp/trunk/admin-gui/src/main/webapp: jsf/consumers and 5 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-10 05:25:18 -0500 (Sat, 10 Mar 2012)
New Revision: 8560
Removed:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
Log:
- GTNWSRP-278: Simplified button styles to improve compatibility with browsers.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -63,11 +63,6 @@
<param-value>server</param-value>
</context-param>
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tags/webui.taglib.xml</param-value>
- </context-param>
-
<servlet>
<servlet-name>FacesServlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -51,45 +51,12 @@
<p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p>
<h:form id="confirm-delete-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}"
- value="#{i18n.confirm_delete_consumer_submit}">
- <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}"
- value="#{i18n.confirm_delete_consumer_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
-
- <ui:remove><webui:commandButton id="destroy-link"
- action="destroyConsumer"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_submit}">
+ <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_consumer_submit}">
<f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
- </webui:commandButton>
-
- <webui:commandButton id="cancel-link"
- action="listConsumers"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_cancel}"/></ui:remove>
+ </h:commandLink>
+ <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_consumer_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -51,38 +51,10 @@
<p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p>
<h:form id="confirm-erase-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}"
- value="#{i18n.confirm_delete_registration_submit}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel" action="#{consumer.cancel}"
- value="#{i18n.confirm_delete_registration_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
- <ui:remove><webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}"
- action="eraseLocalRegistration"
- backingBean="#{consumer}"/>
-
- <webui:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}"
- backingBean="#{consumer}"
- action="cancel"/></ui:remove>
+ <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_registration_submit}"/>
+ <h:commandLink id="cancel" action="#{consumer.cancel}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_registration_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -71,51 +71,31 @@
<ui:define name="objectpath">
- <webui:blueHeaderBar>
- <div class="full-width">
- <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}">
- <div class="float-left half-width">
- <!-- Consumer creation -->
- <div class="create-container">
- <h:form id="createConsumer" styleClass="createObjectForm">
- <span class="portlet-font bold">#{i18n.consumers_create_title}</span> 
- <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"
- styleClass="portlet-form-input-field"
- label="Consumer Name" required="true"/>  
-
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="createConsumerButton"
- action="#{consumersMgr.createConsumer}"
- value="#{i18n.consumers_create_submit}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </h:form>
- </div>
- </div>
- </f:subview>
- <c:if test="#{empty showAddConsumer}">
- <strong>
- <h:outputFormat value="#{i18n.path_consumers_consumer}">
- <f:param value="#{consumer.id}"/>
- </h:outputFormat>
- </strong>
+ <div class="bar">
+ <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}">
+ <h:form id="createConsumer" styleClass="createObjectForm">
+ <span class="portlet-font bold">#{i18n.consumers_create_title}</span> 
+ <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"
+ styleClass="portlet-form-input-field"
+ label="Consumer Name" required="true"/>  
+ <h:commandButton id="createConsumerButton" styleClass="ActionButton"
+ action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}"/>
+ </h:form>
+ </f:subview>
+ <c:if test="#{empty showAddConsumer}">
+ <strong>
+ <h:outputFormat value="#{i18n.path_consumers_consumer}">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
+ </strong>
<span
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} swatch">
#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}
#{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
</span>
- </c:if>
- </div>
- </webui:blueHeaderBar>
+ </c:if>
+ </div>
</ui:define>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -107,20 +107,8 @@
</h:form>
<h:form>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="reloadConsumersButton" action="#{consumersMgr.reload}"
- value="#{i18n.consumers_table_reload}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="reloadConsumersButton" action="#{consumersMgr.reload}" styleClass="ActionButton"
+ value="#{i18n.consumers_table_reload}"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -112,53 +112,19 @@
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cons-update-link" action="#{consumer.update}"
- value="#{i18n.edit_consumer_registration_update_props}"
- rendered="#{consumer.registered}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="modify-reg-link"
- action="#{consumer.modifyRegistration}"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"
- rendered="#{consumer.registrationLocallyModified}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
- <ui:remove><webui:commandButton action="update"
- backingBean="#{consumer}"
- id="cons-update-link"
- value="#{i18n.edit_consumer_registration_update_props}"
- rendered="registered"/></ui:remove>
+ <h:commandLink id="cons-update-link" action="#{consumer.update}" styleClass="ActionButton"
+ value="#{i18n.edit_consumer_registration_update_props}"
+ rendered="#{consumer.registered}"/>
+ <h:commandLink id="modify-reg-link"
+ action="#{consumer.modifyRegistration}"
+ value="#{i18n.edit_consumer_registration_modify}"
+ title="#{i18n.edit_consumer_registration_modify_title}"
+ rendered="#{consumer.registrationLocallyModified}"/>
</c:when>
<c:otherwise>
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <ui:remove>
- <webui:commandButton action="modifyRegistration"
- backingBean="#{consumer}"
- id="modify-reg-link"
- rendered="registrationLocallyModified"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"/>
- </ui:remove>
<br style="clear:both;"/>
</h:panelGroup>
@@ -198,28 +164,10 @@
</c:otherwise>
</c:choose>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="edit-reg-link"
- action="#{consumer.modifyRegistration}"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton action="modifyRegistration"
- backingBean="#{consumer}"
- id="edit-reg-link"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"/></ui:remove>
-
+ <h:commandLink id="edit-reg-link" styleClass="ActionButton"
+ action="#{consumer.modifyRegistration}"
+ value="#{i18n.edit_consumer_registration_modify}"
+ title="#{i18n.edit_consumer_registration_modify_title}"/>
<br style="clear:both;"/>
</h:panelGroup>
</c:if>
@@ -234,26 +182,9 @@
#{i18n.edit_consumer_registration_context_handle}
<h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="erase-cons-link" action="confirmEraseRegistration"
- value="#{i18n.edit_consumer_registration_context_erase}"
- title="#{i18n.edit_consumer_registration_context_erase_title}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="erase-cons-link" action="confirmEraseRegistration"
- backingBean="#{consumer}"
- value="#{i18n.edit_consumer_registration_context_erase}"
- title="#{i18n.edit_consumer_registration_context_erase_title}"/></ui:remove>
-
+ <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" styleClass="ActionButton"
+ value="#{i18n.edit_consumer_registration_context_erase}"
+ title="#{i18n.edit_consumer_registration_context_erase_title}"/>
</td>
</tr>
</c:if>
@@ -261,61 +192,25 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="export-cons-link" action="#{consumersMgr.exportPortlets}"
- actionListener="#{consumersMgr.selectConsumer}"
- rendered="#{consumer.importExportSupported}"
- value="#{i18n.edit_consumer_export}"
- title="#{i18n.edit_consumer_export_title}">
- <f:param name="id" value="#{consumer.id}"/>
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="import-cons-link" action="#{consumersMgr.importPortlets}"
- actionListener="#{consumersMgr.selectConsumer}"
- rendered="#{consumer.importExportSupported and ! consumer.availableExportInfosEmpty}"
- value="#{i18n.edit_consumer_import}"
- title="#{i18n.edit_consumer_import_title}">
- <f:param name="id" value="#{consumer.id}"/>
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}"
- value="#{i18n.edit_consumer_refresh}"
- title="#{i18n.edit_consumer_refresh_title}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" immediate="true"
- value="#{i18n.edit_consumer_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandLink id="export-cons-link" action="#{consumersMgr.exportPortlets}" styleClass="ActionButton"
+ actionListener="#{consumersMgr.selectConsumer}"
+ rendered="#{consumer.importExportSupported}"
+ value="#{i18n.edit_consumer_export}"
+ title="#{i18n.edit_consumer_export_title}">
+ <f:param name="id" value="#{consumer.id}"/>
+ </h:commandLink>
+ <h:commandLink id="import-cons-link" action="#{consumersMgr.importPortlets}" styleClass="ActionButton"
+ actionListener="#{consumersMgr.selectConsumer}"
+ rendered="#{consumer.importExportSupported and ! consumer.availableExportInfosEmpty}"
+ value="#{i18n.edit_consumer_import}"
+ title="#{i18n.edit_consumer_import_title}">
+ <f:param name="id" value="#{consumer.id}"/>
+ </h:commandLink>
+ <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}"
+ value="#{i18n.edit_consumer_refresh}"
+ title="#{i18n.edit_consumer_refresh_title}" styleClass="ActionButton"/>
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" immediate="true"
+ value="#{i18n.edit_consumer_cancel}" styleClass="ActionButton"/>
</td>
</tr>
</table>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -50,43 +50,10 @@
<p class="portlet-class">#{i18n.confirm_detete_export_proceed}</p>
<h:form id="confirm-delete-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="destroy-link" action="#{consumer.deleteExport}"
- value="#{i18n.confirm_delete_export_submit}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-link" action="exports"
- value="#{i18n.confirm_delete_export_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
-
- <ui:remove><webui:commandButton id="destroy-link"
- action="destroyConsumer"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_submit}">
- <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
- </webui:commandButton>
-
- <webui:commandButton id="cancel-link"
- action="listConsumers"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_cancel}"/></ui:remove>
+ <h:commandLink id="destroy-link" action="#{consumer.deleteExport}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_export_submit}"/>
+ <h:commandLink id="cancel-link" action="exports" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_export_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -45,42 +45,14 @@
#{portlet.handle}
</h:column>
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="exportButton" action="#{consumer.exportPortlets}"
- value="#{i18n.portlets_table_export}"
- disabled="#{! consumer.readyForExport}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure">
- <f:param name="id" value="#{consumer.id}"/>
- #{i18n.portlets_table_configure}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="exportButton" action="#{consumer.exportPortlets}" styleClass="ActionButton"
+ value="#{i18n.portlets_table_export}"
+ disabled="#{! consumer.readyForExport}"/>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton">
+ <f:param name="id" value="#{consumer.id}"/>
+ #{i18n.portlets_table_configure}
+ </h:commandLink>
+ <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -75,39 +75,11 @@
</table>
<h:form id="exportDetail-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="import" id="use">
- #{i18n.exports_actions_use}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="exports" action="exports" value="#{i18n.export_detail_exports}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandLink action="import" id="use" styleClass="ActionButton">
+ #{i18n.exports_actions_use}
+ </h:commandLink>
+ <h:commandButton id="exports" action="exports" value="#{i18n.export_detail_exports}" styleClass="ActionButton"/>
+ <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -65,31 +65,11 @@
</h:commandLink>
</h:column>
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure">
- <f:param name="id" value="#{consumer.id}"/>
- #{i18n.portlets_table_configure}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton">
+ <f:param name="id" value="#{consumer.id}"/>
+ #{i18n.portlets_table_configure}
+ </h:commandLink>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -60,41 +60,13 @@
</h:column>
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="import" action="#{consumer.importPortlets}" disabled="#{!consumer.currentExport.readyForImport}"
- value="#{i18n.import_import}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure">
- <f:param name="id" value="#{consumer.id}"/>
- #{i18n.portlets_table_configure}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="exports" action="exports" value="#{i18n.export_detail_exports}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="import" action="#{consumer.importPortlets}" disabled="#{!consumer.currentExport.readyForImport}"
+ value="#{i18n.import_import}" styleClass="ActionButton"/>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton">
+ <f:param name="id" value="#{consumer.id}"/>
+ #{i18n.portlets_table_configure}
+ </h:commandLink>
+ <h:commandLink id="exports" action="exports" value="#{i18n.export_detail_exports}" styleClass="ActionButton"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -51,37 +51,10 @@
<p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p>
<h:form id="confirm-prop-del-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}"
- value="#{i18n.confirm_delete_reg_property_submit}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-delete" action="#{producer.cancel}"
- value="#{i18n.confirm_delete_reg_property_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}"
- action="deleteRegistrationProperty"
- backingBean="#{producer}"/>
-
- <webui:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}"
- backingBean="#{producer}"
- action="cancel"/></ui:remove>
+ <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_reg_property_submit}"/>
+ <h:commandLink id="cancel-delete" action="#{producer.cancel}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_reg_property_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -26,7 +26,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:webui="http://jboss.org/gatein">
+ xmlns:div="http://jboss.org/gatein">
<ui:param name="title" value="#{i18n.producer_config_title}"/>
@@ -72,38 +72,14 @@
<h:outputText value=" " rendered="#{producer.registrationRequired}"/>
<f:subview id="producer-registration" rendered="#{producer.registrationRequired}">
- <webui:blueHeaderBar>
- <div class="full-width float-left bold">
- #{i18n.producer_config_reg_props}
- <div class="add-prop-container">
- <div class="add-prop-button">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="add-reg-prop"
- action="#{producer.addRegistrationProperty}"
- value="#{i18n.producer_config_add_reg_prop}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="add-reg-prop" action="addRegistrationProperty"
- backingBean="#{producer}"
- value="#{i18n.producer_config_add_reg_prop}"/>
- </ui:remove>
- </div>
- </div>
- </div>
+ <div class="bar">
+ <h:outputText value="#{i18n.producer_config_reg_props}" style="font-weight: bold; margin-right: .3em;"/>
+ <h:commandLink id="add-reg-prop" styleClass="ActionButton"
+ action="#{producer.addRegistrationProperty}"
+ value="#{i18n.producer_config_add_reg_prop}"/>
+ </div>
- </webui:blueHeaderBar>
-
-
<f:subview rendered="#{!producer.registrationPropertiesEmpty}" id="reg-props">
<h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property"
rendered="#{producer.registrationRequired}"
@@ -148,38 +124,8 @@
<h:outputText value=" "/>
<h:panelGroup styleClass="portlet-section-buttonrow">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="reg-save" action="#{producer.save}"
- value="#{i18n.producer_config_save}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="reg-reload" action="#{producer.reloadConfiguration}"
- value="#{i18n.producer_config_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="reg-save" action="save"
- backingBean="#{producer}"
- value="#{i18n.producer_config_save}"/>
-
- <webui:commandButton id="reg-reload" action="reloadConfiguration"
- backingBean="#{producer}"
- value="#{i18n.producer_config_cancel}"/></ui:remove>
-
+ <h:commandButton id="reg-save" action="#{producer.save}" styleClass="ActionButton" value="#{i18n.producer_config_save}"/>
+ <h:commandButton id="reg-reload" action="#{producer.reloadConfiguration}" styleClass="ActionButton" value="#{i18n.producer_config_cancel}"/>
</h:panelGroup>
</h:panelGrid>
</h:form>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -21,16 +21,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-.UIWsrpPortlet .UIControlBar {
-/*background: url('background/ControlIcon.gif') repeat-x center -222px;*/
-/*border: 1px solid #b7b7b7;*/
-/*height: 23px;*/
- line-height: 28px;
- padding: 4px 10px 0 0; /*margin: 5px 0px;*/
- font-weight: bold;
- text-align: right;
-}
-
/***************************** Consumer Form Style ************************/
.UIWsrpPortlet .cons-temp-form,
@@ -40,6 +30,7 @@
.UIWsrpPortlet .UIGrid {
border: 1px solid #B7B7B7;
+ margin-bottom: 0.3em;
}
.UIWsrpPortlet .ConsumerGrid thead tr th,
@@ -56,25 +47,6 @@
color: darkblue;
}
-.UIWsrpPortlet .create-container .ActionContainer {
- position: absolute;
- margin: 7px 0 0 0;
-}
-
-/***************************** Producer Form Style ************************/
-
-.UIWsrpPortlet .add-prop-container {
- position: relative;
- display: inline
-}
-
-.UIWsrpPortlet .add-prop-button {
- position: absolute;
- top: -5px;
- left: 10px;
- font-weight: normal
-}
-
/***************************** Messages Style ************************/
.portlet-msg-success {
@@ -101,36 +73,6 @@
font-weight: bold;
}
-/***************************** ActionButton Style ************************/
-.UIWsrpPortlet .ActionContainer {
- width: auto;
- display: inline; /*margin: auto;*/
-}
-
-.UIWsrpPortlet .ButtonLeft {
- background: url('background/LightBlueStyle.gif') no-repeat left top;
- padding: 0px 0px 0px 3px;
-}
-
-.UIWsrpPortlet .ButtonRight {
- background: url('background/LightBlueStyle.gif') no-repeat right top;
- padding: 0px 3px 0px 0px;
-}
-
-.UIWsrpPortlet .ButtonMiddle {
- line-height: 22px;
- text-align: center;
- background: url('background/LightBlueStyle.gif') repeat-x bottom;
- white-space: nowrap;
- display: table-cell;
- padding: 0px 12px;
-}
-
-.UIWsrpPortlet .ButtonMiddle input {
- background: transparent;
- border: none;
-}
-
/***************************** GrayTabStyle ************************/
.UIWsrpPortlet .TabsActionContainer {
@@ -196,3 +138,29 @@
.UIWsrpPortlet .tab-blank {
border-bottom: 1px solid #B7B7B7;
}
+
+.UIWsrpPortlet .ActionButton {
+ line-height: 19px;
+ text-align: center;
+ background: url('background/LightBlueStyle.gif') repeat-x center;
+ white-space: nowrap;
+ padding: 0 12px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ border: 1px solid #8A8A8A;
+ border-bottom: 1px solid #5D5D5D;
+ display: inline-block;
+ margin: 0;
+ cursor: pointer;
+}
+
+.UIWsrpPortlet .bar {
+ padding: .4em;
+ margin: 0 0 0.3em 0;
+ border: 1px solid #B7B7B7;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ background: #eee;
+}
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
===================================================================
(Binary files differ)
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2012-03-10 10:15:30 UTC (rev 8559)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2012-03-10 10:25:18 UTC (rev 8560)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -21,8 +21,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-@import url(basestyles.css);
-
.wsrp-consumers-ui {
padding: 10px;
}
@@ -424,5 +422,6 @@
background-color: #ffa200;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
+ border-radius: 6px;
padding: .5em;
}
\ No newline at end of file
12 years, 9 months
gatein SVN: r8559 - in components/wsrp/branches/2.1.x/admin-gui/src/main/webapp: jsf/consumers and 5 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-10 05:15:30 -0500 (Sat, 10 Mar 2012)
New Revision: 8559
Removed:
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/tags/
Modified:
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css
Log:
- GTNWSRP-278: Simplified button styles to improve compatibility with browsers.
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -63,11 +63,6 @@
<param-value>server</param-value>
</context-param>
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tags/webui.taglib.xml</param-value>
- </context-param>
-
<servlet>
<servlet-name>FacesServlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -51,45 +51,12 @@
<p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p>
<h:form id="confirm-delete-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}"
- value="#{i18n.confirm_delete_consumer_submit}">
- <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}"
- value="#{i18n.confirm_delete_consumer_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
-
- <ui:remove><webui:commandButton id="destroy-link"
- action="destroyConsumer"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_submit}">
+ <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_consumer_submit}">
<f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
- </webui:commandButton>
-
- <webui:commandButton id="cancel-link"
- action="listConsumers"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_cancel}"/></ui:remove>
+ </h:commandLink>
+ <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_consumer_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -51,38 +51,10 @@
<p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p>
<h:form id="confirm-erase-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}"
- value="#{i18n.confirm_delete_registration_submit}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel" action="#{consumer.cancel}"
- value="#{i18n.confirm_delete_registration_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
- <ui:remove><webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}"
- action="eraseLocalRegistration"
- backingBean="#{consumer}"/>
-
- <webui:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}"
- backingBean="#{consumer}"
- action="cancel"/></ui:remove>
+ <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_registration_submit}"/>
+ <h:commandLink id="cancel" action="#{consumer.cancel}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_registration_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -71,51 +71,31 @@
<ui:define name="objectpath">
- <webui:blueHeaderBar>
- <div class="full-width">
- <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}">
- <div class="float-left half-width">
- <!-- Consumer creation -->
- <div class="create-container">
- <h:form id="createConsumer" styleClass="createObjectForm">
- <span class="portlet-font bold">#{i18n.consumers_create_title}</span> 
- <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"
- styleClass="portlet-form-input-field"
- label="Consumer Name" required="true"/>  
-
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="createConsumerButton"
- action="#{consumersMgr.createConsumer}"
- value="#{i18n.consumers_create_submit}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </h:form>
- </div>
- </div>
- </f:subview>
- <c:if test="#{empty showAddConsumer}">
- <strong>
- <h:outputFormat value="#{i18n.path_consumers_consumer}">
- <f:param value="#{consumer.id}"/>
- </h:outputFormat>
- </strong>
+ <div class="bar">
+ <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}">
+ <h:form id="createConsumer" styleClass="createObjectForm">
+ <span class="portlet-font bold">#{i18n.consumers_create_title}</span> 
+ <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"
+ styleClass="portlet-form-input-field"
+ label="Consumer Name" required="true"/>  
+ <h:commandButton id="createConsumerButton" styleClass="ActionButton"
+ action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}"/>
+ </h:form>
+ </f:subview>
+ <c:if test="#{empty showAddConsumer}">
+ <strong>
+ <h:outputFormat value="#{i18n.path_consumers_consumer}">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
+ </strong>
<span
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} swatch">
#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}
#{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
</span>
- </c:if>
- </div>
- </webui:blueHeaderBar>
+ </c:if>
+ </div>
</ui:define>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -107,20 +107,8 @@
</h:form>
<h:form>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="reloadConsumersButton" action="#{consumersMgr.reload}"
- value="#{i18n.consumers_table_reload}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="reloadConsumersButton" action="#{consumersMgr.reload}" styleClass="ActionButton"
+ value="#{i18n.consumers_table_reload}"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -112,53 +112,19 @@
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cons-update-link" action="#{consumer.update}"
- value="#{i18n.edit_consumer_registration_update_props}"
- rendered="#{consumer.registered}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="modify-reg-link"
- action="#{consumer.modifyRegistration}"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"
- rendered="#{consumer.registrationLocallyModified}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
- <ui:remove><webui:commandButton action="update"
- backingBean="#{consumer}"
- id="cons-update-link"
- value="#{i18n.edit_consumer_registration_update_props}"
- rendered="registered"/></ui:remove>
+ <h:commandLink id="cons-update-link" action="#{consumer.update}"
+ value="#{i18n.edit_consumer_registration_update_props}"
+ rendered="#{consumer.registered}" styleClass="ActionButton"/>
+ <h:commandLink id="modify-reg-link" styleClass="ActionButton"
+ action="#{consumer.modifyRegistration}"
+ value="#{i18n.edit_consumer_registration_modify}"
+ title="#{i18n.edit_consumer_registration_modify_title}"
+ rendered="#{consumer.registrationLocallyModified}"/>
</c:when>
<c:otherwise>
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <ui:remove>
- <webui:commandButton action="modifyRegistration"
- backingBean="#{consumer}"
- id="modify-reg-link"
- rendered="registrationLocallyModified"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"/>
- </ui:remove>
<br style="clear:both;"/>
</h:panelGroup>
@@ -198,28 +164,10 @@
</c:otherwise>
</c:choose>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="edit-reg-link"
- action="#{consumer.modifyRegistration}"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton action="modifyRegistration"
- backingBean="#{consumer}"
- id="edit-reg-link"
- value="#{i18n.edit_consumer_registration_modify}"
- title="#{i18n.edit_consumer_registration_modify_title}"/></ui:remove>
-
+ <h:commandLink id="edit-reg-link" styleClass="ActionButton"
+ action="#{consumer.modifyRegistration}"
+ value="#{i18n.edit_consumer_registration_modify}"
+ title="#{i18n.edit_consumer_registration_modify_title}"/>
<br style="clear:both;"/>
</h:panelGroup>
</c:if>
@@ -234,26 +182,9 @@
#{i18n.edit_consumer_registration_context_handle}
<h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="erase-cons-link" action="confirmEraseRegistration"
- value="#{i18n.edit_consumer_registration_context_erase}"
- title="#{i18n.edit_consumer_registration_context_erase_title}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="erase-cons-link" action="confirmEraseRegistration"
- backingBean="#{consumer}"
- value="#{i18n.edit_consumer_registration_context_erase}"
- title="#{i18n.edit_consumer_registration_context_erase_title}"/></ui:remove>
-
+ <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" styleClass="ActionButton"
+ value="#{i18n.edit_consumer_registration_context_erase}"
+ title="#{i18n.edit_consumer_registration_context_erase_title}"/>
</td>
</tr>
</c:if>
@@ -261,61 +192,25 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="export-cons-link" action="#{consumersMgr.exportPortlets}"
- actionListener="#{consumersMgr.selectConsumer}"
- rendered="#{consumer.supportsExport}"
- value="#{i18n.edit_consumer_export}"
- title="#{i18n.edit_consumer_export_title}">
- <f:param name="id" value="#{consumer.id}"/>
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="import-cons-link" action="#{consumersMgr.importPortlets}"
- actionListener="#{consumersMgr.selectConsumer}"
- rendered="#{consumer.supportsExport and ! consumer.availableExportInfosEmpty}"
- value="#{i18n.edit_consumer_import}"
- title="#{i18n.edit_consumer_import_title}">
- <f:param name="id" value="#{consumer.id}"/>
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}"
- value="#{i18n.edit_consumer_refresh}"
- title="#{i18n.edit_consumer_refresh_title}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" immediate="true"
- value="#{i18n.edit_consumer_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandLink id="export-cons-link" action="#{consumersMgr.exportPortlets}" styleClass="ActionButton"
+ actionListener="#{consumersMgr.selectConsumer}"
+ rendered="#{consumer.supportsExport}"
+ value="#{i18n.edit_consumer_export}"
+ title="#{i18n.edit_consumer_export_title}">
+ <f:param name="id" value="#{consumer.id}"/>
+ </h:commandLink>
+ <h:commandLink id="import-cons-link" action="#{consumersMgr.importPortlets}" styleClass="ActionButton"
+ actionListener="#{consumersMgr.selectConsumer}"
+ rendered="#{consumer.supportsExport and ! consumer.availableExportInfosEmpty}"
+ value="#{i18n.edit_consumer_import}"
+ title="#{i18n.edit_consumer_import_title}">
+ <f:param name="id" value="#{consumer.id}"/>
+ </h:commandLink>
+ <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}"
+ value="#{i18n.edit_consumer_refresh}"
+ title="#{i18n.edit_consumer_refresh_title}" styleClass="ActionButton"/>
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" immediate="true"
+ value="#{i18n.edit_consumer_cancel}" styleClass="ActionButton"/>
</td>
</tr>
</table>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -50,43 +50,10 @@
<p class="portlet-class">#{i18n.confirm_detete_export_proceed}</p>
<h:form id="confirm-delete-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="destroy-link" action="#{consumer.deleteExport}"
- value="#{i18n.confirm_delete_export_submit}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-link" action="exports"
- value="#{i18n.confirm_delete_export_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
-
- <ui:remove><webui:commandButton id="destroy-link"
- action="destroyConsumer"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_submit}">
- <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
- </webui:commandButton>
-
- <webui:commandButton id="cancel-link"
- action="listConsumers"
- backingBean="#{consumersMgr}"
- value="#{i18n.confirm_delete_consumer_cancel}"/></ui:remove>
+ <h:commandLink id="destroy-link" action="#{consumer.deleteExport}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_export_submit}"/>
+ <h:commandLink id="cancel-link" action="exports" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_export_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -45,42 +45,14 @@
#{portlet.handle}
</h:column>
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="exportButton" action="#{consumer.exportPortlets}"
- value="#{i18n.portlets_table_export}"
- disabled="#{! consumer.readyForExport}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure">
- <f:param name="id" value="#{consumer.id}"/>
- #{i18n.portlets_table_configure}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="exportButton" action="#{consumer.exportPortlets}" styleClass="ActionButton"
+ value="#{i18n.portlets_table_export}"
+ disabled="#{! consumer.readyForExport}"/>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton">
+ <f:param name="id" value="#{consumer.id}"/>
+ #{i18n.portlets_table_configure}
+ </h:commandLink>
+ <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -75,39 +75,11 @@
</table>
<h:form id="exportDetail-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="import" id="use">
- #{i18n.exports_actions_use}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="exports" action="exports" value="#{i18n.export_detail_exports}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandLink action="import" id="use" styleClass="ActionButton">
+ #{i18n.exports_actions_use}
+ </h:commandLink>
+ <h:commandButton id="exports" action="exports" value="#{i18n.export_detail_exports}" styleClass="ActionButton"/>
+ <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -65,31 +65,11 @@
</h:commandLink>
</h:column>
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure">
- <f:param name="id" value="#{consumer.id}"/>
- #{i18n.portlets_table_configure}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton">
+ <f:param name="id" value="#{consumer.id}"/>
+ #{i18n.portlets_table_configure}
+ </h:commandLink>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -60,41 +60,13 @@
</h:column>
</h:dataTable>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="import" action="#{consumer.importPortlets}" disabled="#{!consumer.currentExport.readyForImport}"
- value="#{i18n.import_import}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure">
- <f:param name="id" value="#{consumer.id}"/>
- #{i18n.portlets_table_configure}
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="exports" action="exports" value="#{i18n.export_detail_exports}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <h:commandButton id="import" action="#{consumer.importPortlets}" disabled="#{!consumer.currentExport.readyForImport}"
+ value="#{i18n.import_import}" styleClass="ActionButton"/>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton">
+ <f:param name="id" value="#{consumer.id}"/>
+ #{i18n.portlets_table_configure}
+ </h:commandLink>
+ <h:commandLink id="exports" action="exports" value="#{i18n.export_detail_exports}" styleClass="ActionButton"/>
</h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -51,37 +51,10 @@
<p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p>
<h:form id="confirm-prop-del-form">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}"
- value="#{i18n.confirm_delete_reg_property_submit}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-delete" action="#{producer.cancel}"
- value="#{i18n.confirm_delete_reg_property_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}"
- action="deleteRegistrationProperty"
- backingBean="#{producer}"/>
-
- <webui:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}"
- backingBean="#{producer}"
- action="cancel"/></ui:remove>
+ <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_reg_property_submit}"/>
+ <h:commandLink id="cancel-delete" action="#{producer.cancel}" styleClass="ActionButton"
+ value="#{i18n.confirm_delete_reg_property_cancel}"/>
</h:form>
</div>
</div>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2012-03-10 10:15:30 UTC (rev 8559)
@@ -26,7 +26,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:webui="http://jboss.org/gatein">
+ xmlns:div="http://jboss.org/gatein">
<ui:param name="title" value="#{i18n.producer_config_title}"/>
@@ -72,38 +72,14 @@
<h:outputText value=" " rendered="#{producer.registrationRequired}"/>
<f:subview id="producer-registration" rendered="#{producer.registrationRequired}">
- <webui:blueHeaderBar>
- <div class="full-width float-left bold">
- #{i18n.producer_config_reg_props}
- <div class="add-prop-container">
- <div class="add-prop-button">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="add-reg-prop"
- action="#{producer.addRegistrationProperty}"
- value="#{i18n.producer_config_add_reg_prop}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="add-reg-prop" action="addRegistrationProperty"
- backingBean="#{producer}"
- value="#{i18n.producer_config_add_reg_prop}"/>
- </ui:remove>
- </div>
- </div>
- </div>
+ <div class="bar">
+ <h:outputText value="#{i18n.producer_config_reg_props}" style="font-weight: bold; margin-right: .3em;"/>
+ <h:commandLink id="add-reg-prop" styleClass="ActionButton"
+ action="#{producer.addRegistrationProperty}"
+ value="#{i18n.producer_config_add_reg_prop}"/>
+ </div>
- </webui:blueHeaderBar>
-
-
<f:subview rendered="#{!producer.registrationPropertiesEmpty}" id="reg-props">
<h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property"
rendered="#{producer.registrationRequired}"
@@ -148,38 +124,8 @@
<h:outputText value=" "/>
<h:panelGroup styleClass="portlet-section-buttonrow">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="reg-save" action="#{producer.save}"
- value="#{i18n.producer_config_save}"/>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandButton id="reg-reload" action="#{producer.reloadConfiguration}"
- value="#{i18n.producer_config_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <ui:remove><webui:commandButton id="reg-save" action="save"
- backingBean="#{producer}"
- value="#{i18n.producer_config_save}"/>
-
- <webui:commandButton id="reg-reload" action="reloadConfiguration"
- backingBean="#{producer}"
- value="#{i18n.producer_config_cancel}"/></ui:remove>
-
+ <h:commandButton id="reg-save" action="#{producer.save}" styleClass="ActionButton" value="#{i18n.producer_config_save}"/>
+ <h:commandButton id="reg-reload" action="#{producer.reloadConfiguration}" styleClass="ActionButton" value="#{i18n.producer_config_cancel}"/>
</h:panelGroup>
</h:panelGrid>
</h:form>
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2012-03-10 10:15:30 UTC (rev 8559)
@@ -21,16 +21,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-.UIWsrpPortlet .UIControlBar {
-/*background: url('background/ControlIcon.gif') repeat-x center -222px;*/
-/*border: 1px solid #b7b7b7;*/
-/*height: 23px;*/
- line-height: 28px;
- padding: 4px 10px 0 0; /*margin: 5px 0px;*/
- font-weight: bold;
- text-align: right;
-}
-
/***************************** Consumer Form Style ************************/
.UIWsrpPortlet .cons-temp-form,
@@ -40,6 +30,7 @@
.UIWsrpPortlet .UIGrid {
border: 1px solid #B7B7B7;
+ margin-bottom: 0.3em;
}
.UIWsrpPortlet .ConsumerGrid thead tr th,
@@ -56,25 +47,6 @@
color: darkblue;
}
-.UIWsrpPortlet .create-container .ActionContainer {
- position: absolute;
- margin: 7px 0 0 0;
-}
-
-/***************************** Producer Form Style ************************/
-
-.UIWsrpPortlet .add-prop-container {
- position: relative;
- display: inline
-}
-
-.UIWsrpPortlet .add-prop-button {
- position: absolute;
- top: -5px;
- left: 10px;
- font-weight: normal
-}
-
/***************************** Messages Style ************************/
.portlet-msg-success {
@@ -101,36 +73,6 @@
font-weight: bold;
}
-/***************************** ActionButton Style ************************/
-.UIWsrpPortlet .ActionContainer {
- width: auto;
- display: inline; /*margin: auto;*/
-}
-
-.UIWsrpPortlet .ButtonLeft {
- background: url('background/LightBlueStyle.gif') no-repeat left top;
- padding: 0px 0px 0px 3px;
-}
-
-.UIWsrpPortlet .ButtonRight {
- background: url('background/LightBlueStyle.gif') no-repeat right top;
- padding: 0px 3px 0px 0px;
-}
-
-.UIWsrpPortlet .ButtonMiddle {
- line-height: 22px;
- text-align: center;
- background: url('background/LightBlueStyle.gif') repeat-x bottom;
- white-space: nowrap;
- display: table-cell;
- padding: 0px 12px;
-}
-
-.UIWsrpPortlet .ButtonMiddle input {
- background: transparent;
- border: none;
-}
-
/***************************** GrayTabStyle ************************/
.UIWsrpPortlet .TabsActionContainer {
@@ -196,3 +138,29 @@
.UIWsrpPortlet .tab-blank {
border-bottom: 1px solid #B7B7B7;
}
+
+.UIWsrpPortlet .ActionButton {
+ line-height: 19px;
+ text-align: center;
+ background: url('background/LightBlueStyle.gif') repeat-x center;
+ white-space: nowrap;
+ padding: 0 12px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ border: 1px solid #8A8A8A;
+ border-bottom: 1px solid #5D5D5D;
+ display: inline-block;
+ margin: 0;
+ cursor: pointer;
+}
+
+.UIWsrpPortlet .bar {
+ padding: .4em;
+ margin: 0 0 0.3em 0;
+ border: 1px solid #B7B7B7;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ background: #eee;
+}
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
===================================================================
(Binary files differ)
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css 2012-03-09 10:33:12 UTC (rev 8558)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css 2012-03-10 10:15:30 UTC (rev 8559)
@@ -21,8 +21,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-@import url(basestyles.css);
-
.wsrp-consumers-ui {
padding: 10px;
}
@@ -424,5 +422,6 @@
background-color: #ffa200;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
+ border-radius: 6px;
padding: .5em;
}
\ No newline at end of file
12 years, 9 months
gatein SVN: r8558 - portal/trunk.
by do-not-reply@jboss.org
Author: bdaw
Date: 2012-03-09 05:33:12 -0500 (Fri, 09 Mar 2012)
New Revision: 8558
Modified:
portal/trunk/pom.xml
Log:
Picketlink IDM 1.3.1.GA
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2012-03-09 07:11:20 UTC (rev 8557)
+++ portal/trunk/pom.xml 2012-03-09 10:33:12 UTC (rev 8558)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
<org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.3.1.CR01</org.picketlink.idm>
+ <org.picketlink.idm>1.3.1.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.1-CR02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.1-GA</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version>
12 years, 9 months
gatein SVN: r8557 - in components/mop/trunk: api and 2 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2012-03-09 02:11:20 -0500 (Fri, 09 Mar 2012)
New Revision: 8557
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2012-03-09 07:11:09 UTC (rev 8556)
+++ components/mop/trunk/api/pom.xml 2012-03-09 07:11:20 UTC (rev 8557)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA</version>
+ <version>1.1.3-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2012-03-09 07:11:09 UTC (rev 8556)
+++ components/mop/trunk/core/pom.xml 2012-03-09 07:11:20 UTC (rev 8557)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA</version>
+ <version>1.1.3-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2012-03-09 07:11:09 UTC (rev 8556)
+++ components/mop/trunk/pom.xml 2012-03-09 07:11:20 UTC (rev 8557)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA</version>
+ <version>1.1.3-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.2-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.2-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.2-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2012-03-09 07:11:09 UTC (rev 8556)
+++ components/mop/trunk/spi/pom.xml 2012-03-09 07:11:20 UTC (rev 8557)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA</version>
+ <version>1.1.3-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
12 years, 9 months
gatein SVN: r8556 - components/mop/tags.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2012-03-09 02:11:09 -0500 (Fri, 09 Mar 2012)
New Revision: 8556
Added:
components/mop/tags/1.1.2-GA/
Log:
[maven-release-plugin] copy for tag 1.1.2-GA
12 years, 9 months
gatein SVN: r8555 - in components/mop/trunk: api and 2 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2012-03-09 02:10:58 -0500 (Fri, 09 Mar 2012)
New Revision: 8555
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.1.2-GA
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2012-03-09 07:10:07 UTC (rev 8554)
+++ components/mop/trunk/api/pom.xml 2012-03-09 07:10:58 UTC (rev 8555)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA-SNAPSHOT</version>
+ <version>1.1.2-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2012-03-09 07:10:07 UTC (rev 8554)
+++ components/mop/trunk/core/pom.xml 2012-03-09 07:10:58 UTC (rev 8555)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA-SNAPSHOT</version>
+ <version>1.1.2-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2012-03-09 07:10:07 UTC (rev 8554)
+++ components/mop/trunk/pom.xml 2012-03-09 07:10:58 UTC (rev 8555)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA-SNAPSHOT</version>
+ <version>1.1.2-GA</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.2-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.2-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.2-GA</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2012-03-09 07:10:07 UTC (rev 8554)
+++ components/mop/trunk/spi/pom.xml 2012-03-09 07:10:58 UTC (rev 8555)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.2-GA-SNAPSHOT</version>
+ <version>1.1.2-GA</version>
</parent>
<!-- ****************** -->
12 years, 9 months
gatein SVN: r8554 - components/mop/trunk.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2012-03-09 02:10:07 -0500 (Fri, 09 Mar 2012)
New Revision: 8554
Modified:
components/mop/trunk/pom.xml
Log:
GTNMOP-48 : Update dependencies
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2012-03-09 01:49:31 UTC (rev 8553)
+++ components/mop/trunk/pom.xml 2012-03-09 07:10:07 UTC (rev 8554)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.1.0-Beta01</version>
+ <version>1.1.0-GA</version>
</parent>
<!-- ****************** -->
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.3-Beta01</version>
+ <version>1.1.0-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -124,7 +124,7 @@
<!-- Build settings -->
<!-- ************** -->
- <org.chromattic.version>1.1.2</org.chromattic.version>
+ <org.chromattic.version>1.1.3</org.chromattic.version>
<!--
Current testuite doesn't work with surefire 2.7 defined in parent pom
12 years, 9 months
gatein SVN: r8553 - epp/docs/branches/5.2/Installation_Guide/en-US.
by do-not-reply@jboss.org
Author: jaredmorgs
Date: 2012-03-08 20:49:31 -0500 (Thu, 08 Mar 2012)
New Revision: 8553
Modified:
epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml
Log:
Removed section as part of https://bugzilla.redhat.com/show_bug.cgi?id=801248. Updated Clustering section to be task based as part of https://bugzilla.redhat.com/show_bug.cgi?id=801244. Also added cluster start-up instructions to the Test Your Installation section, and further improved the related task in this section.
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -9,10 +9,9 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>8</pubsnumber>
+ <pubsnumber>9</pubsnumber>
<abstract>
- <para>
- This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform. It forms part of the complete document suite along with the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
+ <para>This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform and its add-ons. It forms part of the complete document suite along with the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
</para>
</abstract>
<corpauthor>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/ClusteringConfiguration.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -5,90 +5,98 @@
]>
<section id="sect-Reference_Guide-Clustering_Configuration">
<title>Clustering Configuration</title>
- <section id="sect-Reference_Guide-Clustering_Configuration-Overview">
- <title>Overview</title>
- <para>JBoss Enterprise Portal Platform has been developed to support high availability and high horizontal and vertical scalability.
+ <para>JBoss Enterprise Portal Platform supports high availability and high horizontal and vertical scalability.
The setup instructions have been kept to a minimum, however, a good understanding of clustering services in
- JBoss Enterprise Application Platform and JBoss Cache would be required in order to configure the optimal settings.
+ JBoss Enterprise Application Platform and JBoss Cache are required in order to configure the optimal settings.
</para>
- </section>
- <section id="sect-Reference_Guide-Clustering_Configuration-Prerequisite">
- <title>Prerequisites</title>
- <para>The clustering services are available only in the <literal>all</literal>
+ <para>The clustering services are available only in the <literal>all</literal>
and <literal>production</literal> server configurations. Additionally the following prerequisites
should be met:
</para>
- <itemizedlist>
- <listitem>
- <para>
- A rapid shared file system is required such as a Storage Area Network (SAN).
+ <itemizedlist>
+ <listitem>
+ <para>A rapid shared file system is required such as a Storage Area Network (SAN).
</para>
- </listitem>
- <listitem>
- <para>Databases should be shared among the cluster nodes.
- </para>
- </listitem>
- <listitem>
- <para>All cluster nodes should be configured to point to the shared databases. </para>
- </listitem>
- </itemizedlist>
- </section>
+ </listitem>
+ <listitem>
+ <para>All cluster nodes must be configured to point to the IDM and JCR shared databases. Refer to <xref linkend="sect-Reference_Guide-Database_Configuration"/> for detailed database set up procedures.</para>
+ </listitem>
+ </itemizedlist>
<section id="sect-Reference_Guide-Clustering_Properties">
- <title>Configuration Properties</title>
- <para>Edit the following entries in the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/conf/gatein/configuration.properties</filename> file:</para>
- <itemizedlist>
- <listitem>
- <para>
- <literal>gatein.jcr.storage.data.dir;</literal>
- <itemizedlist>
- <listitem>
- <para>
- To specify the location of the "value storage". This folder must not be deleted as it contains data required for the portal to run. For more details about "value storage" please refer to the JCR configuration in the JBoss Enterprise Portal Platform Reference Guide available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>gatein.jcr.index.data.dir;</literal>
- <itemizedlist>
- <listitem>
- <para>
- To specify the location on a shared file system to store the JCR index. If the directory is deleted, the JCR will recreate the indexes on next start of the server. (This operation may take a very long time, depending on the size of the data stored in the JCR).
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>gatein.jcr.index.changefilterclass;</literal>
- <itemizedlist>
- <listitem>
- <para>
+ <title>Configure</title>
+ <task>
+ <title>Task: Configure Clustering Properties</title>
+ <tasksummary>
+ <para>Complete this task to configure clustering properties required for </para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You understand clustering fundamentals as described in the JBoss Enterprise Application Platform core documentation.</para>
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <listitem>
+ <para>You have read, and understand the information about <citetitle>The Java Content Repository</citetitle> (JCR) in the JBoss Enterprise Portal Platform <citetitle>Reference Guide</citetitle>.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Open the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/conf/gatein/configuration.properties</filename> file in a text editor:</para>
+ </step>
+ <step>
+ <para>Add the following properties to the file. An explanation is provided to assist you.</para>
+ <variablelist>
+ <varlistentry>
+ <term>gatein.jcr.storage.data.dir;</term>
+ <listitem>
+ <para>Specifies the location of the Java Content Repository (JCR) value storage. The location you specify contains critical data required to run the portal, and must not be deleted. Refer to the </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>gatein.jcr.index.data.dir;</term>
+ <listitem>
+ <para>Specifies the location on a shared file system to store the JCR index. </para>
+ <para>If the directory is deleted, the JCR will recreate the indexes on next start of the server. This operation may take a very long time, depending on the size of the data stored in the JCR.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>gatein.jcr.index.changefilterclass;</term>
+ <listitem>
+ <para>Specifies the filter class that should be used instead of the default filter class.</para>
+ <para>
This must be changed to <literal>org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter</literal>.
</para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>gatein.jcr.config.type;</literal>
- <itemizedlist>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>gatein.jcr.config.type;</term>
+ <listitem>
+ <para>Specifies the type of configuration the server should use across all nodes. </para>
+ <para>
This must be changed to <literal>cluster</literal>.
</para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- </itemizedlist>
- <para>
- The default property file would look like the following:
-<programlisting>#
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>You have provided the mandatory clustering configuration as it relates to the portal in the <filename>configuration.properties</filename> file.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ <example>
+ <title>Default configuration.properties clustering directives</title>
+ <para>
+ The code sample depicts a <filename>configuration.properties</filename> directive file with the required clustering configuration set.
+
+ </para>
+ <programlisting>#
gatein.conf.dir=${jboss.server.home.dir}/conf/gatein
gatein.data.dir=${jboss.server.data.dir}/gatein
@@ -111,24 +119,6 @@
gatein.jcr.workspace.default=collaboration
gatein.jcr.workspace.system=system
[...]</programlisting>
- </para>
+ </example>
</section>
- <section id="sect-Reference_Guide-Clustering_Running">
- <title>Run the Cluster</title>
- <para>To run the portal in high-availability mode, start all nodes with an extra profile configuration as follows:</para>
- <formalpara>
- <title>In Linux</title>
- <para>
-<programlisting><command>run.sh -c all -Dexo.profiles=cluster</command>
-</programlisting>
-</para>
- </formalpara>
- <formalpara>
- <title>In Windows</title>
- <para>
-<programlisting><command>run.bat -c all -Dexo.profiles=cluster</command>
-</programlisting>
-</para>
- </formalpara>
- </section>
</section>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -13,7 +13,8 @@
<itemizedlist>
<listitem>
<para>Java Content Repository (JCR) service, which depends on the native JDBC API. JCR has the capability to integrate with
- any existing datasource implementation</para>
+ any existing datasource implementation. </para>
+ <para>Detailed information about JCR is located in the <citetitle>Reference Guide</citetitle>.</para>
</listitem>
<listitem>
<para>Identity Management (IDM) service, which depends on JBoss Hibernate.</para>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -96,13 +96,16 @@
<step>
<para>Restart the portal.</para>
</step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>You have configured the platform to communicate using a secure connection.</para>
+ </formalpara>
+ </step>
</procedure>
+ <taskrelated>
+ <title>Related Information</title>
+ <para>Test clustering setup by following <xref linkend="Test_your_Installation"/>.</para>
+ </taskrelated>
</task>
- <formalpara>
- <title>Result</title>
- <para>You have configured the platform to communicate using a secure connection.</para>
- </formalpara>
- <para>
- You can now access the portal from the address: <literal>https://<replaceable><ServerAddress></replaceable>:8443/portal</literal>
- once you have completed the other configuration tasks in this guide.</para>
</section>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -43,39 +43,40 @@
</para>
</note>
</section>
- <section id="Set_JBOSS_HOME">
- <title> Set JBOSS_HOME Environment Variable </title>
- <formalpara>
- <title> On a Linux Platform </title>
- <para>
+<!--BZ#801248 Commented JBOSS_HOME section for EPP 5.2.1 because GSS confirmed it is not necessary to set this environment variable.--><!--<section id="Set_JBOSS_HOME">
+ <title> Set JBOSS_HOME Environment Variable </title>
+ <formalpara>
+ <title> On a Linux Platform </title>
+ <para>
Create an environment variable that points to the installation directory (<filename><replaceable>JBOSS_DIST</replaceable>/jboss-as</filename>) and call it <literal>JBOSS_HOME</literal>. Add <literal>$JBOSS_HOME/bin</literal> to the system path to be able to run the server from the command line. You can do this by adding the following lines to the <filename>.bashrc</filename> file in your <filename>/home</filename> directory.
</para>
- </formalpara>
- <programlisting>
+ </formalpara>
+ <programlisting>
#In this example /home/user/jboss-epp-<replaceable>VERSION</replaceable>/jboss-as is the installation directory.
export JBOSS_HOME=/home/user/jboss-epp-<replaceable>VERSION</replaceable>/jboss-as
export PATH=$PATH:$JBOSS_HOME/bin
</programlisting>
- <para>
+ <para>
Set this variable for the user account(s) that will run the server.
</para>
- <formalpara>
- <title> On Microsoft Windows </title>
- <para>
+ <formalpara>
+ <title> On Microsoft Windows </title>
+ <para>
Create an environment variable called <literal>JBOSS_HOME</literal> that points to the installation directory, for example: <filename>C:\jboss-epp-<replaceable>VERSION</replaceable>\jboss-as\</filename>.
</para>
- </formalpara>
- <para>
+ </formalpara>
+ <para>
In order to run the server from the command line add the <filename>bin</filename> directory to your path, for example: <filename>C:\jboss-epp-<replaceable>VERSION</replaceable>\jboss-as\bin</filename>.
</para>
- <para>
+ <para>
You may set these variables by going to the System Properties window then select the Advanced tab and finally click on the Environment Variables button.
</para>
- </section>
- <section id="Adjust_Memory_Settings">
+</section>--> <section id="Adjust_Memory_Settings">
<title>Adjust Memory Settings</title>
<para>
- If the server is running out of memory, you may adjust the memory settings before deploying the applications. You can do this by updating <literal>JAVA_OPTS</literal> settings in the file <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/bin/run.conf</filename> on Linux or <filename><replaceable>JBOSS_HOME</replaceable>\jboss-as\bin\run.conf.bat</filename> on Windows. The default values do not take into account the memory requirements of your applications:
+ If the server is running out of memory, you can adjust the memory settings before deploying the applications. </para>
+ <para>You can do this by updating <literal>JAVA_OPTS</literal> settings in the file <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/bin/run.conf</filename> on Linux or <filename><replaceable>JBOSS_HOME</replaceable>\jboss-as\bin\run.conf.bat</filename> on Windows. </para>
+ <para>The default values do not take into account the memory requirements of your applications:
<programlisting>-Xms1303m -Xmx1303m -XX:MaxPermSize=256m ....</programlisting>
</para>
</section>
@@ -163,7 +164,7 @@
<step>
<formalpara>
<title>Result</title>
- <para>The login links present on the front page of the portal main screen are not displayed, and the accounts are not available for use.
+ <para>The login links on the front page of the portal main screen are not displayed, and the accounts are not available for use.
</para>
</formalpara>
</step>
@@ -171,8 +172,8 @@
</task>
</section>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DatabaseConfiguration.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="EMailServiceConfiguration.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ClusteringConfiguration.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="HTTPSConfiguration.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GadgetProxyConfig.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="EMailServiceConfiguration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ClusteringConfiguration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="HTTPSConfiguration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GadgetProxyConfig.xml"/>
</chapter>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -9,6 +9,21 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-9</revnumber>
+ <date>Wed Mar 7 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Removed $JBOSS_HOME section as part of https://bugzilla.redhat.com/show_bug.cgi?id=801248. </member>
+ <member>Updated Clustering section to be task based as part of https://bugzilla.redhat.com/show_bug.cgi?id=801244. Also added cluster start-up instructions to the Test Your Installation section, and further improved the related task in this section.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-8</revnumber>
<date>Wed Mar 7 2012</date>
<author>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/SP_Installation.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -165,19 +165,6 @@
</note>
</step> --> </procedure>
</task>
- <para>Once you have completed all other configuration tasks in this guide, start the platform and navigate to <ulink url="http://localhost:8080/ecmdemo/public/classic" type="http">http://localhost:8080/ecmdemo/public/classic</ulink>.
- </para>
- <para>
- If your installation has been successful, you will see the following sample homepage:
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata width="444" scale="90" fileref="images/epp-sp-homepage.png" format="PNG"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata width="444" contentwidth="150mm" fileref="images/epp-sp-homepage.png" format="PNG"/>
- </imageobject>
- </mediaobject>
<!-- <para>
If you did not include the <filename>gatein-ecmdemo-portal-<version>-GA.ear</filename> file, refer to the documentation available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." /> for instructions on how to create a portal using Site Publisher's features.
</para> --> </section>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -4,20 +4,14 @@
%BOOK_ENTITIES;
]>
<chapter id="Test_your_Installation">
- <title><remark>BZ#794687 </remark>Test your Installation</title>
- <para>After you have installed the JBoss Enterprise Portal Platform, it is wise to perform a simple start up test to validate that there are no major problems with your Java VM/operating system combination. Ensure you have set the <literal>JBOSS_HOME</literal> environment variables as explained in <xref linkend="Post_Installation_Configuration"/>.
+ <title><remark>BZ#794687 and BZ#801244</remark>Test your Installation</title>
+ <para>After you have installed JBoss Enterprise Portal Platform and completed the relevant post installation configuration steps, verify your configuration is correct by starting the platform.
</para>
+ <remark>BZ#801244 - 20120309 - Refined task information to include note about sybase startup commands, cluster URL, portal screens dependent on add-ons. One task to cover all start up scenarios.</remark>
<task>
<title>Task: Test Your Installation</title>
<tasksummary>
- <para>Complete this task to verify your server starts, and navigate to the Portal management console.</para>
- <warning>
- <title>Warning: Sybase Requirements</title>
- <para>Sybase requires a particular configuration of JBoss Enterprise Portal Platform, to switch on that configuration, it is
- mandatory to run the portal with the extra <literal>sybase</literal> profile. This would
- mean to run the application server with <literal>sh run.sh -Dexo.profiles=sybase</literal> in a single node
- and <literal>sh run.sh -Dexo.profiles=sybase,cluster</literal> for a cluster node.</para>
- </warning>
+ <para>Complete this task to verify the platform starts, and navigate to the Portal management console.</para>
</tasksummary>
<taskprerequisites>
<title>Prerequisites</title>
@@ -39,14 +33,52 @@
</para>
</step>
<step>
- <para>Execute the <filename>run.bat</filename> (for Windows) or <filename>run.sh</filename> (for Linux) script, with the name of the server profile you have configured as part of the tasks in this guide.
+ <para>Execute the <filename>run.bat</filename> (for Windows) or <filename>run.sh</filename> (for Linux) script. Substitute the name of the <replaceable>server profile</replaceable> you have configured as part of the tasks in this guide.
</para>
+ <variablelist>
+ <varlistentry>
+ <term>Non-clustered Linux</term>
+ <listitem>
+ <programlisting>[bin]$ ./run.sh -c <replaceable>production</replaceable></programlisting>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Non-clustered Linux, running Sybase</term>
+ <listitem>
+ <programlisting>[bin]$ ./run.sh -c <replaceable>production</replaceable> -Dexo.profiles=sybase</programlisting>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Non-clustered Windows</term>
+ <listitem>
+ <programlisting>> run.bat -c <replaceable>production</replaceable></programlisting>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Clustered Linux</term>
+ <listitem>
+ <programlisting>[bin]$ ./run.sh -c <replaceable>production</replaceable> -Dexo.profiles=cluster</programlisting>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Clustered Linux, running Sybase</term>
+ <listitem>
+ <programlisting>[bin]$ ./run.sh -c <replaceable>production</replaceable> -Dexo.profiles=sybase,cluster</programlisting>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Clustered Windows</term>
+ <listitem>
+ <programlisting>> run.sh -c <replaceable>production</replaceable> -Dexo.profiles=cluster</programlisting>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<example>
<title>Sample Server Output using Production</title>
- <para>The example uses the production configuration. Your output should look like the following (accounting for installation directory differences and version numbers) and should not contain any error or exception messages:
+ <para>The example uses the Linux non-clustered production configuration. The output should look similar to the following (accounting for installation directory differences and version numbers), and should not contain any error or exception messages:
</para>
- <programlisting>[user@localhost bin]$ ./run.sh -c production
+ <programlisting>[bin]$ ./run.sh -c production
=========================================================================
JBoss Bootstrap Environment
@@ -84,38 +116,65 @@
</note>
</step>
<step>
- <para>Open <literal>http://localhost:8080/portal</literal> in your web browser.
+ <para>Open the portal in your web browser by selecting one of the following URLs.
</para>
- <para>If you have secured your portal for production use by following <xref linkend="sect-Installation_Guide-HTTPS_Configuration"/>, open <literal>https://localhost:8443/portal</literal><note>
- <para>On some machines, the name <literal>localhost</literal> will not resolve correctly and you should use the local loopback address 127.0.0.1 instead.
+ <note>
+ <para>On some machines, the name <literal>localhost</literal> will not resolve correctly and you should use the local loopback address 127.0.0.1 instead.
</para>
- </note>
- </para>
+ </note>
+ <variablelist>
+ <varlistentry>
+ <term>Standard Portal</term>
+ <listitem>
+ <para>Open <literal>http://localhost:8080/portal</literal> </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Standard Portal, with HTTPS configured</term>
+ <listitem>
+ <para>Open <literal>http://localhost:8443/portal</literal> </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Standard Portal, with HTTPS configured, and Site Publisher.</term>
+ <listitem>
+ <para>Open <literal>http://localhost:8443/ecmdemo/public/classic</literal> </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</step>
<step>
<formalpara>
<title>Result</title>
- <para>The contents of your page should look similar to <xref linkend="Test_your_Installation-Test_your_Installation"/>.
- </para>
+ <para>The contents of your page should look similar to <xref linkend="fig-Standard_Portal_Home_Page"/>, or
+ <xref linkend="fig-Site_Publisher_Home_Page"/></para>
</formalpara>
<para>
You are now ready to use JBoss Enterprise Portal Platform. Refer to the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> for more information about the product's feature set and example applications showcasing JBoss Enterprise Portal Platform in action.
</para>
- <figure id="Test_your_Installation-Test_your_Installation">
- <title>Test your Installation</title>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/test_install.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="444px"/>
- </imageobject>
- </mediaobject>
- </figure>
</step>
</procedure>
</task>
- <para>
-
- </para>
+ <figure id="fig-Standard_Portal_Home_Page">
+ <title>Standard Portal Home Page</title>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" scale="100"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="444px"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <figure id="fig-Site_Publisher_Home_Page">
+ <title>Site Publisher Home Page</title>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/epp-sp-homepage.png" format="PNG" scale="90" width="444"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/epp-sp-homepage.png" format="PNG" contentwidth="150mm" width="444"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</chapter>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-03-08 16:51:51 UTC (rev 8552)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-03-09 01:49:31 UTC (rev 8553)
@@ -3,41 +3,9 @@
]>
<chapter id="Uninstall_JBoss">
<title>Remove JBoss Enterprise Application Platform</title>
-<!--Divide into GUI/CLI procedures.
-<para>
- There are several options for uninstalling JBoss Enterprise Application Platform. The options available to you depend on your installation method.
-</para>
-
-<section>
- <title>If you used the graphical installation</title>
- <para>
- There are two options for uninstalling if you installed using the graphical installer; you can uninstall with either the graphical uninstaller, or via the command line.
- </para>
- <procedure>
- <title>Graphical uninstall</title>
- <step>
- <para>
-
- </para>
- </step>
- <step performance="optional">
- <para>
-
- </para>
- </step>
-
-
-</section>
-
-<section>
- <title>If you used the ZIP installation</title>
-
-
-
-
-</section>
---> <task>
- <title>Remove Platform By Deleting Root Installation Directory </title>
+ <para>Read this section to learn how to remove JBoss Enterprise Portal Platform from a server.</para>
+ <task>
+ <title>Remove Platform by Deleting Root Installation Directory </title>
<tasksummary>
<para>Complete this task to remove the root installation directory, which removes the platform from your system. To verify the root installation directory, ensure the directory contains the <filename>/jboss-as</filename> directory.</para>
</tasksummary>
12 years, 9 months