gatein SVN: r5433 - epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US.
by do-not-reply@jboss.org
Author: smumford
Date: 2010-12-01 22:56:42 -0500 (Wed, 01 Dec 2010)
New Revision: 5433
Added:
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/GadgetProxyConfig.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/HTTPSConfiguration.xml
Modified:
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Configuration.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Getting_Started.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation_Guide.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Introduction.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Launching.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Post_Installation.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Test_Your_Installation.xml
Log:
: Incorporated fixes from 5.1 docs reviews
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -11,7 +11,7 @@
<subtitle>An Installation Guide for &PRODUCT;</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5</productnumber>
- <edition>1.6</edition>
+ <edition>1.7</edition>
<pubsnumber>0</pubsnumber>
<abstract>
<para>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -44,7 +44,7 @@
<section id="sect-Reference_Guide-Clustering_Properties">
<title>configuration.properties</title>
- <para>Edit the following entries in the <filename>$JBOSS_HOME/jboss-as/server/$CONFIG/conf/gatein/configuration.properties</filename> file:</para>
+ <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>
@@ -97,7 +97,7 @@
</itemizedlist>
<para>
The default property file would look like the following:
- <programlisting># Data
+<programlisting># Data
gatein.data.dir=/mnt/shared/mylocation
# DB
@@ -121,15 +121,17 @@
<title>Running with the cluster profile</title>
<para>To run the portal in high-availability mode, you would need to start all nodes with an extra profile configuration as follows:</para>
<formalpara><title>In Linux</title>
- <para>
- <literal>run.sh -c all -Dexo.profiles=cluster</literal>
- </para>
+<para>
+<programlisting><command>run.sh -c all -Dexo.profiles=cluster</command>
+</programlisting>
+</para>
</formalpara>
<formalpara><title>In Windows</title>
- <para>
- <literal>run.bat -c all -Dexo.profiles=cluster</literal>
- </para>
+<para>
+<programlisting><command>run.bat -c all -Dexo.profiles=cluster</command>
+</programlisting>
+</para>
</formalpara>
</section>
</section>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Configuration.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Configuration.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Configuration.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -9,7 +9,7 @@
<xi:include href="DatabaseConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="EMailServiceConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="ClusteringConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-
+ <xi:include href="HTTPSConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="GadgetProxyConfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -39,7 +39,7 @@
<para>To configure the database datasource used by JCR you will need to edit the
datasource descriptor located at
- <filename>$JBOSS_HOME/server/$CONFIG/deploy/gatein-ds.xml</filename>:
+ <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein-ds.xml</filename>:
<programlisting>
<no-tx-datasource>
<jndi-name>gatein-jcr</jndi-name>
@@ -70,7 +70,7 @@
created.</para>
<para>Add the JDBC driver to the classpath, by copying the relevant
- JAR file to the <filename>$JBOSS_HOME/server/$CONFIG/lib</filename> directory.</para>
+ JAR file to the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/lib</filename> directory.</para>
</section>
@@ -79,7 +79,7 @@
<title>Configuring the database datasource for the default identity store</title>
<para>To configure the database datasource used by IDM you will need to edit the
- datasource descriptor located at <filename>$JBOSS_HOME/server/$CONFIG/deploy/gatein-ds.xml</filename>:
+ datasource descriptor located at <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein-ds.xml</filename>:
<programlisting>
<no-tx-datasource>
@@ -239,7 +239,7 @@
<orderedlist>
<listitem>
<para>
- Edit the file located at <filename>$JBOSS_HOME/server/$CONFIG/deploy/gatein-ds.xml</filename>.
+ Edit the file located at <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein-ds.xml</filename>.
</para>
</listitem>
<listitem>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -20,11 +20,11 @@
<title>Configuring the outgoing e-mail account</title>
<para>The e-mail service can use any SMTP account configured in
- <filename>$JBOSS_HOME/server/$CONFIG/conf/gatein/configuration.properties</filename></para>
+ <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/conf/gatein/configuration.properties</filename></para>
<para>The relevant section looks like:</para>
- <programlisting># EMail
+<programlisting># EMail
gatein.email.smtp.username=
gatein.email.smtp.password=
gatein.email.smtp.host=smtp.gmail.com
Added: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/GadgetProxyConfig.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/GadgetProxyConfig.xml (rev 0)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/GadgetProxyConfig.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -0,0 +1,82 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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.
+ </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>
+ 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>
+ <key>org.exoplatform.web.security.proxy.ProxyFilterService</key>
+ <type>org.exoplatform.web.security.proxy.ProxyFilterService</type>
+ <init-params>
+ <values-param>
+ <!-- The white list -->
+ <name>white-list</name>
+ <value></value>
+ </values-param>
+ <values-param>
+ <name>black-list</name>
+ <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>
+ <key>org.exoplatform.web.security.proxy.ProxyFilterService</key>
+ <type>org.exoplatform.web.security.proxy.ProxyFilterService</type>
+ <init-params>
+ <values-param>
+ <!-- The white list -->
+ <name>white-list</name>
+ <value>*.example.com</value>
+ <value>www.example.net</value>
+ </values-param>
+ <values-param>
+ <name>black-list</name>
+ <value>evil.example.com</value>
+ </values-param>
+ </init-params>
+ </component> ]]>
+</programlisting>
+</example>
+ </section>
+</section>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Getting_Started.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Getting_Started.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -6,17 +6,16 @@
<chapter id="Getting_Started">
<title>Getting Started</title>
+
<section id="Getting_Started-Pre_Requisites">
<title>Pre-Requisites</title>
<para>
- You must have adequate disk space to install a JDK and &PRODUCT; (about 520MB) while also allowing enough space for your applications. Before installing &PRODUCT; you must have a working installation of Java. Since JBoss is 100% pure Java you can have it working on any Operating System / Platform that supports Java.
- <!--However, only some combinations are certified (tested prior to shipping) or supported (on which you can open support tickets), the certified combinations are listed below. -->
+ You must have adequate disk space to install a JDK and &PRODUCT; (about 550MB) while also allowing enough space for your applications. Before installing &PRODUCT; you must have a working installation of Java. Since JBoss is 100% pure Java you can have it working on any Operating System / Platform that supports Java.
</para>
<section id="Pre_Requisites-EAP">
<title>Enterprise Application Platform</title>
- <para>The Enterprise Portal Platform 5.0 is built upon the Enterprise Application Platform 5.0.
- For more details about the underlying platform such as the difference between the 4.3 and 5.0 versions, please refer to
- the EAP installation guide available at: <ulink url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/"></ulink>
+ <para>&PRODUCT; is built upon &JBEAP;. For more details about the underlying platform please refer to
+ the EAP installation guide available at: <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/i..."></ulink>
</para>
</section>
<section id="Pre_Requisites-Hardware_and_Operating_System_Requirements">
@@ -24,7 +23,7 @@
<formalpara>
<title>Minimum Installation Requirements</title>
<para>
- The minimum hard disk space required to support the installation of the JBoss Enterprise Portal Platform is about 550MB. Additional space is required for the installation of the JDK upon which the the JBoss Application Server depends. The JDK installation size is currently up to 150MB.
+ The minimum hard disk space required to support the installation of the JBoss Enterprise Portal Platform is about 550MB. Additional space is required for the installation of the JDK upon which the JBoss Application Server depends. The JDK installation size is currently up to 150MB.
</para>
</formalpara>
<formalpara>
@@ -49,7 +48,7 @@
The server configuration including the selected log files, their designated size and general server tuning.
</para>
</listitem>
- </itemizedlist>
+ </itemizedlist>
<para>
The following discussion relates to the deployment of a simple application on a server experiencing minimal demand. In view of this, the absolute minimum requirements for an operational server are:
</para>
@@ -208,10 +207,7 @@
</tbody>
</tgroup>
</table>
-
- <para>
- The following is a list of supported databases and JDBC drivers:
- </para>
+
<indexterm>
<primary>System Requirements</primary>
<secondary>Database</secondary>
@@ -220,14 +216,12 @@
<primary>Database</primary>
<secondary>System Requirements</secondary>
</indexterm>
- <table>
- <title>
- Supported and Certified Database / JDBC driver Combinations.
- </title>
-
+ <table>
+ <title>Supported Database and JDBC driver Combinations</title>
<tgroup cols="2">
- <colspec colnum="1" colname="DB" colwidth="1*"></colspec>
- <colspec colnum="2" colname="DB_driver" colwidth="1*"></colspec>
+ <colspec colnum="1" colname="c1" colwidth="1*"></colspec>
+ <colspec colnum="2" colname="c2" colwidth="1*"></colspec>
+ <spanspec spanname="hspan" namest="c1" nameend="c2" align="left"></spanspec>
<thead>
<row>
<entry>
@@ -239,6 +233,11 @@
</row>
</thead>
<tbody>
+ <row>
+ <entry spanname="hspan">
+ <emphasis><emphasis role="bold">&PRODUCT; 5.0</emphasis></emphasis>
+ </entry>
+ </row>
<row>
<entry>
MySQL 5.1
@@ -249,26 +248,26 @@
</row>
<row>
<entry>
- Oracle 10g R2 (10.2.0.4)
+ Oracle 10g R2 <!--(10.2.0.4)-->
</entry>
<entry>
- 10g R2 (10.2.0.4)
+ 10g R2 <!--(10.2.0.4)-->
</entry>
</row>
<row>
<entry>
- Oracle 11g R1 (11.1.0.7.0) (Supported)
+ Oracle 11g R1 <!-- (11.1.0.7.0) -->(Supported)
</entry>
<entry>
- 11g R1 (11.1.0.7.0)
+ 11g R1 <!--(11.1.0.7.0)-->
</entry>
</row>
<row>
<entry>
- Oracle 11g RAC (11.1.0.7.0) (Supported)
+ Oracle 11g RAC <!--(11.1.0.7.0)--> (Supported)
</entry>
<entry>
- 11g R1 (11.1.0.7.0)
+ 11g R1 <!--(11.1.0.7.0)-->
</entry>
</row>
<row>
@@ -316,12 +315,13 @@
Sybase 15.0.2
</entry>
<entry>
- JConnect v6.0.5 (Build 26564 / 11 Jun 2009)
+ JConnect v6.0.5 <!--(Build 26564 / 11 Jun 2009) -->
</entry>
</row>
</tbody>
</tgroup>
</table>
+
<indexterm>
<primary>System Requirements</primary>
<secondary>Directory server</secondary>
@@ -532,7 +532,8 @@
</listitem> -->
<listitem>
<para>
- Create an environment variable that points to the JDK installation directory and call it <literal>JAVA_HOME</literal>. Add <literal>$JAVA_HOME/bin</literal> to the system path to be able to run <literal>java</literal> from the command line. You can do this by adding the following lines to the <filename>.bashrc</filename> file in your home directory. <programlisting>
+ Create an environment variable that points to the JDK installation directory and call it <literal>JAVA_HOME</literal>. Add <literal>$JAVA_HOME/bin</literal> to the system path to be able to run <literal>java</literal> from the command line. You can do this by adding the following lines to the <filename>.bashrc</filename> file in your home directory.
+<programlisting>
#In this example /usr/java/jdk1.6.0_19 is the JDK installation directory.
export JAVA_HOME=/usr/java/jdk1.6.0_19
export PATH=$PATH:$JAVA_HOME/bin
@@ -650,5 +651,35 @@
</section>
</section>
+ <section>
+ <title>Recommended Practices</title>
+ <para>
+ &PRODUCT; includes four pre-configured user accounts for testing and evaluation purposes. These accounts can be used for direct access to the portal.
+ </para>
+ <para>
+ For security reasons, before going in production, you should restrict the access to the login servlet to POST.
+ </para>
+ <para>
+ To do so, edit the file <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/web.xml</filename> and add:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[
+<security-constraint>
+ <web-resource-collection>
+ <web-resource-name>login</web-resource-name>
+ <url-pattern>/login</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>PUT</http-method>
+ <http-method>DELETE</http-method>
+ <http-method>HEAD</http-method>
+ <http-method>OPTIONS</http-method>
+ <http-method>TRACE</http-method>
+ </web-resource-collection>
+ <auth-constraint/>
+</security-constraint> ]]></programlisting>
+ <para>
+ Doing this will render the login links provided on the front page inactive.
+ </para>
+
+ </section>
</chapter>
Added: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/HTTPSConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/HTTPSConfiguration.xml (rev 0)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/HTTPSConfiguration.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-Installation_Guide-HTTPS_Configuration">
+ <title>HTTPS Configuration</title>
+
+ <section id="sect-Installation_Guide-HTTPS_Configuration-Overview">
+ <title>Overview</title>
+ <para>
+ &PRODUCT; runs, by default, in HTTP mode. However, for security purposes, you can configure it to run in HTTPS mode. This section explains how to run &PRODUCT; in HTTPS mode.
+ </para>
+
+ </section>
+ <section id="sect-Installation_Guide-HTTPS_Configuration-Generate_Key">
+ <title>Generate your key</title>
+ <para>
+ If you haven't a X.509 certificate, you can make a simple certificate using the <command>keytool</command> command:
+ </para>
+ <procedure>
+ <title><emphasis role="bold"></emphasis></title>
+ <step>
+ <para>
+ Change the variables in the following command to suit your circumstances then run it a terminal:
+ </para>
+<programlisting>keytool -genkey -alias serverkeys -keyalg RSA -keystore server.keystore -storepass 123456 -keypass 123456 -dname "CN=localhost, OU=MYOU, O=MYORG, L=MYCITY, ST=MYSTATE, C=MY"</programlisting>
+ <para>
+ Your key will be stored in <filename>server.keystore</filename>
+ </para>
+ </step>
+ <step>
+ <para>
+ Import your key into the Sun JDK keystore (this is required to help running gadget features) with the following command:
+ </para>
+<programlisting>keytool -importkeystore -srckeystore server.keystore -destkeystore $JAVA_HOME/jre/lib/security/cacerts</programlisting>
+ </step>
+ </procedure>
+ </section>
+
+ <section id="sect-Installation_Guide-HTTPS_Configuration-Use_In_Jboss">
+ <title>Setup JBoss configuration to use your key</title>
+ <para>
+ To set the JBoss configuration to use the new key:
+ </para>
+ <procedure>
+ <title><emphasis role="bold"></emphasis></title>
+ <step>
+ <para>
+ Comment the following lines in <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/jbossweb.sar/server.xml</filename>:
+ </para>
+<programlisting><![CDATA[<Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}"
+ connectionTimeout="20000" redirectPort="8443" >
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Uncomment the following lines...
+ </para>
+<programlisting><![CDATA[<Connector protocol="HTTP/1.1" SSLEnabled="true"
+ port="8443" address="${jboss.bind.address}"
+ scheme="https" secure="true" clientAuth="false"
+ keystoreFile="$JAVA_HOME/jre/lib/security/cacerts"
+ keystorePass="123456" sslProtocol = "TLS" />
+]]></programlisting>
+ <para>
+ ...and change the values of <literal>keystoreFile</literal> and <literal>keystorePass</literal> to values of your key.
+ </para>
+ </step>
+ </procedure>
+ </section>
+
+ <!-- Removed as per JBEPP-671
+ <section id="sect-Installation_Guide-HTTPS_Configuration-Use_In_Tomcat">
+ <title>Setup Tomcat configuration to use your key</title>
+ <para>
+ To set the Tomcat configuration to use the new key:
+ </para>
+ <procedure>
+ <title><emphasis role="bold"></emphasis></title>
+ <step>
+ <para>
+ Comment the following lines in <filename>tomcat/conf/server.xml</filename>:
+ </para>
+<programlisting><![CDATA[<Connector port="8080" protocol="HTTP/1.1"
+ maxThreads="150" connectionTimeout="20000"
+ redirectPort="8443" URIEncoding="UTF-8"
+ emptySessionPath="true"/ >
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Uncomment the following lines...
+ </para>
+<programlisting><![CDATA[<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS"
+ keystoreFile="$JAVA_HOME/jre/lib/security/cacerts"
+ keystorePass="123456" />
+]]></programlisting>
+ <para>
+ ...and change the values of <literal>keystoreFile</literal> and <literal>keystorePass</literal> to values of your key.
+ </para>
+ </step>
+ </procedure>
+ </section>-->
+
+ <section>
+ <title><emphasis role="bold">Restart</emphasis></title>
+ <para>
+ Once you have configured your environment, restart your &PRODUCT; instance.
+ </para>
+ <para>
+ You can now access the portal via address: <literal>https://<replaceable><ServerAddress></replaceable>:8443/portal</literal>
+ </para>
+ </section>
+</section>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -11,10 +11,10 @@
<title>Downloading</title>
<para>
- The officially supported versions are available from the JBoss Customer Support Portal (CSP) located at <ulink url="https://support.redhat.com/jbossnetwork/restricted/main.html">https://support.redhat.com/jbossnetwork/restricted/main.html</ulink>. Platforms including in your Support subscription are listed in the <literal>Software</literal> section.
+ The officially supported versions are available from the JBoss Customer Support Portal (CSP) located at <ulink url="https://access.redhat.com/home">https://access.redhat.com/home</ulink>. Platforms including in your Support subscription are listed in the <literal>Software</literal> section.
</para>
</section>
-
+
<section id="Installing">
<title>Installing</title>
@@ -24,9 +24,11 @@
<itemizedlist>
<listitem>
<para>
- Unzip <literal>jboss-epp-<replaceable><release></replaceable>.zip</literal> to extract the archive contents into the location of your choice. You can do this using the JDK <literal>jar</literal> tool (or any other ZIP extraction tool). <programlisting>
- [vsr]$ <literal>cd jbeppinstallationdir</literal>
- [vsr]$ <literal>jar -xvf jboss-epp-<replaceable><release></replaceable>.zip</literal></programlisting>
+ Unzip <literal>jboss-epp-<replaceable><release></replaceable>.zip</literal> to extract the archive contents into the location of your choice. You can do this using the JDK <literal>jar</literal> tool (or any other ZIP extraction tool).
+<programlisting>
+[vsr]$ <literal>cd jbeppinstallationdir</literal>
+[vsr]$ <literal>jar -xvf jboss-epp-<replaceable><release></replaceable>.zip</literal>
+</programlisting>
</para>
</listitem>
<listitem>
@@ -39,8 +41,10 @@
<note>
<title>Server Configurations</title>
<para>
- Six types of server configurations will be included in your installation: <literal>minimal</literal>, <literal>default</literal>, <literal>production</literal>, <literal>all</literal>, <literal>standard</literal> and <literal>web</literal>.
- The Getting Started Guide of &JBEAP; 5.0 explains in detail the different server configuration file sets.
+ Six types of server configurations will be included in your installation: <literal>minimal</literal>, <literal>default</literal>, <literal>production</literal>, <literal>all</literal>, <literal>standard</literal> and <literal>web</literal>.
+ </para>
+ <para>
+ The &JBEAP; <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/i...">Getting Started Guide</ulink> explains in detail the different server configuration file sets.
</para>
</note>
@@ -69,7 +73,7 @@
</listitem>
<listitem>
<para>
- the <literal>production</literal> server configuration includes Portal components and clustering services. It is preconfigured with default settings which would be more accurate for a production environment.
+ the <literal>production</literal> server configuration includes Portal components and clustering services. It is preconfigured with default settings which would be more accurate for a production environment.
</para>
</listitem>
</itemizedlist>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation_Guide.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation_Guide.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Installation_Guide.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -15,7 +15,8 @@
<xi:include href="Post_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Test_Your_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Uninstall_JBoss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Uninstall_JBoss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<index />
</book>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Introduction.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Introduction.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Introduction.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -18,7 +18,7 @@
<section id="Introduction-Other_Manuals">
<title>Other Manuals</title>
<para>
- If you are looking for detailed information about other JBoss middleware products such as JBoss Enterprise Applications Platform please refer to the manuals available online at <ulink url="http://www.redhat.com/docs/manuals/jboss"></ulink>.
+ If you are looking for detailed information about other JBoss middleware products such as JBoss Enterprise Applications Platform please refer to the manuals available online at <ulink url="http://docs.redhat.com/docs/en-US/index.html"></ulink>.
</para>
</section>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Launching.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Launching.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Launching.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -18,7 +18,7 @@
</step>
<step>
<para>
- Within this directory navigate to <filename>/jboss-as/bin</filename>.
+ Within this directory navigate to <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/bin</filename>.
</para>
</step>
<step>
@@ -62,7 +62,7 @@
<procedure>
<step>
<para>
- Navigate to the <filename>/jboss-as/bin</filename> directory as discussed in <xref linkend="sect-Install_Guide-Launching_PRODUCT-Launching_a_Zip_installation" />.
+ Navigate to the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/bin</filename> directory as discussed in <xref linkend="sect-Install_Guide-Launching_PRODUCT-Launching_a_Zip_installation" />.
</para>
</step>
<step>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Post_Installation.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Post_Installation.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -14,7 +14,7 @@
On a Linux Platform
</title>
<para>
- Create an environment variable that points to the installation directory (<filename>JBOSS_DIST/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 home directory.
+ 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 home directory.
</para>
</formalpara>
<programlisting>
@@ -32,10 +32,14 @@
</title>
<para>
Create an environment variable called <literal>JBOSS_HOME</literal> that points to the installation directory, for example: <filename>C:\jboss-epp-5.0\jboss-as\</filename>.
- 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-5.0\jboss-as\bin</filename>.
- 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>
</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-5.0\jboss-as\bin</filename>.
+ </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">
@@ -51,9 +55,9 @@
<para><remark>End Note to Reviewer</remark></para>
-->
<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>JBOSS_DIST/jboss-as/bin/run.conf</filename> on Linux or <filename>JBOSS_DIST/jboss-as/bin/run.conf.bat</filename> on Windows. The default values don't take into account the memory requirements of your applications:
+ 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 don't take into account the memory requirements of your applications:
<programlisting>
- -Xms1303m -Xmx1303m -XX:MaxPermSize=256m ....
+-Xms1303m -Xmx1303m -XX:MaxPermSize=256m ....
</programlisting>
</para>
</section>
@@ -73,33 +77,34 @@
It is recommended that the admin=admin username and password configuration, which is commented out by default, not be used for a production server. The admin user is included as an example of the username/password definition format only.
</para>
</important>
-
+ <note>
+ <title><replaceable>JBOSS_HOME</replaceable> and <replaceable><PROFILE></replaceable></title>
+ <para>
+ <replaceable>JBOSS_HOME</replaceable> is the <filename>jboss-as</filename> directory, a level above the bin directory. <replaceable><PROFILE></replaceable> is the chosen server profile: all, default, minimal production, standard or web.
+ </para>
+ </note>
<formalpara><title>Set up the <literal>jmx-console</literal> users and roles</title>
<para>
- Edit the <filename>jmx-console-users.properties</filename> file located in the <filename>$JBOSS_HOME/server/$CONFIG/conf/props/</filename> directory defining the username and password:
+ Edit the <filename>jmx-console-users.properties</filename> file located in the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/conf/props/</filename> directory defining the username and password:
</para>
</formalpara>
<programlisting>user=password</programlisting>
<para>
- Edit the <filename>jmx-console-roles.properties</filename> file located in the <filename>$JBOSS_HOME/server/$CONFIG/conf/props/</filename> directory to define the user's roles:
+ Edit the <filename>jmx-console-roles.properties</filename> file located in the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/conf/props/</filename> directory to define the user's roles:
</para>
<programlisting>user=JBossAdmin,HttpInvoker</programlisting>
<formalpara><title>Set up the <literal>admin-console</literal> users and roles</title>
<para>
- Edit the <filename>web-console-users.properties</filename> file located in the <filename>$JBOSS_HOME/server/$CONFIG/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/</filename> directory:
+ Edit the <filename>web-console-users.properties</filename> file located in the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/</filename> directory:
</para>
</formalpara>
<programlisting>user=password</programlisting>
<para>
- Edit the <filename>web-console-roles.properties</filename> file located in the <filename>$JBOSS_HOME/server/$CONFIG/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/</filename> directory:
+ Edit the <filename>web-console-roles.properties</filename> file located in the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/</filename> directory:
</para>
<programlisting>user=JBossAdmin,HttpInvoker</programlisting>
- <note><title>$JBOSS_HOME and $CONFIG</title>
- <para>
- <varname>$JBOSS_HOME</varname> is the <filename>jboss-as</filename> directory, a level above the bin directory. <varname>$CONFIG</varname> is the chosen server configuration - all, default, minimal production, standard or web.
- </para>
- </note>
+
<important>
<para>
Login credentials for the <literal>admin-console</literal> are the same as those used for the JMX console.
@@ -108,11 +113,13 @@
<formalpara>
<title>Set SuckerPassword for JBoss Messaging:</title>
<para>
- JBoss Messaging makes internal connections between nodes in order to redistribute messages between clustered destinations. These connections are made with the user name of a special reserved user whose password is specified by the <literal>suckerPassword</literal> attribute in the Server Peer configuration file:
- <programlisting>$JBOSS_HOME/server/$CONFIG/deploy/messaging/messaging-jboss-beans.xml</programlisting>
- Where <literal>$JBOSS_HOME</literal> is the install directory and <literal>$CONFIG</literal> is the server configuration being used.
- To avoid a security risk, you MUST specify the value of the <literal>SuckerPassword</literal> attribute, failing which the default value will be used. Any one who knows the default password will be able to gain access to any destinations on the server. The following fragment should be uncommented and modified:
- <programlisting><bean name="SecurityStore"
+ JBoss Messaging makes internal connections between nodes in order to redistribute messages between clustered destinations. These connections are made with the user name of a special reserved user whose password is specified by the <literal>suckerPassword</literal> attribute in the Server Peer configuration file: <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/messaging/messaging-jboss-beans.xml</filename>.
+ </para>
+ </formalpara>
+ <para>
+ To avoid a security risk, you MUST specify the value of the <literal>SuckerPassword</literal> attribute, failing which the default value will be used. Any one who knows the default password will be able to gain access to any destinations on the server. The following fragment should be uncommented and modified:
+ </para>
+<programlisting><bean name="SecurityStore"
class="org.jboss.jms.server.jbosssx.JBossASSecurityMetadataStore">
<! default security configuration >
...
@@ -124,8 +131,7 @@
...
</bean>
</programlisting>
- </para>
- </formalpara>
+
</section>
<section id="Disabling_Authentication">
@@ -134,23 +140,14 @@
<para>
It is possible to disable authentication for specific services by following the instructions in this section.
</para>
- <para>
- All paths specified in the sub-sections below are relative to <literal>$JBOSS_HOME</literal>.
- </para>
+
<formalpara>
<title>Disabling Authentication for JXM Console:</title>
<para>
- To disable authentication for the JMX console, edit the following file and comment out the security-constraint section:
+ To disable authentication for the JMX console, edit the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/jmx-console.war/WEB-INF/web.xml</filename> file and comment out the security-constraint section:
</para>
</formalpara>
-
<programlisting>
-server/$CONFIG/deploy/jmx-console.war/WEB-INF/web.xml
-</programlisting>
- <para>
- The following fragment should be commented out:
- </para>
-<programlisting>
<security-constraint>
<web-resource-collection>
<web-resource-name>HtmlAdaptor</web-resource-name>
@@ -159,8 +156,6 @@
role JBossAdmin to access the HTML JMX console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
<role-name>JBossAdmin</role-name>
@@ -170,12 +165,8 @@
<formalpara>
<title>Disabling Authentication for Web Console:</title>
<para>
- To disable authentication for the Web console, edit the following file to comment out the security-constraint section:
- <programlisting>
-server/$CONFIG/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
- </programlisting>
- The following fragment should be commented out:
- <programlisting>
+ To disable authentication for the Web console, edit the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml</filename> file to comment out the security-constraint section:
+<programlisting>
<security-constraint>
<web-resource-collection>
<web-resource-name>HtmlAdaptor</web-resource-name>
@@ -196,12 +187,8 @@
<formalpara>
<title>Disabling Authentication for HTTP Invoker:</title>
<para>
- To disable authentication for the http invoker, <literal>JNDIFactory</literal>, <literal>EJBInvokerServlet</literal>, and <literal>JMXInvokerServlet</literal> need to be removed from the security realm in the file:
- <programlisting>
-server/$CONFIG/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml
- </programlisting>
- For example, the security-constraint element should look as follows:
- <programlisting>
+ To disable authentication for the http invoker, <literal>JNDIFactory</literal>, <literal>EJBInvokerServlet</literal>, and <literal>JMXInvokerServlet</literal> need to be removed from the security realm in the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml</filename> file:
+<programlisting>
<security-constraint>
<web-resource-collection>
<web-resource-name>HttpInvokers</web-resource-name>
@@ -222,12 +209,13 @@
<formalpara>
<title>Disabling Authentication for JMX Invoker:</title>
<para>
- To disable authentication for the JMX invoker, edit the following file to comment out the security interceptor passthrough:
- <programlisting>
-server/$CONFIG/deploy/jmx-invoker-service.xml
- </programlisting>
- Locate the mbean section with the class <literal>org.jboss.jmx.connector.invoker.InvokerAdaptorService</literal>. In that section comment out the line that relates to authenticated users:
- <programlisting>
+ To disable authentication for the JMX invoker, edit the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml/deploy/jmx-invoker-service.xml</filename> file to comment out the security interceptor passthrough:
+ </para>
+ </formalpara>
+ <para>
+ Locate the mbean section with the class <literal>org.jboss.jmx.connector.invoker.InvokerAdaptorService</literal>. In that section comment out the line that relates to authenticated users:
+ </para>
+<programlisting>
<descriptors>
<interceptors>
<!-- Uncomment to require authenticated users -->
@@ -238,20 +226,19 @@
policyClass="StripModelMBeanInfoPolicy"/>
</interceptors>
</descriptors>
- </programlisting>
- </para>
- </formalpara>
+</programlisting>
+
<formalpara>
<title>Disabling Pre-configured Accounts</title>
<para>
- &PRODUCT; &VERSION; includes four pre-configured user accounts for testing and evaluation puposes. These accounts can be used for direct access to the portal.
+ &PRODUCT; includes four pre-configured user accounts for testing and evaluation puposes. These accounts can be used for direct access to the portal.
</para>
</formalpara>
<para>
For security reasons, before going in production, you should restrict the access to the login servlet to POST.
</para>
<para>
- To do so, edit the file <filename>$JBOSS_HOME/server/[configuration]/gatein.ear/02portal.war/WEB-INF/web.xml</filename> and add:
+ To do so, edit the file <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/gatein.ear/02portal.war/WEB-INF/web.xml</filename> and add:
</para>
<programlisting language="XML" role="XML"><![CDATA[
<security-constraint>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -8,6 +8,20 @@
<title>Revision History</title>
<simpara>
<revhistory>
+ <revision>
+ <revnumber>1.7</revnumber>
+ <date>Thu Dec 02 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporated generic updates from 5.1 docs.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
<revision>
<revnumber>1.6</revnumber>
<date>Thu Sep 30 2010</date>
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Test_Your_Installation.xml 2010-12-02 02:57:17 UTC (rev 5432)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Test_Your_Installation.xml 2010-12-02 03:56:42 UTC (rev 5433)
@@ -15,7 +15,7 @@
<itemizedlist>
<listitem>
<para>
- move to the <filename>$JBOSS_HOME/bin</filename> directory;
+ move to the <filename><replaceable>JBOSS_HOME</replaceable>/bin</filename> directory;
</para>
</listitem>
<listitem>
@@ -24,7 +24,7 @@
<itemizedlist>
<listitem>
<para>
- Ensure that you run the configuration corresponding to the <filename>$JBOSS_HOME/server/$CONFIG/</filename> chosen in <xref linkend="form-Portal_EAP-Using_a_MySQL_Database-Creating_a_MySQL_Database"></xref>
+ Ensure that you run the configuration corresponding to the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/</filename> chosen in <xref linkend="form-Portal_EAP-Using_a_MySQL_Database-Creating_a_MySQL_Database"></xref>
</para>
</listitem>
</itemizedlist>
@@ -33,7 +33,7 @@
</itemizedlist>
</para>
<para>
- The example below uses the production configuration. Your output should look like the following (accounting for installation directory differences) and should not contain any error or exception messages:
+ The example below 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>
<programlisting>
[user@localhost bin]$ ./run.sh -c production
@@ -70,7 +70,7 @@
</programlisting>
<note><title>Note: Production server log file</title>
<para>
- There is no "Server Started" message shown at the console when the server is started using the <literal>production</literal> profile. This message may be observed in the <filename>server.log</filename> file located in the <filename>server/production/log</filename> subdirectory.
+ There is no "Server Started" message shown at the console when the server is started using the <literal>production</literal> profile. This message may be observed in the <filename>server.log</filename> file located in the <filename><replaceable>JBOSS_HOME</replaceable>/server/production/log</filename> subdirectory.
</para>
</note>
@@ -78,7 +78,7 @@
Ensure that port 8080 is not already in use and open <literal>http://localhost:8080/portal</literal> in your web browser.
<footnote>
<para>
- Note that on some machines, the name localhost won’t resolve properly and you should use the local loopback address 127.0.0.1 instead.
+ Note that on some machines, the name localhost won’t resolve properly and you should use the local loopback address <ulink type="http" url="127.0.0.1">127.0.0.1</ulink> instead.
</para>
</footnote>
The contents of your page should look similar to this: <xref linkend="Test_your_Installation-Test_your_Installation" />.
@@ -97,7 +97,7 @@
</figure>
</para>
<para>
- You are now ready to use &PRODUCT; 5.0. Refer to the User Guide and Reference Guide for more information about the product's feature set and example applications showcasing &PRODUCT; in action.
+ You are now ready to use &PRODUCT;. Refer to the User Guide and Reference Guide for more information about the product's feature set and example applications showcasing &PRODUCT; in action.
</para>
</chapter>
14 years
gatein SVN: r5432 - in exo/portal/branches/webos-gatein-branch: component and 81 other directories.
by do-not-reply@jboss.org
Author: trong.tran
Date: 2010-12-01 21:57:17 -0500 (Wed, 01 Dec 2010)
New Revision: 5432
Modified:
exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml
exo/portal/branches/webos-gatein-branch/component/common/pom.xml
exo/portal/branches/webos-gatein-branch/component/identity/pom.xml
exo/portal/branches/webos-gatein-branch/component/management/pom.xml
exo/portal/branches/webos-gatein-branch/component/pc/pom.xml
exo/portal/branches/webos-gatein-branch/component/pom.xml
exo/portal/branches/webos-gatein-branch/component/portal/pom.xml
exo/portal/branches/webos-gatein-branch/component/resources/pom.xml
exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml
exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml
exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml
exo/portal/branches/webos-gatein-branch/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml
exo/portal/branches/webos-gatein-branch/server/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml
exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml
exo/portal/branches/webos-gatein-branch/starter/pom.xml
exo/portal/branches/webos-gatein-branch/starter/war/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml
exo/portal/branches/webos-gatein-branch/web/pom.xml
exo/portal/branches/webos-gatein-branch/web/portal/pom.xml
exo/portal/branches/webos-gatein-branch/web/rest/pom.xml
exo/portal/branches/webos-gatein-branch/webui/core/pom.xml
exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml
exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml
exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml
exo/portal/branches/webos-gatein-branch/webui/pom.xml
exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml
exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml
Log:
Change version to SNAPSHOT for developing
Modified: exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/common/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/common/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/common/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/component/identity/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/identity/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/identity/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/management/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/management/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/management/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/pc/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/pc/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/pc/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/component/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/portal/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/portal/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/resources/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/resources/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/resources/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/test/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/web/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>gatein-api</artifactId>
@@ -36,4 +36,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
@@ -36,4 +36,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
@@ -37,4 +37,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
@@ -172,4 +172,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/gadgets/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.ear</artifactId>
<packaging>ear</packaging>
@@ -491,4 +491,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -4,9 +4,9 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
<name>GateIn JBoss AS integration.war</name>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.pkg</artifactId>
<packaging>pom</packaging>
@@ -208,4 +208,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as</artifactId>
<packaging>pom</packaging>
@@ -16,4 +16,4 @@
<module>ear</module>
<module>pkg</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/packaging/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -362,68 +362,68 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -433,95 +433,95 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>gatein.portal.component.wsrp</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat.plugin</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</dependency>
<!-- Chromattic -->
Modified: exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/portlet/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/portlet/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -9,4 +9,4 @@
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
<name>GateIn JBoss AS integration.war</name>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/server/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/starter/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/starter/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/starter/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/starter/war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/starter/war/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/starter/war/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/testsuite/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/testsuite/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/web/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/web/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/web/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/portal/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/web/portal/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/web/rest/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/rest/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/web/rest/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/core/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/core/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/core/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml 2010-12-02 01:50:18 UTC (rev 5431)
+++ exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml 2010-12-02 02:57:17 UTC (rev 5432)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta02-webos</version>
+ <version>3.2.0-Beta02-webos-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years
gatein SVN: r5431 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues.
by do-not-reply@jboss.org
Author: hangnguyen
Date: 2010-12-01 20:50:18 -0500 (Wed, 01 Dec 2010)
New Revision: 5431
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html
Log:
TESTVN-2082 - Daily tests on GateIn
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2010-12-02 01:50:18 UTC (rev 5431)
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Add some users into group in case after comma has space --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Go to User and Group management --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Users and groups management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Group management --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='GroupManagementIcon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@class='GroupManagementIcon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Customers</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Customers</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Input user name have space after comma--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root, john, demo</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- http://jira.exoplatform.org/browse/SELEGEN-37 --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>membership</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>membership</td>
+ <td>label=validator</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>demo</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>demo</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>john</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>john</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>root</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>root</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user1--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//img[@alt='DeleteUser']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@alt='DeleteUser']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete user demo from group customers?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user2--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//img[@alt='DeleteUser']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@alt='DeleteUser']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete user john from group customers?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user3--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//img[@alt='DeleteUser']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@alt='DeleteUser']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete user root from group customers?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years
gatein SVN: r5430 - in portal/branches/navcontroller/component/web/controller/src: main/java/org/exoplatform/web/controller/router and 2 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-12-01 17:00:26 -0500 (Wed, 01 Dec 2010)
New Revision: 5430
Added:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/GroupType.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java
Removed:
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRegExpAnalyser.java
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RENode.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteEscaper.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java
Log:
support for more special constructs
Added: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/GroupType.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/GroupType.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/GroupType.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.web.controller.regexp;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public enum GroupType
+{
+
+ CAPTURING_GROUP("(", ")"),
+
+ NON_CAPTURING_GROUP("(?:", ")"),
+
+ POSITIVE_LOOKAHEAD("(?=", ")"),
+
+ NEGATIVE_LOOKAHEAD("(?!", ")"),
+
+ POSITIVE_LOOKBEHIND("(?<=", ")"),
+
+ NEGATIVE_LOOKBEHIND("(?<!", ")");
+
+ /** . */
+ private final String open;
+
+ /** . */
+ private final String close;
+
+ GroupType(String open, String close)
+ {
+ this.open = open;
+ this.close = close;
+ }
+
+ public String getOpen()
+ {
+ return open;
+ }
+
+ public String getClose()
+ {
+ return close;
+ }
+}
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RENode.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RENode.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RENode.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -19,6 +19,8 @@
package org.exoplatform.web.controller.regexp;
+import java.util.EnumMap;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
@@ -235,15 +237,15 @@
{
/** . */
- private final Ref<Disjunction> disjunction;
+ private GroupType type;
/** . */
- private boolean capturing;
+ private final Ref<Disjunction> disjunction;
- public Group(Disjunction disjunction, boolean capturing)
+ public Group(Disjunction disjunction, GroupType type)
{
this.disjunction = new NonNullableRef<Disjunction>(Disjunction.class, disjunction);
- this.capturing = capturing;
+ this.type = type;
}
public Disjunction getDisjunction()
@@ -256,20 +258,20 @@
this.disjunction.set(disjunction);
}
- public boolean isCapturing()
+ public GroupType getType()
{
- return capturing;
+ return type;
}
- public void setCapturing(boolean capturing)
+ public void setType(GroupType type)
{
- this.capturing = capturing;
+ this.type = type;
}
@Override
protected void writeTo(StringBuilder sb)
{
- sb.append("<").append(capturing ? "(" : "(?:").append('>').append(disjunction.get()).append("</").append(capturing ? ")" : ":?)").append(">");
+ sb.append("<").append(type.getOpen()).append('>').append(disjunction.get()).append("</").append(type.getOpen()).append(">");
}
}
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -151,23 +151,52 @@
// Do we have a special construct ?
int startGroup = index + 1;
- boolean capturing = true;
+ GroupType type = GroupType.CAPTURING_GROUP;
if (startGroup < endGroup)
{
if (s.charAt(startGroup) == '?')
{
if (startGroup + 1 < endGroup)
{
- if (s.charAt(startGroup + 1) == ':')
+ switch (s.charAt(startGroup + 1))
{
- // It's a non capturing group, so it's ok
- startGroup += 2;
- capturing = false;
+ case ':':
+ startGroup += 2;
+ type = GroupType.NON_CAPTURING_GROUP;
+ break;
+ case '=':
+ startGroup += 2;
+ type = GroupType.POSITIVE_LOOKAHEAD;
+ break;
+ case '!':
+ startGroup += 2;
+ type = GroupType.NEGATIVE_LOOKAHEAD;
+ break;
+ case '<':
+ if (startGroup + 2 < endGroup)
+ {
+ switch (s.charAt(startGroup + 2))
+ {
+ case '=':
+ startGroup += 3;
+ type = GroupType.POSITIVE_LOOKBEHIND;
+ break;
+ case '!':
+ startGroup += 3;
+ type = GroupType.NEGATIVE_LOOKBEHIND;
+ break;
+ default:
+ throw createSyntaxException("Syntax not supported", index + 1, index + 4);
+ }
+ }
+ else
+ {
+ throw createSyntaxException("Syntax not supported", index + 1, index + 3);
+ }
+ break;
+ default:
+ throw createSyntaxException("Syntax not supported", index + 1, index + 3);
}
- else
- {
- throw createSyntaxException("Only non capturing group syntax is supported", index + 1, index + 3);
- }
}
else
{
@@ -178,7 +207,7 @@
//
RENode.Disjunction grouped = new RegExpParser(s, startGroup, endGroup).parseDisjunction();
- exp = new RENode.Group(grouped, capturing);
+ exp = new RENode.Group(grouped, type);
index = endGroup + 1;
break;
case '*':
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -99,9 +99,9 @@
else if (expression instanceof RENode.Group)
{
RENode.Group group = (RENode.Group)expression;
- appendable.append("(?:");
+ appendable.append(group.getType().getOpen());
this.render(group.getDisjunction(), appendable);
- appendable.append(")");
+ appendable.append(group.getType().getClose());
quantifier = expression.getQuantifier();
}
else if (expression instanceof RENode.Char)
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteEscaper.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteEscaper.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteEscaper.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -19,6 +19,7 @@
package org.exoplatform.web.controller.router;
+import org.exoplatform.web.controller.regexp.GroupType;
import org.exoplatform.web.controller.regexp.RENode;
/**
@@ -76,7 +77,7 @@
}
}
- public void visit(RENode.Expr expr)
+ public void visit(RENode.Expr expr) throws MalformedRegExpException
{
if (expr instanceof RENode.Char)
{
@@ -86,8 +87,19 @@
c.setValue(dst);
}
}
- if (expr instanceof RENode.Any)
+ else if (expr instanceof RENode.Group)
{
+ RENode.Group group = (RENode.Group)expr;
+/*
+ if (group.getType() == GroupType.CAPTURING_GROUP)
+ {
+ group.setType(GroupType.NON_CAPTURING_GROUP);
+ }
+*/
+ visit(group.getDisjunction());
+ }
+ else if (expr instanceof RENode.Any)
+ {
RENode.CharacterClass repl = new RENode.CharacterClass(new RENode.CharacterClassExpr.Not(new RENode.CharacterClassExpr.Char('/')));
repl.setQuantifier(expr.getQuantifier());
expr.replaceBy(repl);
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -184,11 +184,16 @@
public void testGroup()
{
- new ParserTester("(a)").assertParseExpression("<(><c>a</c></)>", 3);
- new ParserTester("(a(b)c)").assertParseExpression("<(><c>a</c><(><c>b</c></)><c>c</c></)>", 7);
- new ParserTester("(?:a)").assertParseExpression("<(?:><c>a</c></:?)>", 5);
+ new ParserTester("(a)").assertParseExpression("<(><c>a</c></(>", 3);
+ new ParserTester("(a(b)c)").assertParseExpression("<(><c>a</c><(><c>b</c></(><c>c</c></(>", 7);
+ new ParserTester("(?:a)").assertParseExpression("<(?:><c>a</c></(?:>", 5);
+ new ParserTester("(?=a)").assertParseExpression("<(?=><c>a</c></(?=>", 5);
+ new ParserTester("(?!a)").assertParseExpression("<(?!><c>a</c></(?!>", 5);
+ new ParserTester("(?<=a)").assertParseExpression("<(?<=><c>a</c></(?<=>", 6);
+ new ParserTester("(?<!a)").assertParseExpression("<(?<!><c>a</c></(?<!>", 6);
new ParserTester("(?)").assertNotParseExpression();
- new ParserTester("(?a)").assertNotParseExpression();
+ new ParserTester("(?_)").assertNotParseExpression();
+ new ParserTester("(?<_)").assertNotParseExpression();
}
// missing stuff:
Copied: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java (from rev 5377, portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRegExpAnalyser.java)
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.web.controller.regexp;
+
+import org.exoplatform.component.test.BaseGateInTest;
+import org.exoplatform.web.controller.regexp.RegExpRenderer;
+import org.exoplatform.web.controller.regexp.RENode;
+import org.exoplatform.web.controller.regexp.RegExpParser;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestRegExpAnalyser extends BaseGateInTest
+{
+
+ /** . */
+ private RegExpRenderer renderer = new RegExpRenderer();
+
+ private void assertAnalyse(String expectedPattern, String pattern)
+ {
+ try
+ {
+ RENode.Disjunction disjunction = new RegExpParser(pattern).parseDisjunction();
+ assertEquals(expectedPattern, renderer.render(disjunction, new StringBuilder()).toString());
+ }
+ catch (Exception e)
+ {
+ fail(e);
+ }
+ }
+
+ public void testCharacterClass()
+ {
+ assertAnalyse("[a]", "[a]");
+ assertAnalyse("[ab]", "[ab]");
+ assertAnalyse("[ab]", "[a[b]]");
+ assertAnalyse("[abc]", "[abc]");
+ assertAnalyse("[abc]", "[[a]bc]");
+ assertAnalyse("[abc]", "[a[b]c]");
+ assertAnalyse("[abc]", "[ab[c]]");
+ assertAnalyse("[abc]", "[[ab]c]");
+ assertAnalyse("[abc]", "[a[bc]]");
+ assertAnalyse("[abc]", "[[abc]]");
+ assertAnalyse("[^a]", "[^a]");
+ }
+
+ public void testGroupContainer()
+ {
+ assertAnalyse("(a)", "(a)");
+ assertAnalyse("(a(?:b))", "(a(?:b))");
+ assertAnalyse("(?:a(b))", "(?:a(b))");
+ assertAnalyse("(a)(?:b)", "(a)(?:b)");
+ assertAnalyse("(a(b))", "(a(b))");
+ assertAnalyse("(a)(b)", "(a)(b)");
+
+ //
+ assertAnalyse("(?=a)", "(?=a)");
+ assertAnalyse("(?!a)", "(?!a)");
+ assertAnalyse("(?<=a)", "(?<=a)");
+ assertAnalyse("(?<!a)", "(?<!a)");
+ }
+
+ public void testBilto()
+ {
+ assertAnalyse("[a]+", "[a]+");
+ }
+}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -191,6 +191,31 @@
assertNull(router.route("/abcdef"));
}
+/*
+ public void testLookAhead() throws Exception
+ {
+ Router router = router().
+ add(route("/{a}").
+ with(
+ pathParam("a").matchedBy("(.(?=/))?").preservingPath()).
+ sub(route("/{b}").
+ with(pathParam("b").matchedBy(".").preservingPath()))
+ ).build();
+
+ //
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(QualifiedName.create("a"), "");
+ expectedParameters.put(QualifiedName.create("b"), "b");
+ assertEquals(expectedParameters, router.route("/b"));
+ assertEquals("/b", router.render(expectedParameters));
+
+ //
+ expectedParameters.put(QualifiedName.create("a"), "a");
+ assertEquals(expectedParameters, router.route("/a/b"));
+ assertEquals("/a/b", router.render(expectedParameters));
+ }
+*/
+
public void testZeroOrOneFollowedBySubRoute() throws Exception
{
Router router = router().
Deleted: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRegExpAnalyser.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRegExpAnalyser.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRegExpAnalyser.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.web.controller.router;
-
-import org.exoplatform.component.test.BaseGateInTest;
-import org.exoplatform.web.controller.regexp.RegExpRenderer;
-import org.exoplatform.web.controller.regexp.RENode;
-import org.exoplatform.web.controller.regexp.RegExpParser;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class TestRegExpAnalyser extends BaseGateInTest
-{
-
- /** . */
- private RegExpRenderer analyser = new RegExpRenderer();
-
- private void assertAnalyse(String expectedPattern, String pattern)
- {
- try
- {
- RENode.Disjunction disjunction = new RegExpParser(pattern).parseDisjunction();
- assertEquals(expectedPattern, analyser.render(disjunction, new StringBuilder()).toString());
- }
- catch (Exception e)
- {
- fail(e);
- }
- }
-
- public void testCharacterClass()
- {
- assertAnalyse("[a]", "[a]");
- assertAnalyse("[ab]", "[ab]");
- assertAnalyse("[ab]", "[a[b]]");
- assertAnalyse("[abc]", "[abc]");
- assertAnalyse("[abc]", "[[a]bc]");
- assertAnalyse("[abc]", "[a[b]c]");
- assertAnalyse("[abc]", "[ab[c]]");
- assertAnalyse("[abc]", "[[ab]c]");
- assertAnalyse("[abc]", "[a[bc]]");
- assertAnalyse("[abc]", "[[abc]]");
- assertAnalyse("[^a]", "[^a]");
- }
-
- public void testGroupContainer()
- {
- assertAnalyse("(?:a)", "(a)");
- assertAnalyse("(?:a(?:b))", "(a(?:b))");
- assertAnalyse("(?:a(?:b))", "(?:a(b))");
- assertAnalyse("(?:a)(?:b)", "(a)(?:b)");
- assertAnalyse("(?:a(?:b))", "(a(b))");
- assertAnalyse("(?:a)(?:b)", "(a)(b)");
- }
-
- public void testBilto()
- {
- assertAnalyse("[a]+", "[a]+");
- }
-}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java 2010-12-01 17:48:13 UTC (rev 5429)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java 2010-12-01 22:00:26 UTC (rev 5430)
@@ -56,4 +56,14 @@
match("[/a]*", "_a_/_", "_a_");
match("[,-1&&[^/]]*", "_/_", "");
}
+
+ public void testGroup() throws Exception
+ {
+ match("(/)", "_", "_");
+ match("(?:/)", "_", "_");
+ match(".(?=/)", "a_", "a");
+ match("a(?!/)", "ab", "a");
+ match(".(?<=/)a", "ba_a", "_a");
+ match(".(?<!/)a", "_aba", "ba");
+ }
}
14 years
gatein SVN: r5429 - portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-12-01 12:48:13 -0500 (Wed, 01 Dec 2010)
New Revision: 5429
Modified:
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
Log:
unit test for partial matching
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 17:40:53 UTC (rev 5428)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 17:48:13 UTC (rev 5429)
@@ -179,6 +179,18 @@
assertEquals("/b", router.render(expectedParameters));
}
+ public void testPartialMatching() throws Exception
+ {
+ Router router = router().
+ add(route("/{a}").
+ with(
+ pathParam("a").matchedBy("abc").preservingPath())
+ ).build();
+
+ //
+ assertNull(router.route("/abcdef"));
+ }
+
public void testZeroOrOneFollowedBySubRoute() throws Exception
{
Router router = router().
14 years
gatein SVN: r5428 - in portal/branches/navcontroller/component/web/controller/src: test/java/org/exoplatform/web/controller/router and 1 other directory.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-12-01 12:40:53 -0500 (Wed, 01 Dec 2010)
New Revision: 5428
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
Log:
allow to match empty parameters
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 17:13:39 UTC (rev 5427)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 17:40:53 UTC (rev 5428)
@@ -520,12 +520,14 @@
{
nextPath = "/";
}
- else if (nextPos == 1)
- {
- nextPath = path;
- }
else
{
+ if (nextPos > 0 && path.charAt(nextPos - 1) == '/')
+ {
+ nextPos--;
+ }
+
+ //
nextPath = path.substring(nextPos);
}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 17:13:39 UTC (rev 5427)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 17:40:53 UTC (rev 5428)
@@ -157,6 +157,28 @@
assertEquals(Collections.singletonMap(QualifiedName.create("a"), ""), router.route("/b"));
}
+ public void testOptionalParameter() throws Exception
+ {
+ Router router = router().
+ add(route("/{a}/b").
+ with(
+ pathParam("a").matchedBy("a?").preservingPath(),
+ routeParam("b").withValue("b"))
+ ).build();
+
+ //
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(QualifiedName.create("a"), "a");
+ expectedParameters.put(QualifiedName.create("b"), "b");
+ assertEquals(expectedParameters, router.route("/a/b"));
+ assertEquals("/a/b", router.render(expectedParameters));
+
+ //
+ expectedParameters.put(QualifiedName.create("a"), "");
+ assertEquals(expectedParameters, router.route("/b"));
+ assertEquals("/b", router.render(expectedParameters));
+ }
+
public void testZeroOrOneFollowedBySubRoute() throws Exception
{
Router router = router().
14 years
gatein SVN: r5427 - in portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web: controller/router and 1 other directory.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-12-01 12:13:39 -0500 (Wed, 01 Dec 2010)
New Revision: 5427
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
Log:
- fix NPE
- print router during web app controller startup
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-12-01 16:46:44 UTC (rev 5426)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-12-01 17:13:39 UTC (rev 5427)
@@ -102,6 +102,9 @@
Router router = new Router(routerDesc);
//
+ System.out.println("router = " + router);
+
+ //
this.applications_ = new HashMap<String, Application>();
this.attributes_ = new HashMap<String, Object>();
this.handlers = new HashMap<String, WebRequestHandler>();
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 16:46:44 UTC (rev 5426)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 17:13:39 UTC (rev 5427)
@@ -104,7 +104,10 @@
writer.writeStartElement("request-param");
writer.writeAttribute("qname", requestParam.name.getValue());
writer.writeAttribute("name", requestParam.matchName);
- writer.writeAttribute("value", requestParam.matchValue.pattern());
+ if (requestParam.matchValue != null)
+ {
+ writer.writeAttribute("value", requestParam.matchValue.pattern());
+ }
writer.writeEndElement();
}
14 years
gatein SVN: r5426 - portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.
by do-not-reply@jboss.org
Author: mstruk
Date: 2010-12-01 11:46:44 -0500 (Wed, 01 Dec 2010)
New Revision: 5426
Modified:
portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml
Log:
GTNPORTAL-1713 Update ref-guide LocalePolicy chapter to reflect GTNPORTAL-1705 workaround
Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-12-01 14:57:38 UTC (rev 5425)
+++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-12-01 16:46:44 UTC (rev 5426)
@@ -243,7 +243,7 @@
<filter-mapping>
<filter-name>LocalizationFilter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>*.jsp</url-pattern>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
@@ -263,12 +263,16 @@
</init-param>
</filter> ]]>
</programlisting>
- <para>By default, <literal>LocalizationFilter</literal> is applied very broadly to cover all the resources automatically.
- &PRODUCT; uses some non-bridged .jsps that require <literal>LocalizationFilter</literal>, so narrowing
- the mapping to *.jsp is enough for &PRODUCT; to still function correctly. Additionally deployed portlets,
- and portal applications, however, may require broader mapping to cover their non-bridged resources.
+ <para>By default, <literal>LocalizationFilter</literal> is applied to *.jsp, which is considered the minimum
+ required by &PRODUCT; to properly keep its non-bridged resources in sync with the rest of the portal.
+ Additionally deployed portlets, and portal applications, may need broader mapping to cover their non-bridged
+ resources.
</para>
- <para>Narrowing the mapping might improve performance. This is something to consider, when optimizing for speed.
+ <para>Avoid using <literal>/*</literal>, <literal>/public/*</literal>, <literal>/private/*</literal>,
+ and similar broad mappings as <literal>LocalizationFilter</literal> sometimes adversely interacts with the
+ processing of portlet requests. Use multiple filter-mappings instead to specifically target non-bridged resources.
</para>
+ <para>Keeping the mapping limited to only non-bridged resources will minimize any impact on performance as well.
+ </para>
</section>
</section>
\ No newline at end of file
14 years
gatein SVN: r5425 - portal/trunk/web/portal/src/main/webapp/WEB-INF.
by do-not-reply@jboss.org
Author: mstruk
Date: 2010-12-01 09:57:38 -0500 (Wed, 01 Dec 2010)
New Revision: 5425
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml
Log:
GTNPORTAL-1705 wrong httpsession when instaling LocalizationFilter
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-12-01 13:36:16 UTC (rev 5424)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-12-01 14:57:38 UTC (rev 5425)
@@ -117,7 +117,7 @@
<filter-mapping>
<filter-name>LocalizationFilter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>*.jsp</url-pattern>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
14 years
gatein SVN: r5424 - in portal/branches/navcontroller/component/web/controller: src/main/java/org/exoplatform/web/controller/router and 1 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-12-01 08:36:16 -0500 (Wed, 01 Dec 2010)
New Revision: 5424
Modified:
portal/branches/navcontroller/component/web/controller/pom.xml
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Router.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
Log:
handle more correctly the case where a line is matched but not path is consumed
Modified: portal/branches/navcontroller/component/web/controller/pom.xml
===================================================================
--- portal/branches/navcontroller/component/web/controller/pom.xml 2010-12-01 10:54:56 UTC (rev 5423)
+++ portal/branches/navcontroller/component/web/controller/pom.xml 2010-12-01 13:36:16 UTC (rev 5424)
@@ -40,7 +40,21 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
</dependency>
+ <!-- Used only for pretty printing, need to find a better solution than this -->
+<!--
<dependency>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>20060502</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.bea.xml</groupId>
+ <artifactId>jsr173-ri</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+-->
+ <dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
<scope>test</scope>
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java 2010-12-01 10:54:56 UTC (rev 5423)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java 2010-12-01 13:36:16 UTC (rev 5424)
@@ -45,4 +45,10 @@
this.encodingMode = encodingMode;
this.pattern = pattern;
}
+
+ @Override
+ public String toString()
+ {
+ return "PathParam[name=" + name + ",encodingMode=" + encodingMode + ",pattern=" + pattern + "]";
+ }
}
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 10:54:56 UTC (rev 5423)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 13:36:16 UTC (rev 5424)
@@ -19,6 +19,7 @@
package org.exoplatform.web.controller.router;
+//import javanet.staxutils.IndentingXMLStreamWriter;
import org.exoplatform.web.controller.QualifiedName;
import org.exoplatform.web.controller.metadata.PathParamDescriptor;
import org.exoplatform.web.controller.metadata.RequestParamDescriptor;
@@ -29,7 +30,11 @@
import org.exoplatform.web.controller.regexp.RegExpParser;
import org.exoplatform.web.controller.regexp.SyntaxException;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import java.io.IOException;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -49,6 +54,100 @@
class Route
{
+
+ void writeTo(XMLStreamWriter writer) throws XMLStreamException
+ {
+ if (this instanceof SegmentRoute)
+ {
+ writer.writeStartElement("segment");
+ writer.writeAttribute("path", "/" + ((SegmentRoute)this).name);
+ writer.writeAttribute("terminal", "" + terminal);
+ }
+ else if (this instanceof PatternRoute)
+ {
+ PatternRoute pr = (PatternRoute)this;
+ StringBuilder path = new StringBuilder("/");
+ for (int i = 0;i < pr.params.size();i++)
+ {
+ path.append(pr.chunks.get(i)).append("{").append(pr.params.get(i).name.getValue()).append("}");
+ }
+ path.append(pr.chunks.get(pr.chunks.size() - 1));
+ writer.writeStartElement("pattern");
+ writer.writeAttribute("path", path.toString());
+ writer.writeAttribute("terminal", "" + terminal);
+ for (PathParam param : pr.params)
+ {
+ writer.writeStartElement("path-param");
+ writer.writeAttribute("qname", param.name.getValue());
+ writer.writeAttribute("encodingMode", param.encodingMode.toString());
+ writer.writeAttribute("pattern", param.pattern.toString());
+ writer.writeEndElement();
+ }
+ }
+ else
+ {
+ writer.writeStartElement("route");
+ }
+
+ //
+ for (RouteParam routeParam : routeParams.values())
+ {
+ writer.writeStartElement("route-param");
+ writer.writeAttribute("qname", routeParam.name.getValue());
+ writer.writeAttribute("value", routeParam.value);
+ writer.writeEndElement();
+ }
+
+ //
+ for (RequestParam requestParam : requestParams.values())
+ {
+ writer.writeStartElement("request-param");
+ writer.writeAttribute("qname", requestParam.name.getValue());
+ writer.writeAttribute("name", requestParam.matchName);
+ writer.writeAttribute("value", requestParam.matchValue.pattern());
+ writer.writeEndElement();
+ }
+
+ //
+ for (Map.Entry<String, List<SegmentRoute>> entry : segments.entrySet())
+ {
+ writer.writeStartElement("segment");
+ writer.writeAttribute("name", entry.getKey());
+ for (SegmentRoute segment : entry.getValue())
+ {
+ segment.writeTo(writer);
+ }
+ writer.writeEndElement();
+ }
+
+ //
+ for (PatternRoute pattern : patterns)
+ {
+ pattern.writeTo(writer);
+ }
+
+ //
+ writer.writeEndElement();
+ }
+
+ @Override
+ public String toString()
+ {
+ try
+ {
+ XMLOutputFactory factory = XMLOutputFactory.newInstance();
+ StringWriter sw = new StringWriter();
+ XMLStreamWriter xmlWriter = factory.createXMLStreamWriter(sw);
+// xmlWriter = new IndentingXMLStreamWriter(xmlWriter);
+ writeTo(xmlWriter);
+ return sw.toString();
+ }
+ catch (XMLStreamException e)
+ {
+ throw new AssertionError(e);
+ }
+ }
+
/** Julien : make that configurable. */
private static final char slashEscape = '_';
@@ -93,12 +192,17 @@
}
}
- private void _render(Map<QualifiedName, String> blah, RenderContext renderContext, boolean hasChildren)
+ private boolean _render(Map<QualifiedName, String> blah, RenderContext renderContext, boolean hasChildren)
{
+ boolean endWithSlash;
if (parent != null)
{
- parent._render(blah, renderContext, true);
+ endWithSlash = parent._render(blah, renderContext, true);
}
+ else
+ {
+ endWithSlash = false;
+ }
//
if (requestParams.size() > 0)
@@ -117,19 +221,38 @@
if (this instanceof SegmentRoute)
{
SegmentRoute sr = (SegmentRoute)this;
- renderContext.appendPath('/', false);
- renderContext.appendPath(sr.name, true);
+ if (!endWithSlash)
+ {
+ renderContext.appendPath('/', false);
+ endWithSlash = true;
+ }
+ String name = sr.name;
+ renderContext.appendPath(name, true);
+ if (name.length() > 0)
+ {
+ endWithSlash = false;
+ }
}
else if (this instanceof PatternRoute)
{
PatternRoute pr = (PatternRoute)this;
- renderContext.appendPath('/', false);
+ if (!endWithSlash)
+ {
+ renderContext.appendPath('/', false);
+ endWithSlash = true;
+ }
int i = 0;
+ int count = 0;
while (i < pr.params.size())
{
- renderContext.appendPath(pr.chunks.get(i), true);
+ String chunk = pr.chunks.get(i);
+ renderContext.appendPath(chunk, true);
+ count += chunk.length();
+
+ //
PathParam def = pr.params.get(i);
String value = blah.get(def.name);
+ count += value.length();
//
int from = 0;
@@ -152,15 +275,25 @@
//
i++;
}
- renderContext.appendPath(pr.chunks.get(i), false);
+ String lastChunk = pr.chunks.get(i);
+ renderContext.appendPath(lastChunk, false);
+ count += lastChunk.length();
+ if (count > 0)
+ {
+ endWithSlash = false;
+ }
}
else
{
if (!hasChildren)
{
renderContext.appendPath('/', false);
+ endWithSlash = true;
}
}
+
+ //
+ return endWithSlash;
}
final Route find(Map<QualifiedName, String> blah)
@@ -384,6 +517,10 @@
{
nextPath = "/";
}
+ else if (nextPos == 1)
+ {
+ nextPath = path;
+ }
else
{
nextPath = path.substring(nextPos);
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Router.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Router.java 2010-12-01 10:54:56 UTC (rev 5423)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Router.java 2010-12-01 13:36:16 UTC (rev 5424)
@@ -76,4 +76,10 @@
{
return root.route(path, queryParams);
}
+
+ @Override
+ public String toString()
+ {
+ return "Router[" + root.toString() + "]";
+ }
}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 10:54:56 UTC (rev 5423)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-12-01 13:36:16 UTC (rev 5424)
@@ -156,4 +156,28 @@
assertEquals(Collections.singletonMap(QualifiedName.create("a"), "fr/"), router.route("/fr/b"));
assertEquals(Collections.singletonMap(QualifiedName.create("a"), ""), router.route("/b"));
}
+
+ public void testZeroOrOneFollowedBySubRoute() throws Exception
+ {
+ Router router = router().
+ add(route("/{a}").
+ with(
+ pathParam("a").matchedBy("a?").preservingPath()).
+ sub(route("/b").
+ with(
+ routeParam("b").withValue("b")))
+ ).build();
+
+ //
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(QualifiedName.create("a"), "a");
+ expectedParameters.put(QualifiedName.create("b"), "b");
+ assertEquals(expectedParameters, router.route("/a/b"));
+ assertEquals("/a/b", router.render(expectedParameters));
+
+ //
+ expectedParameters.put(QualifiedName.create("a"), "");
+ assertEquals(expectedParameters, router.route("/b"));
+ assertEquals("/b", router.render(expectedParameters));
+ }
}
14 years