gatein SVN: r2907 - portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-30 02:40:45 -0400 (Fri, 30 Apr 2010)
New Revision: 2907
Modified:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html
Log:
EPP UI tests: improved test SNF_PRL_29
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html 2010-04-29 23:59:46 UTC (rev 2906)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html 2010-04-30 06:40:45 UTC (rev 2907)
@@ -128,21 +128,6 @@
</tr>
<tr>
<td>echo</td>
- <td>--Open Editor pane</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@onclick='eXo.portal.UIPortal.toggleComposer(this)']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>xpath=//div[@onclick='eXo.portal.UIPortal.toggleComposer(this)']</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>--Click Save to complete adding page</td>
<td></td>
</tr>
@@ -239,7 +224,7 @@
<tr>
<td>clickAt</td>
<td>link=Edit Layout</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -254,7 +239,7 @@
<tr>
<td>clickAt</td>
<td>link=Portal Properties</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -297,18 +282,23 @@
<td>1,1</td>
</tr>
<tr>
+ <td>pause</td>
+ <td>3000</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>--Delete page</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='SelectedTab']//img[@class='CloseIcon']</td>
+ <td>xpath=//div[@class='SelectedTab']//a</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='SelectedTab']//img[@class='CloseIcon']</td>
+ <td>xpath=//div[@class='SelectedTab']//a</td>
<td></td>
</tr>
<tr>
14 years
- 1
- 0
gatein SVN: r2906 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules: PortalDevelopment and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-04-29 19:59:46 -0400 (Thu, 29 Apr 2010)
New Revision: 2906
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
Log:
JBEPP-276: publican clean_ids, minor xml coding, some image work
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -113,7 +113,7 @@
<property name="swap-directory" value="../temp/swap/production" />
</properties>
<value-storages>
- see "<link linkend="list-Reference_Guide-conf_value_storage">Value storage configuration</link>" part.
+ <emphasis>(See item 1 in the list in <xref linkend="sect-Reference_Guide-Requirements-Environment_requirements"/>)</emphasis>
</value-storages>
</container>
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
@@ -122,13 +122,13 @@
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
- see "<link linkend="list-Reference_Guide-conf_cache">Cache configuration</link>" part.
+ <emphasis>(See item 2 in the list in <xref linkend="sect-Reference_Guide-Requirements-Environment_requirements"/>)</emphasis>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- see "<link linkend="list-Reference_Guide-conf_indexer">Indexer configuration</link>" part.
+ <emphasis>(See item 3 in the list in <xref linkend="sect-Reference_Guide-Requirements-Environment_requirements"/>)</emphasis>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
- see "<link linkend="list-Reference_Guide-conf_lock_manager">Lock Manager configuration</link>" part.
+ <emphasis>(See item 4 in the list in <xref linkend="sect-Reference_Guide-Requirements-Environment_requirements"/>)</emphasis>
</lock-manager>
</workspace>
<workspace name="ws2">
@@ -192,8 +192,8 @@
<para>
Configuration of every workspace in repository must contains of such parts:
</para>
- <itemizedlist>
- <listitem id="list-Reference_Guide-conf_value_storage">
+ <orderedlist>
+ <listitem>
<para>
Value Storage configuration:
</para>
@@ -267,7 +267,8 @@
</lock-manager>
</programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
+
</section>
</section>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -66,12 +66,12 @@
<itemizedlist>
<listitem>
<para>
- <parameter>source-name</parameter> - JNDI source name configured in <classname>InitialContextInitializer</classname> component. (<parameter>sourceName</parameter> prior v.1.9.) Find more in <link linkend="sect-Reference_Guide-eXo_JCR_configuration">database configuration</link>.
+ <parameter>source-name</parameter> - JNDI source name configured in <classname>InitialContextInitializer</classname> component. (<parameter>sourceName</parameter> prior v.1.9.) Find more in <xref linkend="sect-Reference_Guide-eXo_JCR_configuration"/>.
</para>
</listitem>
<listitem>
<para>
- <parameter>dialect</parameter> - SQL dialect which will be used with database from <parameter>source-name</parameter>. Find more in <link linkend="sect-Reference_Guide-eXo_JCR_configuration">database configuration</link>.
+ <parameter>dialect</parameter> - SQL dialect which will be used with database from <parameter>source-name</parameter>. Find more in <xref linkend="sect-Reference_Guide-eXo_JCR_configuration"/>.
</para>
</listitem>
<listitem>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -10,17 +10,17 @@
<itemizedlist>
<listitem>
<para>
- <link linkend="sect-Reference_Guide-Search_Configuration">Search Configuration</link>
+ <xref linkend="sect-Reference_Guide-Search_Configuration"/>
</para>
</listitem>
<listitem>
<para>
- <link linkend="sect-Reference_Guide-JDBC_Data_Container_Config">JDBC Data Container config</link>
+ <xref linkend="sect-Reference_Guide-JDBC_Data_Container_Config"/>
</para>
</listitem>
<listitem>
<para>
- <link linkend="sect-Reference_Guide-External_Value_Storages">External Value Storages</link>
+ <xref linkend="sect-Reference_Guide-External_Value_Storages"/>
</para>
</listitem>
</itemizedlist>
@@ -234,164 +234,361 @@
</repositories>
</repository-service>
</programlisting>
- <para>
- Repository Service configuration:
- </para>
- <para>
- default-repository - the name of a default repository (one returned by RepositoryService.getRepository())
- </para>
- <para>
- repositories - the list of repositories
- </para>
- <para>
- Repository configuration:
- </para>
- <para>
- name - the name of a repository
- </para>
- <para>
- default-workspace - the name of a workspace obtained using Session's login() or login(Credentials) methods (ones without an explicit workspace name)
- </para>
- <para>
- system-workspace - name of workspace where /jcr:system node is placed
- </para>
- <para>
- security-domain - the name of a security domain for JAAS authentication
- </para>
- <para>
- access-control - the name of an access control policy. There can be 3 types: optional - ACL is created on-demand(default), disable - no access control, mandatory - an ACL is created for each added node(not supported yet)
- </para>
- <para>
- authentication-policy - the name of an authentication policy class
- </para>
- <para>
- workspaces - the list of workspaces
- </para>
- <para>
- session-max-age - the time after which an idle session will be removed (called logout). If not set, the idle session will never be removed.
- </para>
- <para>
- Workspace configuration:
- </para>
- <para>
- name - the name of a workspace
- </para>
- <para>
- auto-init-root-nodetype - DEPRECATED in JCR 1.9 (use initializer). The node type for root node initialization
- </para>
- <para>
- container - workspace data container (physical storage) configuration
- </para>
- <para>
- initializer - workspace initializer configuration
- </para>
- <para>
- cache - workspace storage cache configuration
- </para>
- <para>
- query-handler - query handler configuration
- </para>
- <para>
- Workspace data container configuration:
- </para>
- <para>
- class - A workspace data container class name
- </para>
- <para>
- properties - the list of properties (name-value pairs) for the concrete Workspace data container
- </para>
- <para>
- value-storages - the list of value storage plugins
- </para>
- <para>
- Value Storage plugin configuration (optional feature):
- </para>
+
+ <variablelist>
+ <title>Repository Service configuration:</title>
+ <varlistentry>
+ <term>default-repository</term>
+ <listitem>
+ <para>
+ The name of a default repository (one returned by RepositoryService.getRepository())
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>repositories</term>
+ <listitem>
+ <para>
+ The list of repositories.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Repository configuration:</title>
+ <varlistentry>
+ <term>name</term>
+ <listitem>
+ <para>
+ The name of a repository.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>default-workspace</term>
+ <listitem>
+ <para>
+ The name of a workspace obtained using Session's login() or login(Credentials) methods (ones without an explicit workspace name).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>system-workspace</term>
+ <listitem>
+ <para>
+ The name of workspace where /jcr:system node is placed.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>security-domain</term>
+ <listitem>
+ <para>
+ The name of a security domain for JAAS authentication
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>access-control</term>
+ <listitem>
+ <para>
+ The name of an access control policy. There can be 3 types: optional - ACL is created on-demand(default), disable - no access control, mandatory - an ACL is created for each added node(not supported yet)
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>authentication-policy</term>
+ <listitem>
+ <para>
+ The name of an authentication policy class
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>workspaces</term>
+ <listitem>
+ <para>
+ The list of workspaces.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>session-max-age</term>
+ <listitem>
+ <para>
+ The time after which an idle session will be removed (called logout). If not set, the idle session will never be removed.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Workspace configuration:</title>
+ <varlistentry>
+ <term>name</term>
+ <listitem>
+ <para>
+ The name of a workspace.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>auto-init-root-nodetype</term>
+ <listitem>
+ <para>
+ DEPRECATED in JCR 1.9 (use initializer). The node type for root node initialization.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>container</term>
+ <listitem>
+ <para>
+ Workspace data container (physical storage) configuration.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>initializer</term>
+ <listitem>
+ <para>
+ Workspace initializer configuration.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>cache</term>
+ <listitem>
+ <para>
+ Workspace storage cache configuration.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>query-handler</term>
+ <listitem>
+ <para>
+ Query handler configuration.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <formalpara>
+ <title>Workspace data container configuration:</title>
+ <para></para>
+ </formalpara>
+ <variablelist>
+ <varlistentry>
+ <term>class</term>
+ <listitem>
+ <para>
+ A workspace data container class name.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>properties</term>
+ <listitem>
+ <para>
+ The list of properties (name-value pairs) for the concrete Workspace data container.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>value-storages</term>
+ <listitem>
+ <para>
+ The list of value storage plugins.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Value Storage plugin configuration (optional feature):</title>
+ <varlistentry>
+ <term>value-storage</term>
+ <listitem>
+ <para>
+ Optional value Storage plugin definition.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>class</term>
+ <listitem>
+ <para>
+ A value storage plugin class name (attribute)
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>properties</term>
+ <listitem>
+ <para>
+ The list of properties (name-value pairs) for a concrete Value Storage plugin.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>filters</term>
+ <listitem>
+ <para>
+ The list of filters defining conditions when this plugin is applicable.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<note>
<para>
The value-storage element is optional. If you don't include it, the values will be stored as BLOBs inside the database.
</para>
</note>
- <para>
- value-storage - Optional value Storage plugin definition
- </para>
- <para>
- class- a value storage plugin class name (attribute)
- </para>
- <para>
- properties - the list of properties (name-value pairs) for a concrete Value Storage plugin
- </para>
- <para>
- filters - the list of filters defining conditions when this plugin is applicable
- </para>
- <para>
- Initializer configuration (optional):
- </para>
- <para>
- class - initializer implementation class.
- </para>
- <para>
- properties - the list of properties (name-value pairs). Properties are supported:
- </para>
- <para>
- root-nodetype - The node type for root node initialization
- </para>
- <para>
- root-permissions - Default permissions of the root node. It is defined as a set of semicolon-delimited permissions containing a group of space-delimited identities (user, group etc, see Organization service documentation for details) and the type of permission. For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a 'read' permission.
- </para>
- <para>
- Configurable initializer adds a capability to override workspace initial startup procedure.
- </para>
- <para>
- Cache configuration:
- </para>
- <para>
- enabled - if workspace cache is enabled
- </para>
- <para>
- class - cache implementation class, optional from 1.9. Default value is org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl.
- </para>
- <para>
- Cache can be configured to use concrete implementation of WorkspaceStorageCache interface. JCR core has two implementation to use: * LinkedWorkspaceStorageCacheImpl - default, with configurable read behavior and statistic. * WorkspaceStorageCacheImpl - pre 1.9, still can be used.
- </para>
- <para>
- properties - the list of properties (name-value pairs) for Workspace cache:
- </para>
- <para>
- max-size - cache maximum size.
- </para>
- <para>
- live-time - cached item live time.
- </para>
- <para>
- LinkedWorkspaceStorageCacheImpl supports additional optional parameters TODO
- </para>
- <para>
- Query Handler configuration:
- </para>
- <para>
- class - A Query Handler class name
- </para>
- <para>
- properties - the list of properties (name-value pairs) for a Query Handler (indexDir) properties and advanced features described in *Search Configuration*
- </para>
- <para>
- Lock Manager configuration:
- </para>
- <para>
- time-out - time after which the unused global lock will be removed.
- </para>
- <para>
- persister - a class for storing lock information for future use. For example, remove lock after jcr restart.
- </para>
- <para>
- path - a lock folder, each workspace has its own.
- </para>
- <para>
- </para>
- <para>
- Configuration definition:
- </para>
-
+
+ <variablelist>
+ <title>Initializer configuration (optional):</title>
+ <varlistentry>
+ <term>class</term>
+ <listitem>
+ <para>
+ Initializer implementation class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>properties</term>
+ <listitem>
+ <para>
+ The list of properties (name-value pairs). Properties are supported:
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>root-nodetype</term>
+ <listitem>
+ <para>
+ The node type for root node initialization
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>root-permissions</term>
+ <listitem>
+ <para>
+ Default permissions of the root node. It is defined as a set of semicolon-delimited permissions containing a group of space-delimited identities (user, group etc, see Organization service documentation for details) and the type of permission. For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a 'read' permission.
+ </para>
+ <para>
+ Configurable initializer adds a capability to override workspace initial startup procedure.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Cache configuration:</title>
+ <varlistentry>
+ <term>enabled</term>
+ <listitem>
+ <para>
+ If workspace cache is enabled.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>class</term>
+ <listitem>
+ <para>
+ Cache implementation class, optional from 1.9. Default value is <literal>org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl</literal>.
+ </para>
+ <para>
+ Cache can be configured to use concrete implementation of WorkspaceStorageCache interface. JCR core has two implementation to use: * LinkedWorkspaceStorageCacheImpl - default, with configurable read behavior and statistic. * WorkspaceStorageCacheImpl - pre 1.9, still can be used.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>properties</term>
+ <listitem>
+ <para>
+ The list of properties (name-value pairs) for Workspace cache:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>max-size</term>
+ <listitem>
+ <para>
+ Cache maximum size.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>live-time</term>
+ <listitem>
+ <para>
+ Cached item live time.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ LinkedWorkspaceStorageCacheImpl supports additional optional parameters TODO
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Query Handler configuration:</title>
+ <varlistentry>
+ <term>class</term>
+ <listitem>
+ <para>
+ A Query Handler class name.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>properties</term>
+ <listitem>
+ <para>
+ The list of properties (name-value pairs) for a Query Handler (indexDir) properties and advanced features described in *Search Configuration*.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Lock Manager configuration:</title>
+ <varlistentry>
+ <term>time-out</term>
+ <listitem>
+ <para>
+ Time after which the unused global lock will be removed.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>persister</term>
+ <listitem>
+ <para>
+ A class for storing lock information for future use. For example, remove lock after jcr restart.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>path</term>
+ <listitem>
+ <para>
+ A lock folder, each workspace has its own.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <formalpara>
+ <title>Configuration definition:</title>
+ <para></para>
+ </formalpara>
+
<programlisting><!ELEMENT repository-service (repositories)>
<!ATTLIST repository-service default-repository NMTOKEN #REQUIRED>
<!ELEMENT repositories (repository)>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -11,7 +11,7 @@
By default JCR Values are stored in the Workspace Data container along with the JCR structure (i.e. Nodes and Properties). eXo JCR offers an additional option of storing JCR Values separately from Workspace Data container, which can be extremely helpful to keep Binary Large Objects (BLOBs) for example (see [TODOBinary values processing link]).
</para>
<para>
- Value storage configuration is a part of Repository configuration, find more details <link linkend="sect-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration">there</link>.
+ Value storage configuration is a part of Repository configuration, find more details in <xref linkend="sect-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration"/>.
</para>
<para>
Tree-based storage is recommended for most of cases. If you run an application on Amazon EC2 - the S3 option may be interesting for architecture. Simple 'flat' storage is good in speed of creation/deletion of values, it might be a compromise for a small storages.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -83,7 +83,7 @@
By default the configuration files are located in service jars <filename>/conf/portal/configuration.xml</filename> (eXo services including JCR Repository Service) and <filename>exo-jcr-config.xml</filename> (repositories configuration). In eXo portal product JCR is configured in portal web application <filename>portal/WEB-INF/conf/jcr/jcr-configuration.xml</filename> (JCR Repository Service and related serivces) and repository-configuration.xml (repositories configuration).
</para>
<para>
- Read more about <link linkend="sect-Reference_Guide-eXo_JCR_configuration">Repository configuration</link>.
+ Read more about <xref linkend="sect-Reference_Guide-eXo_JCR_configuration"/>.
</para>
</section>
@@ -319,7 +319,7 @@
</para>
<note>
<para>
- Starting from v.1.9 <link linkend="sect-Reference_Guide-eXo_JCR_configuration">repository configuration</link> parameters supports human-readable formats of values (e.g. 200K - 200 Kbytes, 30m - 30 minutes etc)
+ Starting from v.1.9 <xref linkend="sect-Reference_Guide-eXo_JCR_configuration"/> parameters supports human-readable formats of values (e.g. 200K - 200 Kbytes, 30m - 30 minutes etc)
</para>
</note>
</section>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -60,7 +60,7 @@
LockManagerImpl is simple implementation of LockManager, and also faster than CacheableLockManager. It stores Lock objects in HashMap and may also persist Locks if LockPersister is configured. LockManagerImpl do not support replication in any way.
</para>
<para>
- See more about LockManager Configuration <link linkend="sect-Reference_Guide-eXo_JCR_configuration">here</link>.
+ See more about LockManager Configuration in <xref linkend="sect-Reference_Guide-eXo_JCR_configuration"/>.
</para>
</section>
@@ -84,7 +84,7 @@
Replication requirements are same as for Cache
</para>
<para>
- Full JCR configuration example you can see <link linkend="sect-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration">here</link>.
+ Full JCR configuration example can be seen in <xref linkend="sect-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration"/>.
</para>
<para>
Common tips:
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -38,7 +38,7 @@
A little bit about indexing process (no matter, cluster or not) Indexer do not writes changes to FS lucene index immediately. At first, Indexer writes changes to Volatile index. If Volatile index size become 1Mb or more it is flushed to FS. Also there is timer, that flushes volatile index by timeout. Volatile index timeout configured by "max-volatile-time" paremeter.
</para>
<para>
- See more about <link linkend="sect-Reference_Guide-Search_Configuration">Search Configuration</link>.
+ See more in <xref linkend="sect-Reference_Guide-Search_Configuration"/>.
</para>
<para>
Common scheme of Shared Index
@@ -200,7 +200,7 @@
</programlisting>
</para>
<para>
- See more about template configurations <link linkend="sect-Reference_Guide-JBoss_Cache_configuration">here</link>.
+ See more about template configurations in <xref linkend="sect-Reference_Guide-JBoss_Cache_configuration"/>.
</para>
</section>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -55,7 +55,6 @@
</listitem>
</varlistentry>
</variablelist>
-
<programlisting role="XML"><component>
<key>org.exoplatform.portal.config.UserACL</key>
<type>org.exoplatform.portal.config.UserACL</type>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-04-29 23:05:07 UTC (rev 2905)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-04-29 23:59:46 UTC (rev 2906)
@@ -62,6 +62,7 @@
</varlistentry>
</variablelist>
<note>
+ <title>CSS Classes</title>
<para>
The window decorators and the default portlet specification css classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components' css classes or they will not be displayed correctly.
</para>
@@ -151,6 +152,7 @@
</head>
</programlisting>
<note>
+ <title>CSS classes</title>
<para>
Window styles and the portlet specification CSS classes are included within the portal skin.
</para>
@@ -217,6 +219,7 @@
</programlisting>
<note>
+ <title><literal>display-name</literal></title>
<para>
The <literal>display-name</literal> element will also need to be specified in the <literal>web.xml</literal> for the skinning service to work properly with the web application.
</para>
@@ -329,6 +332,7 @@
<programlisting>@import url(/eXoResources/skin/Portlet/Stylesheet.css);
</programlisting>
<note>
+ <title>Stylesheet Merging</title>
<para>
When the portal skin is added to the page, it merge all the css stylesheets into a single file.
</para>
@@ -363,6 +367,7 @@
The default portal skin and window styles are defined in <filename>01eXoResources.war/WEB-INF/gatein-resources.xml</filename>.
</para>
<note>
+ <title>CSS</title>
<para>
The css for the portal skin needs to contain the css for all the window decorations and the portlet specification css classes.
</para>
@@ -375,9 +380,12 @@
When selecting a skin it is possible to see a preview of what the skin will look like. The current skin needs to know about the skin icons for all the available skins, otherwise it will not be able to show the previews. When creating a new portal it is recommended to include the preview icons of the other skins and to update the other skins with your new portal skin preview.
</para>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/PortalDevelopment/Skinning/portal-change-skin.png" format="PNG" width="444" />
+ <imageobject role="html">
+ <imagedata fileref="images/PortalDevelopment/Skinning/portal-change-skin.png" format="PNG" align="center" scale="100" />
</imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/PortalDevelopment/Skinning/portal-change-skin.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
</mediaobject>
<para>
The portal skin preview icon is specified through the CSS of the portal skin. In order for the current portal skin to be able to display the preview it must specify a specific CSS class and set the icon as the background.
@@ -410,12 +418,15 @@
<para>
Window styles are the CSS applied to window decoration. When an administrator choose a new application to add on a page he can decide which style of decoration would go around the window if any.
</para>
- <para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG" width="444" />
- </imageobject>
- </mediaobject>
+ <para>PortalDevelopment/Skinning/windowStyles
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG" align="center" scale="100" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
</para>
<section id="sect-Reference_Guide-Creating_a_New_Window_Style-Window_Style_Configuration">
<title>Window Style Configuration</title>
@@ -440,8 +451,9 @@
The windows style configuration for the default skin is configured in: <filename>01eXoResources.war/WEB-INF/gatein-resources.xml</filename>.
</para>
<note>
+ <title>Window Styles and Portal Skins</title>
<para>
- When a window style is defined in gatein-resources.xml file, it will be available to all portlets regardless if the current portal skin support the window decorator or not. It is recommended that when a new window decorator is added that it is added to all portal skins or that portal skins share a common stylesheet for window decorators.
+ When a window style is defined in <filename>gatein-resources.xml</filename> file, it will be available to all portlets regardless if the current portal skin supports the window decorator or not. It is recommended that when a new window decorator is added that it is added to all portal skins or that portal skins share a common stylesheet for window decorators.
</para>
</note>
</section>
@@ -596,8 +608,9 @@
To set the default window style to be used for a portal, you will to specify the css classes for a theme called <literal>DefaultTheme</literal>.
</para>
<note>
+ <title>DefaultTheme</title>
<para>
- You do not need to specify the DefaultTheme in gatein-resources.xml
+ You do not need to specify the DefaultTheme in <filename>gatein-resources.xml</filename>.
</para>
</note>
</section>
@@ -633,6 +646,7 @@
This will load the DefaultStylesheet.css when the Default skin is used and the OtherSkinStylesheet.css when the OtherSkin is used.
</para>
<note>
+ <title>Updating portlet skins</title>
<para>
If the current portal skin is not defined as part of the supported skins, then the portlet css class will not be loaded. It is recommended to update portlet skins whenever a new portal skin is created.
</para>
@@ -663,6 +677,7 @@
</listitem>
</itemizedlist>
<note>
+ <title>Portlet icons directory</title>
<para>
You must use <literal>skin/DefaultSkin/portletIcons/</literal> for the directory to store the portlet icon regardless of what skin is going to be used.
</para>
14 years
- 1
- 0
gatein SVN: r2905 - in components/common/trunk/common/src: test/java/org/gatein/common/util and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-29 19:05:07 -0400 (Thu, 29 Apr 2010)
New Revision: 2905
Modified:
components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java
components/common/trunk/common/src/test/java/org/gatein/common/util/ParameterValidationTestCase.java
Log:
- Added isOldAndNewDifferent method.
Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java 2010-04-29 18:40:30 UTC (rev 2904)
+++ components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java 2010-04-29 23:05:07 UTC (rev 2905)
@@ -1,36 +1,36 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.common.util;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
-
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision: 5757 $
@@ -184,6 +184,11 @@
return array != null && array.length > 0;
}
+ public static boolean isOldAndNewDifferent(Object oldValue, Object newValue)
+ {
+ return (oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null);
+ }
+
/**
* Checks if a given value matches the given format (as a regular expression). If yes, returns it as is. Otherwise,
* returns the default value.
Modified: components/common/trunk/common/src/test/java/org/gatein/common/util/ParameterValidationTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/util/ParameterValidationTestCase.java 2010-04-29 18:40:30 UTC (rev 2904)
+++ components/common/trunk/common/src/test/java/org/gatein/common/util/ParameterValidationTestCase.java 2010-04-29 23:05:07 UTC (rev 2905)
@@ -1,29 +1,29 @@
/*
-* JBoss, a division of Red Hat
-* Copyright 2009, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.common.util;
import junit.framework.TestCase;
-import org.gatein.common.util.ParameterValidation;
import java.util.regex.Pattern;
@@ -41,6 +41,16 @@
appender = "";
}
+ public void testIsOldAndNewDifferent()
+ {
+ assertFalse(ParameterValidation.isOldAndNewDifferent(null, null));
+ assertTrue(ParameterValidation.isOldAndNewDifferent("foo", null));
+ assertTrue(ParameterValidation.isOldAndNewDifferent(null, "foo"));
+ assertFalse(ParameterValidation.isOldAndNewDifferent("foo", "foo"));
+ assertTrue(ParameterValidation.isOldAndNewDifferent("bar", "foo"));
+ assertTrue(ParameterValidation.isOldAndNewDifferent(new Object(), new Object()));
+ }
+
public void testIsNullOrEmpty()
{
assertTrue(ParameterValidation.isNullOrEmpty(null));
14 years
- 1
- 0
gatein SVN: r2904 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/navigation and 1 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-29 14:40:30 -0400 (Thu, 29 Apr 2010)
New Revision: 2904
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
Log:
GTNPORTAL-1087: Update java code
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-29 16:52:29 UTC (rev 2903)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-29 18:40:30 UTC (rev 2904)
@@ -344,14 +344,19 @@
public void execute(Event<UIPageNodeForm2> event) throws Exception
{
UIPageNodeForm2 uiPageNodeForm = event.getSource();
+ PageNavigation contextNavigation = uiPageNodeForm.getContextPageNavigation();
+
UIGroupNavigationManagement uiGroupNavigation =
uiPageNodeForm.getAncestorOfType(UIGroupNavigationManagement.class);
PageNavigation selectedNavigation = uiGroupNavigation.getSelectedNavigation();
UIPopupWindow uiNavigationPopup = uiGroupNavigation.getChild(UIPopupWindow.class);
- UINavigationManagement pageManager =
+ UINavigationManagement navigationManager =
uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null);
- pageManager.setOwner(selectedNavigation.getOwnerId());
- UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class);
+ navigationManager.setOwner(contextNavigation.getOwnerId());
+ navigationManager.setOwnerType(contextNavigation.getOwnerType());
+ UINavigationNodeSelector selector = navigationManager.getChild(UINavigationNodeSelector.class);
+ selector.setEdittedNavigation(contextNavigation);
+ selector.initTreeData();
if (uiPageNodeForm.getSelectedParent() instanceof PageNode)
{
@@ -359,7 +364,7 @@
selector.selectPageNodeByUri(selectedParent.getUri());
}
- uiNavigationPopup.setUIComponent(pageManager);
+ uiNavigationPopup.setUIComponent(navigationManager);
uiNavigationPopup.setWindowSize(400, 400);
uiNavigationPopup.setRendered(true);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-29 16:52:29 UTC (rev 2903)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-29 18:40:30 UTC (rev 2904)
@@ -372,14 +372,18 @@
public void execute(Event<UIPageNodeForm2> event) throws Exception
{
UIPageNodeForm2 uiPageNodeForm = event.getSource();
+ PageNavigation contextNavigation = uiPageNodeForm.getContextPageNavigation();
UISiteManagement uiSiteManagement = uiPageNodeForm.getAncestorOfType(UISiteManagement.class);
- PageNavigation selectedNavigation = uiSiteManagement.getOriginalSelectedNavigation();
UIPopupWindow uiNavigationPopup = uiSiteManagement.getChild(UIPopupWindow.class);
- UINavigationManagement pageManager =
- uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null);
- pageManager.setOwner(selectedNavigation.getOwnerId());
- UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class);
- uiNavigationPopup.setUIComponent(pageManager);
+ UINavigationManagement navigationManager = uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null);
+ navigationManager.setOwner(contextNavigation.getOwnerId());
+ navigationManager.setOwnerType(contextNavigation.getOwnerType());
+ UINavigationNodeSelector selector = navigationManager.getChild(UINavigationNodeSelector.class);
+
+ selector.setEdittedNavigation(uiPageNodeForm.getContextPageNavigation());
+ selector.initTreeData();
+
+ uiNavigationPopup.setUIComponent(navigationManager);
uiNavigationPopup.setWindowSize(400, 400);
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent());
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-04-29 16:52:29 UTC (rev 2903)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-04-29 18:40:30 UTC (rev 2904)
@@ -198,9 +198,7 @@
PageNavigation nav = uiNodeSelector.getEdittedNavigation();
uiNodeForm.setSelectedParent(nav);
- // set owner type, owner
- uiNodeForm.setOwner(nav.getOwnerId());
- uiNodeForm.setOwnerType(nav.getOwnerType());
+ uiNodeForm.setContextPageNavigation(nav);
uiManagementPopup.setWindowSize(800, 500);
event.getRequestContext().addUIComponentToUpdateByAjax(uiManagementPopup.getParent());
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-29 16:52:29 UTC (rev 2903)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-29 18:40:30 UTC (rev 2904)
@@ -347,8 +347,8 @@
uiManagementPopup.setUIComponent(uiNodeForm);
Object parent = null;
- PageNavigation filteredEdittedNavigation = uiNodeSelector.getEdittedNavigation();
- List<PageNode> pageNodes = filteredEdittedNavigation.getNodes();
+ PageNavigation edittedNavigation = uiNodeSelector.getEdittedNavigation();
+ List<PageNode> pageNodes = edittedNavigation.getNodes();
if (uri != null && uri.trim().length() > 0)
{
for (PageNode pageNode : pageNodes)
@@ -362,15 +362,12 @@
}
if (parent == null)
{
- parent = filteredEdittedNavigation;
+ parent = edittedNavigation;
}
uiNodeForm.setSelectedParent(parent);
- // set navigation owner, navigation type
- uiNodeForm.setOwner(uiNodeSelector.getEdittedNavigation().getOwnerId());
- uiNodeForm.setOwnerType(uiNodeSelector.getEdittedNavigation().getOwnerType());
-
+ uiNodeForm.setContextPageNavigation(edittedNavigation);
uiManagementPopup.setWindowSize(800, 500);
event.getRequestContext().addUIComponentToUpdateByAjax(uiManagementPopup.getParent());
}
@@ -472,9 +469,9 @@
UIApplication uiApp = ctx.getUIApplication();
String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
UINavigationNodeSelector uiNodeSelector = popupMenu.getAncestorOfType(UINavigationNodeSelector.class);
- PageNavigation selectedNav = uiNodeSelector.getEdittedNavigation();
- Object obj = PageNavigationUtils.searchParentNode(selectedNav, uri);
- PageNode selectedNode = PageNavigationUtils.searchPageNodeByUri(selectedNav, uri);
+ PageNavigation edittedNav = uiNodeSelector.getEdittedNavigation();
+ Object obj = PageNavigationUtils.searchParentNode(edittedNav, uri);
+ PageNode selectedNode = PageNavigationUtils.searchPageNodeByUri(edittedNav, uri);
String pageId = selectedNode.getPageReference();
UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class);
@@ -492,10 +489,7 @@
UIPageNodeForm2 uiNodeForm = uiApp.createUIComponent(UIPageNodeForm2.class, null, null);
uiManagementPopup.setUIComponent(uiNodeForm);
- // set navigation owner, navigation type
- uiNodeForm.setOwner(uiNodeSelector.getEdittedNavigation().getOwnerId());
- uiNodeForm.setOwnerType(uiNodeSelector.getEdittedNavigation().getOwnerType());
-
+ uiNodeForm.setContextPageNavigation(edittedNav);
uiNodeForm.setValues(selectedNode);
uiNodeForm.setSelectedParent(obj);
uiManagementPopup.setWindowSize(800, 500);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-29 16:52:29 UTC (rev 2903)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-29 18:40:30 UTC (rev 2904)
@@ -72,6 +72,8 @@
private Object selectedParent;
+ private PageNavigation contextPageNavigation;
+
final private static String SHOW_PUBLICATION_DATE = "showPublicationDate";
final private static String START_PUBLICATION_DATE = "startPublicationDate";
@@ -208,24 +210,24 @@
uiPopupWindowPage.processRender(context);
}
- public void setOwner(String owner_)
+ public String getOwner()
{
- this.owner_ = owner_;
+ return contextPageNavigation.getOwnerId();
}
- public String getOwner()
+ public String getOwnerType()
{
- return owner_;
+ return contextPageNavigation.getOwnerType();
}
-
- public void setOwnerType(String ownerType_)
+
+ public void setContextPageNavigation(PageNavigation _contextPageNav)
{
- this.ownerType_ = ownerType_;
+ this.contextPageNavigation = _contextPageNav;
}
-
- public String getOwnerType()
+
+ public PageNavigation getContextPageNavigation()
{
- return ownerType_;
+ return this.contextPageNavigation;
}
static public class SaveActionListener extends EventListener<UIPageNodeForm2>
14 years
- 1
- 0
gatein SVN: r2903 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/navigation and 1 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-29 12:52:29 -0400 (Thu, 29 Apr 2010)
New Revision: 2903
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UINavigationNodeSelector.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-1087: Update java code with new approach to fix the issue, following the creation of UIFilterableTree
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-29 16:45:12 UTC (rev 2902)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-29 16:52:29 UTC (rev 2903)
@@ -210,9 +210,7 @@
UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class);
- //TODO: Set correct value for filteredEdittedNavigation
- selector.setOriginalEdittedNavigation(navigation);
- selector.setFilteredEdittedNavigation(navigation);
+ selector.setEdittedNavigation(navigation);
selector.initTreeData();
popUp.setUIComponent(pageManager);
popUp.setWindowSize(400, 400);
@@ -354,16 +352,13 @@
uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null);
pageManager.setOwner(selectedNavigation.getOwnerId());
UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class);
- ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>();
- navis.add(selectedNavigation);
- selector.initNavigations(navis);
if (uiPageNodeForm.getSelectedParent() instanceof PageNode)
{
PageNode selectedParent = (PageNode)uiPageNodeForm.getSelectedParent();
selector.selectPageNodeByUri(selectedParent.getUri());
}
- //selector.removeChild(UIRightClickPopupMenu.class);
+
uiNavigationPopup.setUIComponent(pageManager);
uiNavigationPopup.setWindowSize(400, 400);
uiNavigationPopup.setRendered(true);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-29 16:45:12 UTC (rev 2902)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-29 16:52:29 UTC (rev 2903)
@@ -332,12 +332,11 @@
UISiteManagement uicomp = event.getSource();
String portalName = event.getRequestContext().getRequestParameter(OBJECTID);
DataStorage dataService = uicomp.getApplicationComponent(DataStorage.class);
- PortalRequestContext prContext = Util.getPortalRequestContext();
WebuiRequestContext context = event.getRequestContext();
UIApplication uiApplication = context.getUIApplication();
- PageNavigation originalNavi = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
- if (originalNavi == null)
+ PageNavigation edittedNavigation = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+ if (edittedNavigation == null)
{
uiApplication.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist",
new String[]{portalName}));
@@ -345,7 +344,7 @@
}
UserACL userACL = uicomp.getApplicationComponent(UserACL.class);
- if (!userACL.hasEditPermission(originalNavi))
+ if (!userACL.hasEditPermission(edittedNavigation))
{
uiApplication.addMessage(new ApplicationMessage("UISiteManagement.msg.Invalid-editPermission", null));;
return;
@@ -356,20 +355,8 @@
naviManager.setOwner(portalName);
naviManager.setOwnerType(PortalConfig.PORTAL_TYPE);
- PageNavigation filteredNavi = null;
- try{
- filteredNavi = PageNavigationUtils.filterNavigation(originalNavi, prContext.getRemoteUser(), true);
- }
- catch(Exception ex)
- {
-
- }
-
- uicomp.setOriginalSelectedNavigation(originalNavi);
UINavigationNodeSelector selector = naviManager.getChild(UINavigationNodeSelector.class);
- selector.setOriginalEdittedNavigation(originalNavi);
- //TODO: Set the filteredNavi instead
- selector.setFilteredEdittedNavigation(originalNavi);
+ selector.setEdittedNavigation(edittedNavigation);
selector.initTreeData();
popUp.setUIComponent(naviManager);
@@ -392,10 +379,6 @@
uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null);
pageManager.setOwner(selectedNavigation.getOwnerId());
UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class);
- ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>();
- navis.add(selectedNavigation);
- selector.initNavigations(navis);
- //selector.removeChild(UIRightClickPopupMenu.class);
uiNavigationPopup.setUIComponent(pageManager);
uiNavigationPopup.setWindowSize(400, 400);
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent());
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UINavigationNodeSelector.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UINavigationNodeSelector.gtmpl 2010-04-29 16:45:12 UTC (rev 2902)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UINavigationNodeSelector.gtmpl 2010-04-29 16:52:29 UTC (rev 2903)
@@ -4,9 +4,6 @@
import org.exoplatform.webui.core.UIRightClickPopupMenu ;
import org.exoplatform.web.application.JavascriptManager;
- navigations = uicomponent.getPageNavigations();
- def selectedNav = uicomponent.getSelectedNavigation();
-
UIRightClickPopupMenu uiPopupMenu = uicomponent.getChild(UIRightClickPopupMenu.class);
String popupMenu = "";
%>
@@ -40,13 +37,7 @@
<div class="ContainerConfigOptions">
<div class="UIVerticalSlideTabs ItemList CategoryContainer" style="padding: 1px;">
<%
- if(navigations != null) {
- for(nav in navigations) {
- if(selectedNav != null && nav == selectedNav) {
- uicomponent.renderChild(UITree.class);
- }
- }
- }
+ uicomponent.renderChild(UITree.class);
%>
</div>
</div>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-04-29 16:45:12 UTC (rev 2902)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-04-29 16:52:29 UTC (rev 2903)
@@ -102,7 +102,7 @@
DataStorage dataService = uiManagement.getApplicationComponent(DataStorage.class);
UserPortalConfigService portalConfigService = uiManagement.getApplicationComponent(UserPortalConfigService.class);
- PageNavigation navigation = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation navigation = uiNodeSelector.getEdittedNavigation();
String editedOwnerType = navigation.getOwnerType();
String editedOwnerId = navigation.getOwnerId();
// Check existed
@@ -195,7 +195,7 @@
UIPageNodeForm2 uiNodeForm = uiManagementPopup.createUIComponent(UIPageNodeForm2.class, null, null);
uiNodeForm.setValues(null);
uiManagementPopup.setUIComponent(uiNodeForm);
- PageNavigation nav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation nav = uiNodeSelector.getEdittedNavigation();
uiNodeForm.setSelectedParent(nav);
// set owner type, owner
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-29 16:45:12 UTC (rev 2902)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-29 16:52:29 UTC (rev 2903)
@@ -25,6 +25,7 @@
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.config.model.PortalConfig;
+import org.exoplatform.portal.mop.Visibility;
import org.exoplatform.portal.webui.page.UIPage;
import org.exoplatform.portal.webui.page.UIPageNodeForm2;
import org.exoplatform.portal.webui.portal.UIPortalComposer;
@@ -44,14 +45,13 @@
import org.exoplatform.webui.core.UIApplication;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.UIContainer;
+import org.exoplatform.webui.core.UIFilterableTree;
import org.exoplatform.webui.core.UIPopupWindow;
import org.exoplatform.webui.core.UIRightClickPopupMenu;
import org.exoplatform.webui.core.UITree;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
-import groovy.util.slurpersupport.FilteredNodeChildren;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -77,11 +77,9 @@
public class UINavigationNodeSelector extends UIContainer
{
- private List<PageNavigation> navigations;
-
- private PageNavigation originalEdittedNavigation;
+ //private List<PageNavigation> navigations;
- private PageNavigation filteredEdittedNavigation;
+ private PageNavigation edittedNavigation;
private TreeNodeData edittedTreeNodeData;
@@ -96,55 +94,56 @@
addChild(UIRightClickPopupMenu.class, "UINavigationNodeSelectorPopupMenu", null).setRendered(true);
rightClickPopup.setActions(new String[]{"AddNode", "PasteNode"});
- UITree uiTree = addChild(UITree.class, null, "TreeNodeSelector");
+ UIFilterableTree uiTree = addChild(UIFilterableTree.class, null, "TreeNodeSelector");
uiTree.setIcon("DefaultPageIcon");
uiTree.setSelectedIcon("DefaultPageIcon");
uiTree.setBeanIdField("uri");
uiTree.setBeanLabelField("encodedResolvedLabel");
uiTree.setBeanIconField("icon");
-
+
UIRightClickPopupMenu uiPopupMenu =
createUIComponent(UIRightClickPopupMenu.class, "NavigationNodePopupMenu", null);
uiPopupMenu.setActions(new String[]{"AddNode", "EditPageNode", "EditSelectedNode", "CopyNode", "CloneNode",
"CutNode", "DeleteNode", "MoveUp", "MoveDown"});
uiTree.setUIRightClickPopupMenu(uiPopupMenu);
+ setupTreeFilter();
}
-
- public List<PageNavigation> getNavigations()
+
+ /**
+ * Setup a filter on the tree node. In this case, SYSTEM node is not displayed if user is not super user
+ *
+ */
+ private void setupTreeFilter()
{
- return navigations;
+ UIFilterableTree.TreeNodeFilter nodeFilter = new UIFilterableTree.TreeNodeFilter()
+ {
+ public boolean filterThisNode(Object nodeObject, WebuiRequestContext context)
+ {
+ boolean isSystemNode = (((PageNode)nodeObject).getVisibility() == Visibility.SYSTEM );
+ if(!isSystemNode)
+ {
+ return false;
+ }else
+ {
+ UserACL userACL = context.getUIApplication().getApplicationComponent(UserACL.class);
+ return !userACL.getSuperUser().equals(context.getRemoteUser());
+ }
+
+ }
+ };
+ this.getChild(UIFilterableTree.class).setTreeNodeFilter(nodeFilter);
}
- public void setOriginalEdittedNavigation(PageNavigation _originalEdittedNavigation) throws Exception
+ public void setEdittedNavigation(PageNavigation _filteredEdittedNavigation) throws Exception
{
- this.originalEdittedNavigation = _originalEdittedNavigation;
+ this.edittedNavigation = _filteredEdittedNavigation;
}
- public PageNavigation getOriginalEdittedNavigation()
+ public PageNavigation getEdittedNavigation()
{
- return this.originalEdittedNavigation;
+ return this.edittedNavigation;
}
-
- public void setFilteredEdittedNavigation(PageNavigation _filteredEdittedNavigation) throws Exception
- {
- this.filteredEdittedNavigation = _filteredEdittedNavigation;
- }
-
- public PageNavigation getFilteredEdittedNavigation()
- {
- return this.filteredEdittedNavigation;
- }
-
- public void initNavigations(List<PageNavigation> navis) throws Exception
- {
- navigations = navis;
- WebuiRequestContext requestContext = WebuiRequestContext.getCurrentInstance();
- localizeNavigation(requestContext.getLocale());
-
- cleanTreeSibbling();
- initEdittedTreeNodeData();
- }
-
+
/**
* Init the UITree wrapped in UINavigationNodeSelector and localize the label
* @throws Exception
@@ -154,79 +153,45 @@
WebuiRequestContext requestContext = WebuiRequestContext.getCurrentInstance();
localizeNavigation(requestContext.getLocale());
- cleanTreeSibbling();
initEdittedTreeNodeData();
}
- public void loadNavigationByNavId(Integer navId, List<PageNavigation> navigations) throws Exception
- {
- this.navigations = navigations;
- WebuiRequestContext requestContext = WebuiRequestContext.getCurrentInstance();
- localizeNavigation(requestContext.getLocale());
- selectNavigation(navId);
- }
-
- private void cleanTreeSibbling()
- {
- /*
- if (filteredEdittedNavigation == null)
- {
- getChild(UITree.class).setSibbling(null);
- return;
- }
- */
- }
-
/**
* Init the edited node as well as its parent, navigation
*
*/
private void initEdittedTreeNodeData()
{
- if(filteredEdittedNavigation == null)
+ if(edittedNavigation == null)
{
return;
}
if (edittedTreeNodeData == null)
{
- edittedTreeNodeData = new TreeNodeData(filteredEdittedNavigation);
+ edittedTreeNodeData = new TreeNodeData(edittedNavigation);
selectPageNodeByUri(edittedTreeNodeData.getNode().getUri());//TODO: Check null
}
UITree tree = getChild(UITree.class);
- tree.setSibbling(filteredEdittedNavigation.getNodes());
+ tree.setSibbling(edittedNavigation.getNodes());
}
- private void selectNavigation(int id)
- {
- for (int i = 0; i < navigations.size(); i++)
- {
- if (navigations.get(i).getId() != id)
- {
- continue;
- }
- edittedTreeNodeData = new TreeNodeData(navigations.get(i), null, null);
- selectPageNodeByUri(null);
- UITree uiTree = getChild(UITree.class);
- uiTree.setSibbling(navigations.get(i).getNodes());
- }
- }
private void localizeNavigation(Locale locale)
{
LocaleConfig localeConfig =
getApplicationComponent(LocaleConfigService.class).getLocaleConfig(locale.getLanguage());
- String ownerType = filteredEdittedNavigation.getOwnerType();
+ String ownerType = edittedNavigation.getOwnerType();
if (!PortalConfig.USER_TYPE.equals(ownerType))
{
- String ownerId = filteredEdittedNavigation.getOwnerId();
+ String ownerId = edittedNavigation.getOwnerId();
if (PortalConfig.GROUP_TYPE.equals(ownerType))
{
// Remove the trailing '/' for a group
ownerId = ownerId.substring(1);
}
ResourceBundle res = localeConfig.getNavigationResourceBundle(ownerType, ownerId);
- for (PageNode node : filteredEdittedNavigation.getNodes())
+ for (PageNode node : edittedNavigation.getNodes())
{
resolveLabel(res, node);
}
@@ -324,54 +289,12 @@
return null;
}
- public List<PageNavigation> getPageNavigations()
- {
- List<PageNavigation> navs = new ArrayList<PageNavigation>(3);
- navs.add(filteredEdittedNavigation);
- return navs;
- }
-
- public void addPageNavigation(PageNavigation navigation)
- {
- if (navigations == null)
- {
- navigations = new ArrayList<PageNavigation>();
- }
- navigations.add(navigation);
- cleanTreeSibbling();
- }
-
- public void deletePageNavigation(PageNavigation navigation)
- {
- if (navigations == null || navigations.size() < 1)
- {
- return;
- }
- navigations.remove(navigation);
- deleteNavigations.add(navigation);
- edittedTreeNodeData = null;
- initEdittedTreeNodeData();
- cleanTreeSibbling();
- }
-
- public PageNavigation getPageNavigation(int id)
- {
- for (PageNavigation ele : getPageNavigations())
- {
- if (ele.getId() == id)
- {
- return ele;
- }
- }
- return null;
- }
-
public void processRender(WebuiRequestContext context) throws Exception
{
UIRightClickPopupMenu uiPopupMenu = getChild(UIRightClickPopupMenu.class);
if (uiPopupMenu != null)
{
- if (filteredEdittedNavigation == null)
+ if (edittedNavigation == null)
{
uiPopupMenu.setRendered(false);
}
@@ -424,7 +347,7 @@
uiManagementPopup.setUIComponent(uiNodeForm);
Object parent = null;
- PageNavigation filteredEdittedNavigation = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation filteredEdittedNavigation = uiNodeSelector.getEdittedNavigation();
List<PageNode> pageNodes = filteredEdittedNavigation.getNodes();
if (uri != null && uri.trim().length() > 0)
{
@@ -445,8 +368,8 @@
uiNodeForm.setSelectedParent(parent);
// set navigation owner, navigation type
- uiNodeForm.setOwner(uiNodeSelector.getFilteredEdittedNavigation().getOwnerId());
- uiNodeForm.setOwnerType(uiNodeSelector.getFilteredEdittedNavigation().getOwnerType());
+ uiNodeForm.setOwner(uiNodeSelector.getEdittedNavigation().getOwnerId());
+ uiNodeForm.setOwnerType(uiNodeSelector.getEdittedNavigation().getOwnerType());
uiManagementPopup.setWindowSize(800, 500);
event.getRequestContext().addUIComponentToUpdateByAjax(uiManagementPopup.getParent());
@@ -467,7 +390,7 @@
// get Selected PageNode
PageNode selectedPageNode = null;
- List<PageNode> pageNodes = uiNodeSelector.getFilteredEdittedNavigation().getNodes();
+ List<PageNode> pageNodes = uiNodeSelector.getEdittedNavigation().getNodes();
if (uri != null && uri.trim().length() > 0)
{
for (PageNode pageNode : pageNodes)
@@ -549,7 +472,7 @@
UIApplication uiApp = ctx.getUIApplication();
String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
UINavigationNodeSelector uiNodeSelector = popupMenu.getAncestorOfType(UINavigationNodeSelector.class);
- PageNavigation selectedNav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation selectedNav = uiNodeSelector.getEdittedNavigation();
Object obj = PageNavigationUtils.searchParentNode(selectedNav, uri);
PageNode selectedNode = PageNavigationUtils.searchPageNodeByUri(selectedNav, uri);
String pageId = selectedNode.getPageReference();
@@ -570,8 +493,8 @@
uiManagementPopup.setUIComponent(uiNodeForm);
// set navigation owner, navigation type
- uiNodeForm.setOwner(uiNodeSelector.getFilteredEdittedNavigation().getOwnerId());
- uiNodeForm.setOwnerType(uiNodeSelector.getFilteredEdittedNavigation().getOwnerType());
+ uiNodeForm.setOwner(uiNodeSelector.getEdittedNavigation().getOwnerId());
+ uiNodeForm.setOwnerType(uiNodeSelector.getEdittedNavigation().getOwnerType());
uiNodeForm.setValues(selectedNode);
uiNodeForm.setSelectedParent(obj);
@@ -591,7 +514,7 @@
uiManagement.setRenderedChildrenOfTypes(childrenToRender);
event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement);
- PageNavigation nav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation nav = uiNodeSelector.getEdittedNavigation();
if (nav == null)
{
return;
@@ -623,7 +546,7 @@
uiManagement.setRenderedChildrenOfTypes(childrenToRender);
event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement);
- PageNavigation nav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation nav = uiNodeSelector.getEdittedNavigation();
if (nav == null)
{
return;
@@ -685,7 +608,7 @@
}
PageNode newNode = selectedNode.getNode().clone();
- PageNavigation targetNav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation targetNav = uiNodeSelector.getEdittedNavigation();
PageNode targetNode = PageNavigationUtils.searchPageNodeByUri(targetNav, targetUri);
if (targetNode != null && newNode.getUri().equals(targetNode.getUri()))
@@ -830,7 +753,7 @@
String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
event.getRequestContext().addUIComponentToUpdateByAjax(uiNodeSelector.getParent());
- PageNavigation nav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation nav = uiNodeSelector.getEdittedNavigation();
PageNode targetNode = PageNavigationUtils.searchPageNodeByUri(nav, uri);
Object parentNode = PageNavigationUtils.searchParentNode(nav, uri);
List<PageNode> children = new ArrayList<PageNode>();
@@ -878,7 +801,7 @@
UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
pcontext.addUIComponentToUpdateByAjax(uiNodeSelector);
- PageNavigation nav = uiNodeSelector.getFilteredEdittedNavigation();
+ PageNavigation nav = uiNodeSelector.getEdittedNavigation();
if (nav == null)
{
return;
14 years
- 1
- 0
gatein SVN: r2902 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/core and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-29 12:45:12 -0400 (Thu, 29 Apr 2010)
New Revision: 2902
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java
Log:
GTNPORTAL-1139: Update java code and template
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl 2010-04-29 16:22:50 UTC (rev 2901)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl 2010-04-29 16:45:12 UTC (rev 2902)
@@ -1,13 +1,15 @@
<%
import org.exoplatform.webui.core.UIRightClickPopupMenu;
import org.exoplatform.webui.application.WebuiRequestContext;
+
+ UIRightClickPopupMenu uiPopupMenu = uicomponent.getUIRightClickPopupMenu();
+ WebuiRequestContext rcontext = _ctx.getRequestContext();
def selected = uicomponent.getSelected();
def sibling = uicomponent.getSibbling();
def children = uicomponent.getChildren();
-
- UIRightClickPopupMenu uiPopupMenu = uicomponent.getUIRightClickPopupMenu();
- WebuiRequestContext rcontext = _ctx.getRequestContext();
+ def indexOfRightMostDisplayedSibbling = uicomponent.getRightMostDisplayedNodeIndex(sibling, rcontext);
+ def indexOfRightMostDisplayedChild = uicomponent.getRightMostDisplayedNodeIndex(children, rcontext);
if(uiPopupMenu != null){
String id = uicomponent.getParent().getId();
@@ -26,7 +28,7 @@
int count=0;
for(object in sibling) {
if(uicomponent.displayThisNode(object, rcontext)){
- if(count==sibling.size()-1) {
+ if(count == indexOfRightMostDisplayedSibbling) {
%>
<div class="LastNode Node">
<%
@@ -41,7 +43,7 @@
int countChild=0;
for(child in children) {
if(uicomponent.displayThisNode(child, rcontext)){
- if(countChild==children.size()-1) {
+ if(countChild == indexOfRightMostDisplayedChild) {
%>
<div class="LastNode Node">
<%=uicomponent.renderNode(child);%>
@@ -70,7 +72,7 @@
int countChild=0;
for(child in children) {
if(uicomponent.displayThisNode(child, rcontext)){
- if(countChild==children.size()-1) {
+ if(countChild == indexOfRightMostDisplayedChild) {
%>
<div class="LastNode Node">
<%=uicomponent.renderNode(child);%>
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java 2010-04-29 16:22:50 UTC (rev 2901)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java 2010-04-29 16:45:12 UTC (rev 2902)
@@ -18,6 +18,8 @@
*/
package org.exoplatform.webui.core;
+import java.util.List;
+
import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -49,6 +51,61 @@
return !nodeFilter.filterThisNode(nodeObject, context);
}
+ /**
+ * Method returns index ( relative to unfiltered list of sibblings ) of most right displayed node. The index
+ * is needed for a fine UI
+ *
+ * @param sibblings
+ * @param context
+ * @return
+ */
+ public int getRightMostDisplayedNodeIndex(List<Object> sibblings, WebuiRequestContext context)
+ {
+ int numberOfSibblings = sibblings.size();
+ if (nodeFilter == null)
+ {
+ return (numberOfSibblings - 1);
+ }
+ else
+ {
+ for (int i = (numberOfSibblings - 1); i >= 0; i--)
+ {
+ if (!nodeFilter.filterThisNode(sibblings.get(i), context))
+ {
+ return i;
+ }
+ }
+ return -1;
+ }
+ }
+
+ /**
+ * Method returns index ( relative to unfiltered list of sibblings ) of most left displayed node.
+ *
+ * @param sibblings
+ * @param context
+ * @return
+ */
+ public int getLeftMostDisplayedNodeIndex(List<Object> sibblings, WebuiRequestContext context)
+ {
+ int numberOfSibblings = sibblings.size();
+ if (nodeFilter == null)
+ {
+ return 0;
+ }
+ else
+ {
+ for (int i = 0; i < numberOfSibblings; i++)
+ {
+ if (!nodeFilter.filterThisNode(sibblings.get(i), context))
+ {
+ return i;
+ }
+ }
+ return numberOfSibblings;
+ }
+ }
+
public void setTreeNodeFilter(TreeNodeFilter _nodeFilter)
{
this.nodeFilter = _nodeFilter;
14 years
- 1
- 0
gatein SVN: r2901 - in components/sso/trunk/agent/src/main/java/org/gatein/sso/agent: login and 1 other directory.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-29 12:22:50 -0400 (Thu, 29 Apr 2010)
New Revision: 2901
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java
Log:
GTNPORTAL-1120 - GateIn+SPNEGO integration: old userId is used when having ticket for new user
GTNPORTAL-1121 - GateIn+SPNEGO integration: org.hibernate.HibernateException: createCriteria is not valid without active transaction (thrown from SPNEGOFilter)
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java 2010-04-29 15:45:34 UTC (rev 2900)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java 2010-04-29 16:22:50 UTC (rev 2901)
@@ -29,42 +29,28 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.transaction.TransactionManager;
-import javax.transaction.Status;
-import javax.naming.InitialContext;
-
import org.exoplatform.container.web.AbstractFilter;
-import org.exoplatform.services.organization.OrganizationService;
-import org.exoplatform.services.organization.User;
import org.exoplatform.services.security.Authenticator;
import org.exoplatform.services.security.IdentityRegistry;
import org.exoplatform.services.security.Identity;
/**
+ * Note: This Filter should not be needed anymore. Once various SPNEGO scenarios have been tested and stabilized, I would recommend removing this from the codebase in
+ * a future release of the module
+ *
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class SPNEGOFilter extends AbstractFilter
{
- public void destroy()
- {
- }
-
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException
{
- HttpServletRequest httpRequest = (HttpServletRequest)request;
-
- boolean isStartedHere = this.startTx();
+ HttpServletRequest httpRequest = (HttpServletRequest)request;
try
{
String remoteUser = httpRequest.getRemoteUser();
-
- //System.out.println("-----------------------------------------------------------------");
- //System.out.println("SPNEGO TX Filter (TX Started: )"+isStartedHere);
- //System.out.println("RequestURL: "+httpRequest.getRequestURI());
- //System.out.println("RemoteUser: "+remoteUser);
-
+
if(remoteUser != null)
{
//Check and make sure the IdentityRegistry is consistent
@@ -76,78 +62,20 @@
.getComponentInstanceOfType(Authenticator.class);
Identity identity = authenticator.createIdentity(remoteUser);
+
identityRegistry.register(identity);
}
-
- OrganizationService orgService =
- (OrganizationService)getContainer().getComponentInstanceOfType(OrganizationService.class);
- User user = orgService.getUserHandler().findUserByName(remoteUser);
-
- //System.out.println("Exo User : "+user);
}
- //System.out.println("-----------------------------------------------------------------");
- chain.doFilter(request, response);
-
- if(isStartedHere)
- {
- this.commit();
- }
+ chain.doFilter(request, response);
}
catch(Throwable t)
- {
- if(isStartedHere)
- {
- this.rollback();
- }
-
+ {
throw new RuntimeException(t);
}
}
-
- private boolean startTx()
+
+ public void destroy()
{
- try
- {
- TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
-
- if(tm.getStatus() == Status.STATUS_NO_TRANSACTION)
- {
- tm.begin();
- return true;
- }
-
- return false;
- }
- catch(Throwable t)
- {
- return false;
- }
}
-
- private void commit()
- {
- try
- {
- TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
- tm.commit();
- }
- catch(Throwable t)
- {
- throw new RuntimeException(t);
- }
- }
-
- private void rollback()
- {
- try
- {
- TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
- tm.rollback();
- }
- catch(Throwable t)
- {
- throw new RuntimeException(t);
- }
- }
}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java 2010-04-29 15:45:34 UTC (rev 2900)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java 2010-04-29 16:22:50 UTC (rev 2901)
@@ -24,12 +24,22 @@
import java.security.Principal;
import java.security.acl.Group;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
+import javax.security.jacc.PolicyContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
import org.jboss.security.SimpleGroup;
import org.jboss.security.auth.spi.AbstractServerLoginModule;
@@ -40,6 +50,8 @@
import org.exoplatform.services.security.Identity;
import org.exoplatform.services.security.Authenticator;
import org.exoplatform.services.security.IdentityRegistry;
+import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
+import org.exoplatform.services.security.jaas.UserPrincipal;
/**
* The LoginModule that is responsible for setting up the proper GateIn roles
@@ -192,4 +204,91 @@
throw new LoginException(e.getMessage());
}
}
+
+ public boolean logout() throws LoginException
+ {
+ org.exoplatform.container.monitor.jvm.J2EEServerInfo info = new J2EEServerInfo();
+ MBeanServer jbossServer = info.getMBeanServer();
+
+ //
+ if (jbossServer != null)
+ {
+ try
+ {
+
+ log.debug("Performing JBoss security manager cache eviction");
+
+ ObjectName securityManagerName = new ObjectName("jboss.security:service=JaasSecurityManager");
+
+ //Obtain the httpsession key
+ HttpServletRequest request = (HttpServletRequest) PolicyContext.getContext("javax.servlet.http.HttpServletRequest");
+ HttpSession session = request.getSession(false);
+ String sessionId = session.getId();
+
+ //
+ if (sessionId != null)
+ {
+ String userName = null;
+ Set<UserPrincipal> userPrincipals = subject.getPrincipals(UserPrincipal.class);
+ if (!userPrincipals.isEmpty())
+ {
+ // There should be one
+ userName = userPrincipals.iterator().next().getName();
+ }
+
+ log.debug("Going to perform JBoss security manager cache eviction for user " + userName);
+
+ //
+ List allPrincipals =
+ (List)jbossServer.invoke(securityManagerName, "getAuthenticationCachePrincipals",
+ new Object[]{realmName}, new String[]{String.class.getName()});
+
+ // Make a copy to avoid some concurrent mods
+ allPrincipals = new ArrayList(allPrincipals);
+
+ // Lookup for invalidation key, it must be the same principal!
+ Principal key = null;
+ for (Iterator i = allPrincipals.iterator(); i.hasNext();)
+ {
+ Principal principal = (Principal)i.next();
+
+ if (principal.getName().equals(sessionId))
+ {
+ key = principal;
+ break;
+ }
+ }
+
+ // Perform invalidation
+ if (key != null)
+ {
+ jbossServer.invoke(securityManagerName, "flushAuthenticationCache", new Object[]{realmName, key},
+ new String[]{String.class.getName(), Principal.class.getName()});
+ log.debug("Performed JBoss security manager cache eviction for user " + sessionId + " with principal "
+ + key);
+ }
+ else
+ {
+ log.warn("No principal found when performing JBoss security manager cache eviction for user "
+ + userName);
+ }
+ }
+ else
+ {
+ log.warn("No user name found when performing JBoss security manager cache eviction");
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Could not perform JBoss security manager cache eviction", e);
+ }
+ }
+ else
+ {
+ log.debug("Could not find mbean server for performing JBoss security manager cache eviction");
+ }
+
+ //
+ return true;
+ }
}
14 years
- 1
- 0
gatein SVN: r2900 - in portal/trunk: examples/portlets/jsfhellouser and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 11:45:34 -0400 (Thu, 29 Apr 2010)
New Revision: 2900
Modified:
portal/trunk/examples/portlets/jsfhellouser/pom.xml
portal/trunk/pom.xml
Log:
GTNPORTAL-1140: Upgrade to Portlet Bridge 2.0.0-FINAL
Modified: portal/trunk/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- portal/trunk/examples/portlets/jsfhellouser/pom.xml 2010-04-29 15:39:55 UTC (rev 2899)
+++ portal/trunk/examples/portlets/jsfhellouser/pom.xml 2010-04-29 15:45:34 UTC (rev 2900)
@@ -41,13 +41,13 @@
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.FINAL</version>
</dependency>
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.FINAL</version>
</dependency>
</dependencies>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-04-29 15:39:55 UTC (rev 2899)
+++ portal/trunk/pom.xml 2010-04-29 15:45:34 UTC (rev 2900)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.3.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>1.1.0-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
14 years
- 1
- 0
gatein SVN: r2899 - portal/branches/EPP_5_0_Branch.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 11:39:55 -0400 (Thu, 29 Apr 2010)
New Revision: 2899
Modified:
portal/branches/EPP_5_0_Branch/pom.xml
Log:
JBEPP-332: Upgrade to portletbridge 2.0.0 GA
Using new WSRP to benefit from new portletbridge
Modified: portal/branches/EPP_5_0_Branch/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
+++ portal/branches/EPP_5_0_Branch/pom.xml 2010-04-29 15:39:55 UTC (rev 2899)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.3.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>1.1.0-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
14 years
- 1
- 0
gatein SVN: r2898 - in components/wsrp/trunk: admin-gui and 8 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 11:05:26 -0400 (Thu, 29 Apr 2010)
New Revision: 2898
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/api/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/common/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/consumer/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/1.1.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/1.1.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/1.1.1-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/producer/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/test/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-29 15:05:01 UTC (rev 2897)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-29 15:05:26 UTC (rev 2898)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years
- 1
- 0