gatein SVN: r6115 - epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-03-23 05:04:25 -0400 (Wed, 23 Mar 2011)
New Revision: 6115
Added:
epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractCodec.java
epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/ToThrowAwayCodec.java
Modified:
epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java
epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
Log:
JBEPP-610: Passwords saved by CookieTokenService are in JCR DB in plain form
Copied: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractCodec.java (from rev 5167, portal/branches/branch-GTNPORTAL-1643/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractCodec.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractCodec.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractCodec.java 2011-03-23 09:04:25 UTC (rev 6115)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.web.security.security;
+
+import org.exoplatform.container.component.BaseComponentPlugin;
+
+/**
+ * Abstract codec used to encode/decode password stored/loaded on/from token entry
+ *
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * Nov 19, 2010
+ */
+
+public abstract class AbstractCodec extends BaseComponentPlugin
+{
+
+ public String getName()
+ {
+ return this.getClass().toString();
+ }
+
+ public abstract String encode(String plainInput);
+
+ public abstract String decode(String encodedInput);
+
+}
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java 2011-03-23 06:27:35 UTC (rev 6114)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java 2011-03-23 09:04:25 UTC (rev 6115)
@@ -24,6 +24,7 @@
import org.exoplatform.commons.chromattic.ChromatticManager;
import org.exoplatform.commons.chromattic.ContextualTask;
import org.exoplatform.commons.chromattic.SessionContext;
+import org.exoplatform.container.component.ComponentPlugin;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
@@ -47,6 +48,9 @@
/** . */
private String lifecycleName="autologin";
+ //TODO: Introduce the concept of priority and store the plugins in a map structure
+ private AbstractCodec codec;
+
public CookieTokenService(InitParams initParams, ChromatticManager chromatticManager)
{
super(initParams);
@@ -56,8 +60,19 @@
lifecycleName = (String)initParams.getValuesParam(SERVICE_CONFIG).getValues().get(3);
}
this.chromatticLifeCycle = chromatticManager.getLifeCycle(lifecycleName);
+
+ //Set the default codec
+ this.codec = new ToThrowAwayCodec();
}
+ public final void setupCodec(ComponentPlugin codecPlugin)
+ {
+ if(codecPlugin instanceof AbstractCodec)
+ {
+ this.codec = (AbstractCodec)codecPlugin;
+ }
+ }
+
public String createToken(final Credentials credentials)
{
if (validityMillis < 0)
@@ -76,7 +91,9 @@
long expirationTimeMillis = System.currentTimeMillis() + validityMillis;
GateInToken token = new GateInToken(expirationTimeMillis, credentials);
TokenContainer container = getTokenContainer();
- container.saveToken(tokenId, token.getPayload(), new Date(token.getExpirationTimeMillis()));
+
+ //Save the token, password is encoded thanks to the codec
+ container.encodeAndSaveToken(tokenId, token.getPayload(), new Date(expirationTimeMillis), codec);
return tokenId;
}
}.executeWith(chromatticLifeCycle);
@@ -89,7 +106,8 @@
@Override
protected GateInToken execute()
{
- return getTokenContainer().getToken((String)id);
+ //Get the token, encoded password is decoded thanks to codec
+ return getTokenContainer().getTokenAndDecode(id, codec);
}
}.executeWith(chromatticLifeCycle);
}
Copied: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/ToThrowAwayCodec.java (from rev 5167, portal/branches/branch-GTNPORTAL-1643/component/web/security/src/main/java/org/exoplatform/web/security/security/ToThrowAwayCodec.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/ToThrowAwayCodec.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/ToThrowAwayCodec.java 2011-03-23 09:04:25 UTC (rev 6115)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.web.security.security;
+
+/**
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * Nov 19, 2010
+ */
+
+public class ToThrowAwayCodec extends AbstractCodec
+{
+
+ @Override
+ public String decode(String encodedInput)
+ {
+ return encodedInput;
+ }
+
+ @Override
+ public String encode(String plainInput)
+ {
+ return plainInput;
+ }
+
+}
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2011-03-23 06:27:35 UTC (rev 6114)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2011-03-23 09:04:25 UTC (rev 6115)
@@ -84,5 +84,37 @@
entry.setExpirationTime(expirationTime);
return entry.getToken();
}
+
+ public GateInToken encodeAndSaveToken(String tokenId, Credentials credentials, Date expirationTime, AbstractCodec codec)
+ {
+ Map<String, TokenEntry> tokens = getTokens();
+ TokenEntry entry = tokens.get(tokenId);
+ if (entry == null)
+ {
+ entry = createToken();
+ tokens.put(tokenId, entry);
+ entry.setUserName(credentials.getUsername());
+ entry.setPassword(codec.encode(credentials.getPassword()));
+ }
+ entry.setExpirationTime(expirationTime);
+ return entry.getToken();
+ }
+
+ public GateInToken getTokenAndDecode(String tokenId, AbstractCodec codec)
+ {
+ Map<String, TokenEntry> tokens = getTokens();
+ TokenEntry entry = tokens.get(tokenId);
+ if(entry != null)
+ {
+ GateInToken gateInToken = entry.getToken();
+ Credentials payload = gateInToken.getPayload();
+
+ //Return a cloned GateInToken
+ return new GateInToken(gateInToken.getExpirationTimeMillis(), new Credentials(payload.getUsername(), codec
+ .decode(payload.getPassword())));
+ }
+ return null;
+ }
+
}
13 years, 2 months
- 1
- 0
gatein SVN: r6114 - in epp/docs/branches/5.1/Reference_Guide/en-US: modules and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-03-23 02:27:35 -0400 (Wed, 23 Mar 2011)
New Revision: 6114
Modified:
epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml
Log:
Edits to new WSRP content and increment book for staging.
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml 2011-03-23 01:53:48 UTC (rev 6113)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml 2011-03-23 06:27:35 UTC (rev 6114)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>5.1</pubsnumber>
+ <pubsnumber>5.2</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml 2011-03-23 01:53:48 UTC (rev 6113)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml 2011-03-23 06:27:35 UTC (rev 6114)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.2</revnumber>
+ <date>Wed Mar 23 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Adding WSRP removal procedure as per JBEPP-739.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-5.1</revnumber>
<date>Tue Dec 21 2010</date>
<author>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml 2011-03-23 01:53:48 UTC (rev 6113)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml 2011-03-23 06:27:35 UTC (rev 6114)
@@ -1323,7 +1323,7 @@
<para>
Open the <filename>configuration.xml</filename> file and remove the following lines:
</para>
-<programlisting><![CDATA[<value>
+<programlisting language="XML" role="XML"><![CDATA[<value>
<string>wsrp-producer</string>
</value>
]]></programlisting>
@@ -1403,7 +1403,7 @@
<para>
Open the <filename>application.xml</filename> file and remove the following modules:
</para>
-<programlisting><![CDATA[<module>
+<programlisting language="XML" role="XML"><![CDATA[<module>
<web>
<web-uri>wsrp-admin-gui.war</web-uri>
<context-root>wsrp-admin-gui</context-root>
@@ -1411,7 +1411,7 @@
</module>
]]></programlisting>
-<programlisting><![CDATA[<module>
+<programlisting language="XML" role="XML"><![CDATA[<module>
<web>
<web-uri>wsrp-producer.war</web-uri>
<context-root>wsrp-producer</context-root>
@@ -1445,7 +1445,7 @@
<para>
Open the <filename>configuration.xml</filename> file and remove the following line:
</para>
-<programlisting><![CDATA[<import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import>
+<programlisting language="XML" role="XML"><![CDATA[<import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import>
]]></programlisting>
</step>
<step>
@@ -1464,7 +1464,7 @@
<para>
Open the <filename>portal-configuration.xml</filename> file and remove the line:
</para>
-<programlisting><![CDATA[<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
+<programlisting language="XML" role="XML"><![CDATA[<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
]]></programlisting>
</step>
<step>
@@ -1483,14 +1483,14 @@
<para>
Open the <filename>jcr-configuration.xml</filename> file and remove the line:
</para>
-<programlisting><![CDATA[<property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
+<programlisting language="XML" role="XML"><![CDATA[<property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
]]></programlisting>
</step>
<step>
<para>
Remove the following configuration file references:
</para>
-<programlisting><![CDATA[<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
+<programlisting language="XML" role="XML"><![CDATA[<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
@@ -1506,72 +1506,72 @@
<para>
Open the <filename>repository-configuration.xml</filename> and remove the <emphasis role="bold">WSRP</emphasis> workspace:
</para>
-<programlisting><![CDATA[<!-- WSRP -->
- <workspace name="wsrp-system">
- <container>
+<programlisting language="XML" role="XML"><![CDATA[<!-- WSRP -->
+ <workspace name="wsrp-system">
+ <container>
+ <properties>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="gadgets"
+ >
<properties>
- <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
- <property name="multi-db" value="false"/>
- <property name="update-storage" value="true"/>
- <property name="max-buffer-size" value="204800"/>
- <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/>
- </properties>
- <value-storages>
- <value-storage id="gadgets"
- >
- <properties>
- <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/>
- </properties>
- <filters>
- <filter property-type="Binary"/>
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer>
- <properties>
- <property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
- </properties>
- </initializer>
- <cache enabled="true">
- <properties>
- <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
- <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" />
- </properties>
- </cache>
- <query-handler>
- <properties>
- <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/>
- <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
- <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
- <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" />
- <property name="max-volatile-time" value="60" />
- </properties>
- </query-handler>
- <lock-manager>
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
- <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" />
- <property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
- <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
- <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
- </properties>
- </lock-manager>
- </workspace>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer>
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" />
+ </properties>
+ </cache>
+ <query-handler>
+ <properties>
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" />
+ <property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
+ <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
+ </properties>
+ </lock-manager>
+ </workspace>
]]></programlisting>
</step>
</substeps>
13 years, 2 months
- 1
- 0
gatein SVN: r6113 - epp/docs/branches/5.2/Reference_Guide/en-US/modules.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-03-22 21:53:48 -0400 (Tue, 22 Mar 2011)
New Revision: 6113
Modified:
epp/docs/branches/5.2/Reference_Guide/en-US/modules/WSRP.xml
Log:
Porting new WSRP content for 5.1.1 to 5.2
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/modules/WSRP.xml 2011-03-23 01:38:47 UTC (rev 6112)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/WSRP.xml 2011-03-23 01:53:48 UTC (rev 6113)
@@ -183,12 +183,6 @@
</listitem>
</varlistentry>
</variablelist>
- <para>
- If WSRP is not going to be used in your &PRODUCT; instance your installation will not be adversely affected should you leave the WSRP files in place.
- </para>
- <para>
- However, if you wish to completely remove WSRP from your &PRODUCT; installation, follow the procedure at <ulink type="http" url="http://community.jboss.org/wiki/WSRPserviceremovalprocedure"></ulink>.
- </para> <!-- DOC NOTE: Port this procedure into the doc for EPP 5.1.1 JBEPP-739 -->
<section id="sect-Reference_Guide-Deploying_WSRP-Non_default_Ports_or_Hostnames">
<title>Non-default Ports or Hostnames</title>
@@ -1308,7 +1302,303 @@
By default, the WSRP producer is configured in strict mode. If you experience issues with a given consumer, you may attempt to relax the validation mode. Un-checking the "Use strict WSRP compliance" checkbox on the Producer configuration screen to do this.
</para>
</section>
-
</section>
+ <section id="sect-Reference_Guide-Web_Services_for_Remote_Portlets_WSRP-Removing_WSRP">
+ <title>Removing WSRP</title>
+ <para>
+ If you are not going to use WSRP in your &PRODUCT; instance, your installation will not be adversely affected should you leave the WSRP files in place.
+ </para>
+ <para>
+ However, if you wish to completely remove WSRP from your &PRODUCT; installation, follow this procedure:
+ </para>
+ <procedure>
+ <title></title>
+ <step>
+ <para>
+ Navigate to the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable><PROFILE></replaceable>/conf/gatein/</filename> directory of your &PRODUCT; instance.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>configuration.xml</filename> file and remove the following lines:
+ </para>
+<programlisting><![CDATA[<value>
+ <string>wsrp-producer</string>
+</value>
+]]></programlisting>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Navigate up two directory levels and into the <filename>deploy/gatein.ear/</filename> directory (For example: <command>cd ../../deploy/gatein.ear/</command>).
+ </para>
+ </step>
+ <step>
+ <para>
+ Remove the following files:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>wsrp-admin-gui.war</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-producer.war</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Navigate into the <filename>lib/</filename> subdirectory and remove the following files:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>gatein.portal.component.wsrp-PORTAL_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-common-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-consumer-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-integration-api-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-producer-lib-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-wsrp1-ws-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-wsrp2-ws-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Return to the <filename>gatein.ear/</filename> directory and move into the <filename>META-INF/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>application.xml</filename> file and remove the following modules:
+ </para>
+<programlisting><![CDATA[<module>
+ <web>
+ <web-uri>wsrp-admin-gui.war</web-uri>
+ <context-root>wsrp-admin-gui</context-root>
+ </web>
+</module>
+]]></programlisting>
+
+<programlisting><![CDATA[<module>
+ <web>
+ <web-uri>wsrp-producer.war</web-uri>
+ <context-root>wsrp-producer</context-root>
+ </web>
+</module>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ <step>
+ <para>
+ Remove all the <emphasis role="bold">WSRP</emphasis> SHA1 entries in the <filename>MANIFEST.MF</filename> file. They are not required.
+ </para>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Return to the <filename>gatein.ear/</filename> directory and navigate into the <filename>02portal.war/WEB-INF/conf/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Remove the <filename>wsrp/</filename> directory.
+ </para>
+ </step>
+ <step>
+ <para>
+ Open the <filename>configuration.xml</filename> file and remove the following line:
+ </para>
+<programlisting><![CDATA[<import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ From your current location, navigate into the <filename>portal/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>portal-configuration.xml</filename> file and remove the line:
+ </para>
+<programlisting><![CDATA[<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Return to the <filename>conf/</filename> directory and move into the <filename>jcr/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>jcr-configuration.xml</filename> file and remove the line:
+ </para>
+<programlisting><![CDATA[<property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Remove the following configuration file references:
+ </para>
+<programlisting><![CDATA[<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
+<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
+<value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
+<value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
+<value>war:/conf/wsrp/migration-nodetypes.xml</value>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ <step>
+ <para>
+ Open the <filename>repository-configuration.xml</filename> and remove the <emphasis role="bold">WSRP</emphasis> workspace:
+ </para>
+<programlisting><![CDATA[<!-- WSRP -->
+ <workspace name="wsrp-system">
+ <container>
+ <properties>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="gadgets"
+ >
+ <properties>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer>
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" />
+ </properties>
+ </cache>
+ <query-handler>
+ <properties>
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" />
+ <property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
+ <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
+ </properties>
+ </lock-manager>
+ </workspace>
+]]></programlisting>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <title>Optional:</title>
+ <para>
+ Remove any references to <emphasis>WSRP</emphasis> from the following files:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>gatein.ear/01eXoResources.war/META-INF/MANIFEST.MF</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>gatein.ear/META-INF/MANIFEST.MF</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>gatein.ear/02portal.war/META-INF/MANIFEST.MF</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ </procedure>
+ </section>
</chapter>
13 years, 2 months
- 1
- 0
gatein SVN: r6112 - in epp/docs/branches: 5.1/Reference_Guide/en-US/modules and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-03-22 21:38:47 -0400 (Tue, 22 Mar 2011)
New Revision: 6112
Added:
epp/docs/branches/5.0/
epp/docs/branches/5.1/
epp/docs/branches/5.2/
Removed:
epp/docs/branches/EPP_5_0_Branch/
epp/docs/branches/EPP_5_1_Branch/
epp/docs/branches/EPP_5_2_Branch/
Modified:
epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml
Log:
Streamlined branch names
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2011-03-22 14:12:25 UTC (rev 6111)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml 2011-03-23 01:38:47 UTC (rev 6112)
@@ -183,12 +183,6 @@
</listitem>
</varlistentry>
</variablelist>
- <para>
- If WSRP is not going to be used in your &PRODUCT; instance your installation will not be adversely affected should you leave the WSRP files in place.
- </para>
- <para>
- However, if you wish to completely remove WSRP from your &PRODUCT; installation, follow the procedure at <ulink type="http" url="http://community.jboss.org/wiki/WSRPserviceremovalprocedure"></ulink>.
- </para> <!-- DOC NOTE: Port this procedure into the doc for EPP 5.1.1 JBEPP-739 -->
<section id="sect-Reference_Guide-Deploying_WSRP-Non_default_Ports_or_Hostnames">
<title>Non-default Ports or Hostnames</title>
@@ -1308,7 +1302,303 @@
By default, the WSRP producer is configured in strict mode. If you experience issues with a given consumer, you may attempt to relax the validation mode. Un-checking the "Use strict WSRP compliance" checkbox on the Producer configuration screen to do this.
</para>
</section>
-
</section>
+ <section id="sect-Reference_Guide-Web_Services_for_Remote_Portlets_WSRP-Removing_WSRP">
+ <title>Removing WSRP</title>
+ <para>
+ If you are not going to use WSRP in your &PRODUCT; instance, your installation will not be adversely affected should you leave the WSRP files in place.
+ </para>
+ <para>
+ However, if you wish to completely remove WSRP from your &PRODUCT; installation, follow this procedure:
+ </para>
+ <procedure>
+ <title></title>
+ <step>
+ <para>
+ Navigate to the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable><PROFILE></replaceable>/conf/gatein/</filename> directory of your &PRODUCT; instance.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>configuration.xml</filename> file and remove the following lines:
+ </para>
+<programlisting><![CDATA[<value>
+ <string>wsrp-producer</string>
+</value>
+]]></programlisting>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Navigate up two directory levels and into the <filename>deploy/gatein.ear/</filename> directory (For example: <command>cd ../../deploy/gatein.ear/</command>).
+ </para>
+ </step>
+ <step>
+ <para>
+ Remove the following files:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>wsrp-admin-gui.war</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-producer.war</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Navigate into the <filename>lib/</filename> subdirectory and remove the following files:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>gatein.portal.component.wsrp-PORTAL_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-common-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-consumer-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-integration-api-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-producer-lib-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-wsrp1-ws-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>wsrp-wsrp2-ws-WSRP_VERSION.jar</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Return to the <filename>gatein.ear/</filename> directory and move into the <filename>META-INF/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>application.xml</filename> file and remove the following modules:
+ </para>
+<programlisting><![CDATA[<module>
+ <web>
+ <web-uri>wsrp-admin-gui.war</web-uri>
+ <context-root>wsrp-admin-gui</context-root>
+ </web>
+</module>
+]]></programlisting>
+
+<programlisting><![CDATA[<module>
+ <web>
+ <web-uri>wsrp-producer.war</web-uri>
+ <context-root>wsrp-producer</context-root>
+ </web>
+</module>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ <step>
+ <para>
+ Remove all the <emphasis role="bold">WSRP</emphasis> SHA1 entries in the <filename>MANIFEST.MF</filename> file. They are not required.
+ </para>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Return to the <filename>gatein.ear/</filename> directory and navigate into the <filename>02portal.war/WEB-INF/conf/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Remove the <filename>wsrp/</filename> directory.
+ </para>
+ </step>
+ <step>
+ <para>
+ Open the <filename>configuration.xml</filename> file and remove the following line:
+ </para>
+<programlisting><![CDATA[<import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ From your current location, navigate into the <filename>portal/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>portal-configuration.xml</filename> file and remove the line:
+ </para>
+<programlisting><![CDATA[<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Return to the <filename>conf/</filename> directory and move into the <filename>jcr/</filename> subdirectory.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Open the <filename>jcr-configuration.xml</filename> file and remove the line:
+ </para>
+<programlisting><![CDATA[<property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Remove the following configuration file references:
+ </para>
+<programlisting><![CDATA[<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
+<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
+<value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
+<value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
+<value>war:/conf/wsrp/migration-nodetypes.xml</value>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Save and exit the file.
+ </para>
+ </step>
+ <step>
+ <para>
+ Open the <filename>repository-configuration.xml</filename> and remove the <emphasis role="bold">WSRP</emphasis> workspace:
+ </para>
+<programlisting><![CDATA[<!-- WSRP -->
+ <workspace name="wsrp-system">
+ <container>
+ <properties>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="gadgets"
+ >
+ <properties>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer>
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" />
+ </properties>
+ </cache>
+ <query-handler>
+ <properties>
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" />
+ <property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
+ <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
+ </properties>
+ </lock-manager>
+ </workspace>
+]]></programlisting>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <title>Optional:</title>
+ <para>
+ Remove any references to <emphasis>WSRP</emphasis> from the following files:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>gatein.ear/01eXoResources.war/META-INF/MANIFEST.MF</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>gatein.ear/META-INF/MANIFEST.MF</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>gatein.ear/02portal.war/META-INF/MANIFEST.MF</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ </procedure>
+ </section>
</chapter>
13 years, 2 months
- 1
- 0
gatein SVN: r6111 - epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-03-22 10:12:25 -0400 (Tue, 22 Mar 2011)
New Revision: 6111
Modified:
epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js
Log:
JBEPP-856: Local Rss Reader gadget don't work under https mode
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js 2011-03-22 13:03:31 UTC (rev 6110)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js 2011-03-22 14:12:25 UTC (rev 6111)
@@ -110,8 +110,8 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
- "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
+ "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
"home" : {
13 years, 2 months
- 1
- 0
gatein SVN: r6110 - in epp/portal/branches/EPP_5_1_Branch: packaging and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-03-22 09:03:31 -0400 (Tue, 22 Mar 2011)
New Revision: 6110
Modified:
epp/portal/branches/EPP_5_1_Branch/
epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
JBEPP-568:
Property changes on: epp/portal/branches/EPP_5_1_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1700:5348,5445
/portal/branches/branch-GTNPORTAL-1731:5668
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002
/portal/branches/branch-GTNPORTAL-1700:5348,5445
/portal/branches/branch-GTNPORTAL-1731:5668
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml 2011-03-22 10:37:23 UTC (rev 6109)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml 2011-03-22 13:03:31 UTC (rev 6110)
@@ -29,7 +29,7 @@
ex: On Windows 'c:/AS'
ex: On Linux '/home/user/AS'
-->
- <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>
+ <exo.projects.directory.dependencies>/opt/AS</exo.projects.directory.dependencies>
<!--
If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)
Uncomment and Replace with the directory you prefer
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-03-22 10:37:23 UTC (rev 6109)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-03-22 13:03:31 UTC (rev 6110)
@@ -26,7 +26,6 @@
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.navigation.ParentChildPair;
import org.exoplatform.portal.webui.page.UIPage;
import org.exoplatform.portal.webui.page.UIPageNodeForm;
import org.exoplatform.portal.webui.portal.UIPortalComposer;
@@ -448,7 +447,6 @@
uiToolPanel.setWorkingComponent(UIPage.class, null);
UIPage uiPage = (UIPage)uiToolPanel.getUIComponent();
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
if(selectPage.getTitle() == null)
selectPage.setTitle(selectedPageNode.getLabel());
@@ -536,46 +534,48 @@
{
public void execute(Event<UIRightClickPopupMenu> event) throws Exception
{
- String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
- WebuiRequestContext pcontext = event.getRequestContext();
- UIApplication uiApp = pcontext.getUIApplication();
- UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
- UINavigationManagement uiManagement = uiNodeSelector.getParent();
- Class<?>[] childrenToRender = new Class<?>[]{UINavigationNodeSelector.class};
- uiManagement.setRenderedChildrenOfTypes(childrenToRender);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement);
+ String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
+ WebuiRequestContext pcontext = event.getRequestContext();
+ UIApplication uiApp = pcontext.getUIApplication();
+ UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
+ UINavigationManagement uiManagement = uiNodeSelector.getParent();
+ Class<?>[] childrenToRender = new Class<?>[]{UINavigationNodeSelector.class};
+ uiManagement.setRenderedChildrenOfTypes(childrenToRender);
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement);
- PageNavigation nav = uiNodeSelector.getEdittedNavigation();
- if (nav == null)
- {
- return;
- }
-
- PageNode[] pageNodes = PageNavigationUtils.searchPageNodesByUri(nav, uri);
- if (pageNodes == null)
- {
- return;
- }
-
- for (PageNode pageNode : pageNodes) {
- if(pageNode != null && pageNode.isSystem()) {
- uiApp.addMessage(new ApplicationMessage("UINavigationNodeSelector.msg.systemnode-move", null));
- return;
- }
- }
-
- TreeNodeData selectedNode = new TreeNodeData(nav, pageNodes[0], pageNodes[1]);
- selectedNode.setDeleteNode(false);
- uiNodeSelector.setCopyNode(selectedNode);
- event.getSource().setActions(
- new String[]{"AddNode", "EditPageNode", "EditSelectedNode", "CopyNode", "CloneNode", "CutNode",
- "PasteNode", "DeleteNode", "MoveUp", "MoveDown"});
+ PageNavigation nav = uiNodeSelector.getEdittedNavigation();
+ if (nav == null)
+ {
+ return;
+ }
- if (uiNodeSelector.getCopyNode() == null)
- {
- return;
- }
- uiNodeSelector.getCopyNode().setDeleteNode(true);
+ ParentChildPair parentChildPair = PageNavigationUtils.searchParentChildPairByUri(nav, uri);
+ if (parentChildPair == null)
+ {
+ return;
+ }
+
+ PageNode parentNode = parentChildPair.getParentNode();
+ PageNode childNode = parentChildPair.getChildNode();
+
+ if (childNode != null && childNode.isSystem())
+ {
+ uiApp.addMessage(new ApplicationMessage("UINavigationNodeSelector.msg.systemnode-move", null));
+ return;
+ }
+
+ TreeNodeData selectedNode = new TreeNodeData(nav, parentNode, childNode);
+ selectedNode.setDeleteNode(false);
+ uiNodeSelector.setCopyNode(selectedNode);
+ event.getSource().setActions(
+ new String[]{"AddNode", "EditPageNode", "EditSelectedNode", "CopyNode", "CloneNode", "CutNode",
+ "PasteNode", "DeleteNode", "MoveUp", "MoveDown"});
+
+ if (uiNodeSelector.getCopyNode() == null)
+ {
+ return;
+ }
+ uiNodeSelector.getCopyNode().setDeleteNode(true);
}
}
13 years, 2 months
- 1
- 0
gatein SVN: r6109 - in epp/portal/branches/EPP_5_1_Branch: webui/framework/src/main/java/org/exoplatform/webui/config and 12 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-03-22 06:37:23 -0400 (Tue, 22 Mar 2011)
New Revision: 6109
Added:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml
Removed:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml
Modified:
epp/portal/branches/EPP_5_1_Branch/
epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml
Log:
JBEPP-459: NullPointerException in BreadcumbsPortlet during performance test
Property changes on: epp/portal/branches/EPP_5_1_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1731:5668
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1700:5348,5445
/portal/branches/branch-GTNPORTAL-1731:5668
Modified: epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java 2011-03-22 09:34:28 UTC (rev 6108)
+++ epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -56,7 +56,8 @@
private final List<EventInterceptor> eventInterceptors;
- private Map<String, Event> eventMap;
+ /** Declare this map as volatile to make double-check work properly **/
+ private volatile Map<String, Event> eventMap;
private Lifecycle<UIComponent> componentLifecycle;
@@ -182,18 +183,21 @@
{
if(eventMap == null)
{
- eventMap = new HashMap<String, Event>();
+ Map<String, Event> temporaryMap = new HashMap<String, Event>();
if (events == null)
{
+ eventMap = temporaryMap;
return null;
}
for (Event event : events)
{
createCachedEventListeners(event);
- eventMap.put(event.getName(), event);
+ temporaryMap.put(event.getName(), event);
}
+
+ eventMap = temporaryMap;
}
return eventMap.get(eventName);
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml 2011-03-22 09:34:28 UTC (rev 6108)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml 2011-03-22 10:37:23 UTC (rev 6109)
@@ -92,5 +92,12 @@
<groupId>org.gatein.captcha</groupId>
<artifactId>simplecaptcha</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Deleted: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java 2010-11-29 11:15:53 UTC (rev 5348)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -1,123 +0,0 @@
-/******************************************************************************
- * 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.exoplatform.portal.webui.test;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.exoplatform.portal.webui.portal.PageNodeEvent;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.webui.config.Event;
-
-import org.exoplatform.component.test.AbstractGateInTest;
-
-/**
- * Unit test for concurrent read of event from UI component configuration.
- *
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- * @version $Revision$
- */
-public class ComponentConfigConcurrentTest extends AbstractGateInTest
-{
- private static final int WORKERS_COUNT = 20;
-
- private MockApplication mockApplication;
-
- public void testConcurrentReadOfComponentEventConfig() throws Exception
- {
- // Init configuration and mock WebUI application
- Map<String, String> initParams = new HashMap<String, String>();
- initParams.put("webui.configuration", "webui.configuration");
-
- String basedir = System.getProperty("basedir");
- String webuiConfig = basedir + "/src/test/resources/webui-configuration.xml";
- Map<String, URL> resources = new HashMap<String, URL>();
- resources.put("webui.configuration", new File(webuiConfig).toURI().toURL());
- initParams.put("webui.configuration", new File(webuiConfig).toURI().toURL().toString());
-
- mockApplication = new MockApplication(initParams, resources, null);
- mockApplication.onInit();
-
- // init workers list
- List<Worker> workers = new ArrayList<Worker>(WORKERS_COUNT);
-
- // test obtain event configuration concurrently with more worker threads
- for (int i=0 ; i<WORKERS_COUNT ; i++)
- {
- Worker worker = new Worker("Worker-" + i);
- workers.add(worker);
- worker.start();
- }
-
- // Wait for all workers to finish
- for (Worker worker : workers)
- {
- worker.join();
- }
-
- // Go throguh all workers and throw error if some worker has null eventConfig
- // Minh Hoang TO: Comment the assertNotNull as the test result is non-determinist for the moment
- for (Worker worker : workers)
- {
- //assertNotNull("event configuration is null in worker " + worker.getName(), worker.eventConfig);
- }
-
- // destroy mock application
- mockApplication.onDestroy();
- }
-
- private class Worker extends Thread
- {
- private Event eventConfig = null;
-
- public Worker(String name)
- {
- super(name);
- }
-
- public void run()
- {
- try
- {
- UIPortal uiPortal = mockApplication.createUIComponent(UIPortal.class, null, null, null);
- eventConfig = uiPortal.getComponentConfig().getUIComponentEventConfig(PageNodeEvent.CHANGE_PAGE_NODE);
-
- // log message now if eventConfig is null, so that we know about all failed workers. Test will be failed later.
- if (eventConfig == null)
- {
- log.error("eventConfig is null for worker " + getName());
- }
- }
- catch (Exception e)
- {
- log.error("Exception occured during concurrent test in worker " + getName(), e);
- }
- }
-
- }
-
-}
Copied: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java (from rev 5348, portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/ComponentConfigConcurrentTest.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * 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.exoplatform.portal.webui.test;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.exoplatform.portal.webui.portal.PageNodeEvent;
+import org.exoplatform.portal.webui.portal.UIPortal;
+import org.exoplatform.webui.config.Event;
+
+import org.exoplatform.component.test.AbstractGateInTest;
+
+/**
+ * Unit test for concurrent read of event from UI component configuration.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ * @version $Revision$
+ */
+public class ComponentConfigConcurrentTest extends AbstractGateInTest
+{
+ private static final int WORKERS_COUNT = 50;
+
+ private MockApplication mockApplication;
+
+ public void testConcurrentReadOfComponentEventConfig() throws Exception
+ {
+ // Init configuration and mock WebUI application
+ Map<String, String> initParams = new HashMap<String, String>();
+ initParams.put("webui.configuration", "webui.configuration");
+
+ String basedir = System.getProperty("basedir");
+ String webuiConfig = basedir + "/src/test/resources/webui-configuration.xml";
+ Map<String, URL> resources = new HashMap<String, URL>();
+ resources.put("webui.configuration", new File(webuiConfig).toURI().toURL());
+ initParams.put("webui.configuration", new File(webuiConfig).toURI().toURL().toString());
+
+ mockApplication = new MockApplication(initParams, resources, null);
+ mockApplication.onInit();
+
+ // init workers list
+ List<Worker> workers = new ArrayList<Worker>(WORKERS_COUNT);
+
+ // test obtain event configuration concurrently with more worker threads
+ for (int i=0 ; i<WORKERS_COUNT ; i++)
+ {
+ Worker worker = new Worker("Worker-" + i);
+ workers.add(worker);
+ worker.start();
+ }
+
+ // Wait for all workers to finish
+ for (Worker worker : workers)
+ {
+ worker.join();
+ }
+
+ // Go throguh all workers and throw error if some worker has null eventConfig
+ for (Worker worker : workers)
+ {
+ assertNotNull("event configuration is null in worker " + worker.getName(), worker.eventConfig);
+ }
+
+ // destroy mock application
+ mockApplication.onDestroy();
+ }
+
+ private class Worker extends Thread
+ {
+ private Event eventConfig = null;
+
+ public Worker(String name)
+ {
+ super(name);
+ }
+
+ public void run()
+ {
+ try
+ {
+ UIPortal uiPortal = mockApplication.createUIComponent(UIPortal.class, null, null, null);
+ eventConfig = uiPortal.getComponentConfig().getUIComponentEventConfig(PageNodeEvent.CHANGE_PAGE_NODE);
+
+ // log message now if eventConfig is null, so that we know about all failed workers. Test will be failed later.
+ if (eventConfig == null)
+ {
+ log.error("eventConfig is null for worker " + getName());
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Exception occured during concurrent test in worker " + getName(), e);
+ }
+ }
+
+ }
+
+}
Deleted: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java 2010-11-29 11:15:53 UTC (rev 5348)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -1,98 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.portal.webui.test;
-
-import java.net.URL;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.portal.application.PortalStateManager;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.resolver.ApplicationResourceResolver;
-import org.exoplatform.resolver.MockResourceResolver;
-import org.exoplatform.webui.application.WebuiApplication;
-
-public class MockApplication extends WebuiApplication
-{
-
- private Map<String, String> initParams_;
-
- private ResourceBundle appRes_;
-
- public MockApplication(Map<String, String> initParams, Map<String, URL> resources, ResourceBundle appRes)
- {
- initParams_ = initParams;
- appRes_ = appRes;
- ApplicationResourceResolver resolver = new ApplicationResourceResolver();
- resolver.addResourceResolver(new MockResourceResolver(resources));
- setResourceResolver(resolver);
- }
-
- public String getApplicationId()
- {
- return "MockApplication";
- }
-
- public String getApplicationName()
- {
- return "MockApplication";
- }
-
- @SuppressWarnings("unused")
- public ResourceBundle getResourceBundle(Locale locale) throws Exception
- {
- return appRes_;
- }
-
- @SuppressWarnings("unused")
- public ResourceBundle getOwnerResourceBundle(String username, Locale locale) throws Exception
- {
- return null;
- }
-
- public String getApplicationInitParam(String name)
- {
- return initParams_.get(name);
- }
-
- @Override
- public ExoContainer getApplicationServiceContainer()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getApplicationGroup()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getApplicationType()
- {
- // TODO Auto-generated method stub
- return null;
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java (from rev 5348, portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockApplication.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -0,0 +1,98 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.webui.test;
+
+import java.net.URL;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.portal.application.PortalStateManager;
+import org.exoplatform.portal.webui.portal.UIPortal;
+import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.resolver.ApplicationResourceResolver;
+import org.exoplatform.resolver.MockResourceResolver;
+import org.exoplatform.webui.application.WebuiApplication;
+
+public class MockApplication extends WebuiApplication
+{
+
+ private Map<String, String> initParams_;
+
+ private ResourceBundle appRes_;
+
+ public MockApplication(Map<String, String> initParams, Map<String, URL> resources, ResourceBundle appRes)
+ {
+ initParams_ = initParams;
+ appRes_ = appRes;
+ ApplicationResourceResolver resolver = new ApplicationResourceResolver();
+ resolver.addResourceResolver(new MockResourceResolver(resources));
+ setResourceResolver(resolver);
+ }
+
+ public String getApplicationId()
+ {
+ return "MockApplication";
+ }
+
+ public String getApplicationName()
+ {
+ return "MockApplication";
+ }
+
+ @SuppressWarnings("unused")
+ public ResourceBundle getResourceBundle(Locale locale) throws Exception
+ {
+ return appRes_;
+ }
+
+ @SuppressWarnings("unused")
+ public ResourceBundle getOwnerResourceBundle(String username, Locale locale) throws Exception
+ {
+ return null;
+ }
+
+ public String getApplicationInitParam(String name)
+ {
+ return initParams_.get(name);
+ }
+
+ @Override
+ public ExoContainer getApplicationServiceContainer()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getApplicationGroup()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getApplicationType()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
Deleted: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java 2010-11-29 11:15:53 UTC (rev 5348)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.portal.webui.test;
-
-import org.exoplatform.webui.application.StateManager;
-import org.exoplatform.webui.application.WebuiApplication;
-import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.webui.core.UIApplication;
-
-public class MockStateManager extends StateManager
-{
-
- @SuppressWarnings("unused")
- public UIApplication restoreUIRootComponent(WebuiRequestContext context)
- {
- return null;
- }
-
- @SuppressWarnings("unused")
- public void storeUIRootComponent(WebuiRequestContext context)
- {
- }
-
- @SuppressWarnings("unused")
- public void expire(String sessionId, WebuiApplication app)
- {
-
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java (from rev 5348, portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/java/org/exoplatform/portal/webui/test/MockStateManager.java 2011-03-22 10:37:23 UTC (rev 6109)
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.webui.test;
+
+import org.exoplatform.webui.application.StateManager;
+import org.exoplatform.webui.application.WebuiApplication;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.core.UIApplication;
+
+public class MockStateManager extends StateManager
+{
+
+ @SuppressWarnings("unused")
+ public UIApplication restoreUIRootComponent(WebuiRequestContext context)
+ {
+ return null;
+ }
+
+ @SuppressWarnings("unused")
+ public void storeUIRootComponent(WebuiRequestContext context)
+ {
+ }
+
+ @SuppressWarnings("unused")
+ public void expire(String sessionId, WebuiApplication app)
+ {
+
+ }
+}
Deleted: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/resources/conf/portal/test-configuration.xml 2010-11-29 11:15:53 UTC (rev 5348)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml 2011-03-22 10:37:23 UTC (rev 6109)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-</configuration>
Copied: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml (from rev 5348, portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/resources/conf/portal/test-configuration.xml)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/conf/portal/test-configuration.xml 2011-03-22 10:37:23 UTC (rev 6109)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+</configuration>
Deleted: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/resources/webui-configuration.xml 2010-11-29 11:15:53 UTC (rev 5348)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml 2011-03-22 10:37:23 UTC (rev 6109)
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<webui-configuration>
- <application>
- <init-params>
- </init-params>
-
- <ui-component-root>org.exoplatform.portal.webui.workspace.UIPortalApplication</ui-component-root>
- <state-manager>org.exoplatform.portal.webui.test.MockStateManager</state-manager>
-
- <application-lifecycle-listeners>
- <listener>org.exoplatform.webui.application.MonitorApplicationLifecycle</listener>
- </application-lifecycle-listeners>
-
- <events>
- </events>
- </application>
-</webui-configuration>
Copied: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml (from rev 5348, portal/branches/branch-GTNPORTAL-1700/webui/portal/src/test/resources/webui-configuration.xml)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/test/resources/webui-configuration.xml 2011-03-22 10:37:23 UTC (rev 6109)
@@ -0,0 +1,37 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<webui-configuration>
+ <application>
+ <init-params>
+ </init-params>
+
+ <ui-component-root>org.exoplatform.portal.webui.workspace.UIPortalApplication</ui-component-root>
+ <state-manager>org.exoplatform.portal.webui.test.MockStateManager</state-manager>
+
+ <application-lifecycle-listeners>
+ <listener>org.exoplatform.webui.application.MonitorApplicationLifecycle</listener>
+ </application-lifecycle-listeners>
+
+ <events>
+ </events>
+ </application>
+</webui-configuration>
13 years, 2 months
- 1
- 0
gatein SVN: r6108 - portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-03-22 05:34:28 -0400 (Tue, 22 Mar 2011)
New Revision: 6108
Added:
portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java
Modified:
portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java
Log:
GTNPORTAL-1823 Fail to create one page when creating two new pages at the same time.
- Added navigation nodes test
Modified: portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java
===================================================================
--- portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java 2011-03-22 06:53:26 UTC (rev 6107)
+++ portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java 2011-03-22 09:34:28 UTC (rev 6108)
@@ -40,13 +40,13 @@
private static final Logger log = Logger.getLogger(Test_GTNPORTAL_1823_FailToCreatePage.class);
/** Number of concurrent threads for the test */
- private static final int TCOUNT = 2;
+ protected static final int TCOUNT = 2;
/** Counter for id generation */
- private static AtomicInteger idCounter = new AtomicInteger(1);
+ protected static AtomicInteger idCounter = new AtomicInteger(1);
/** Down counter used to synchronize threads before clicking Finish */
- private static CountDownLatch sync = new CountDownLatch(TCOUNT);
+ protected static CountDownLatch sync = new CountDownLatch(TCOUNT);
/**
* Id for inclusion in page title so that every thread uses unique name for the newly added page
@@ -65,11 +65,11 @@
* @throws Throwable if test fails
*/
@Test(invocationCount = TCOUNT, threadPoolSize = TCOUNT, groups = {"GateIn", "jira", "htmlunit"})
- public void testGTNPORTAL_1823_FailToCreatePage() throws Throwable
+ public void testMain() throws Throwable
{
try
{
- test();
+ test(false);
}
finally
{
@@ -84,7 +84,7 @@
*
* @throws Throwable
*/
- private void test() throws Throwable
+ protected void test(boolean navNodeTest) throws Throwable
{
String id = nextId();
String categoryTitle = "Gadgets";
@@ -107,10 +107,11 @@
sync.await();
- // Uncomment this to make the test pass
- // TODO: even though everything looks ok, it's not - navigation only contains TestPage2 node when it should also contain TestPage1 node.
- //if (id.equals("2"))
- // Thread.sleep(5000);
+ if (navNodeTest && id.equals("2"))
+ {
+ // Finish click concurrency is inappropriate for navNodeTest where we need predictable order
+ Thread.sleep(5000);
+ }
// Now click Finish (both threads at the same time)
finishPageEdit();
@@ -121,6 +122,12 @@
Assert.assertNotSame(textPresent, failedText, "Concurrent Add Page issue reproduced!");
Assert.assertEquals(textPresent, portletName, "");
+ if (navNodeTest && id.equals("2"))
+ {
+ // Check that both test pages' navigation nodes are present
+ Assert.assertTrue(isElementPresent("link=TestPage1"), "TestPage1 link presence");
+ Assert.assertTrue(isElementPresent("link=TestPage2"), "TestPage2 link presence");
+ }
finished();
}
Added: portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java
===================================================================
--- portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java (rev 0)
+++ portal/trunk/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java 2011-03-22 09:34:28 UTC (rev 6108)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.gatein.htmlunit.jira;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class Test_GTNPORTAL_1823_FailToCreatePageNavNode extends Test_GTNPORTAL_1823_FailToCreatePage
+{
+
+ /**
+ * This test method relies on TestNG parallel test execution facility
+ * to perform two concurrent executions of this method on a single instance of the test class
+ *
+ * @throws Throwable if test fails
+ */
+ @Test(invocationCount = TCOUNT, threadPoolSize = TCOUNT, groups = {"GateIn", "jira", "htmlunit"})
+ public void testMain() throws Throwable
+ {
+ try
+ {
+ test(true);
+ }
+ finally
+ {
+ // If exception occurs we don't want the other thread to lock up
+ // - so we perform another countDown()
+ sync.countDown();
+ }
+ }
+}
\ No newline at end of file
13 years, 2 months
- 1
- 0
gatein SVN: r6107 - portal/branches.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-03-22 02:53:26 -0400 (Tue, 22 Mar 2011)
New Revision: 6107
Removed:
portal/branches/branch-GTNPORTAL-1832/
Log:
delete branch for Sprint 49
13 years, 2 months
- 1
- 0
gatein SVN: r6106 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/config and 15 other directories.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-03-22 02:41:29 -0400 (Tue, 22 Mar 2011)
New Revision: 6106
Modified:
portal/trunk/
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java
portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
Log:
merge branche-GTNPORTAL-1832 to trunk
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/wsrp-extraction:5828-6031
+ /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/wsrp-extraction:5828-6031
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -244,7 +244,15 @@
{
this.save();
//
- String ownerIdChunk = ownerId != null ? new MOPFormatter().encodeNodeName(null, ownerId) : "%";
+ String ownerIdChunk = "%";
+ if (ownerId != null)
+ {
+ ownerId = ownerId.trim();
+ if (!ownerId.isEmpty())
+ {
+ ownerIdChunk = new MOPFormatter().encodeNodeName(null, ownerId);
+ }
+ }
//
String ownerTypeChunk;
@@ -314,7 +322,7 @@
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
+ "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND " +
"(" +
- "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%' ESCAPE '\\')";
+ "LOWER(gtn:name) LIKE '%" + title.trim().toLowerCase() + "%' ESCAPE '\\')";
}
else
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -73,7 +73,7 @@
ObjectType<? extends Site> siteType = null;
if (ownerType != null)
{
- siteType = Mapper.parseSiteType(ownerType);
+ siteType = Mapper.parseSiteType(ownerType.trim());
}
ite = findW(session, siteType, q.getOwnerId(), q.getTitle());
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -94,7 +94,8 @@
httpResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
}
-
+ response.setContentType("text/css; charset=UTF-8");
+
final OutputStream out = response.getOutputStream();
final BinaryOutput output = new BinaryOutput()
{
Modified: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
===================================================================
--- portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -27,6 +27,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.security.ConversationState;
+import org.exoplatform.services.security.web.SetCurrentIdentityFilter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -44,7 +45,7 @@
/**
* Logger.
*/
- private static Log log = ExoLogger.getLogger("core.security.SetCurrentIdentityFilter");
+ private static Log log = ExoLogger.getLogger(SetCurrentIdentityFilter.class);
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws ServletException
{
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-22 06:41:29 UTC (rev 6106)
@@ -245,36 +245,24 @@
background: #dddddd;
color: #2e2e2e;
text-decoration: none;
- margin-bottom: 1px;
- line-height: 22px;
- padding: 0px 5px;
}
/* Selected menu item. */
.portlet-menu-item-selected {
background: #dddddd;
color: #058bb6;
- margin-bottom: 1px;
- line-height: 22px;
- padding: 0px 5px;
}
.portlet-menu-item-hover {
background: #dddddd;
color: #058bb6;
text-decoration: none;
- margin-bottom: 1px;
- line-height: 22px;
- padding: 0px 5px;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
background: #dddddd;
color: #058bb6;
- line-height: 22px;
- margin-bottom: 1px;
- padding: 0px 5px;
}
/* Normal, unselected menu item that has sub-menus. */
@@ -282,9 +270,6 @@
background: #e9e8ed;
color: #636363;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
/* Selected sub-menu item that has sub-menus */
@@ -292,36 +277,24 @@
background: #e9e8ed;
color: #252525;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.porlet-menu-cascade {
background: #e9e8ed;
color: #636363;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.portlet-menu-cascade-item-hover {
background: #e9e8ed;
color: #252525;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.portlet-menu-cascade-item-hover-selected {
background: #e9e8ed;
color: #252525;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.portlet-menu-separator {
@@ -333,64 +306,40 @@
background: #f6f6f6;
color: #717171;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-content-selected {
background: #f6f6f6;
color: #272727;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-content-hover {
background: #f6f6f6;
color: #272727;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-content-hover-selected {
background: #f6f6f6;
color: #272727;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator {
color: #8b8b8b;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator-selected {
color: #606060;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator-hover {
color: #606060;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator-hover-selected {
color: #606060;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-description {}
Modified: portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js 2011-03-22 06:41:29 UTC (rev 6106)
@@ -110,8 +110,8 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
- "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
+ "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
"home" : {
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -130,7 +130,7 @@
UIFormStringInput input = (UIFormStringInput)quickSearchInput.getChild(0);
UIFormSelectBox select = (UIFormSelectBox)quickSearchInput.getChild(1);
String name = input.getValue();
- if (name != null && !name.equals(""))
+ if (name != null && !(name = name.trim()).equals(""))
{
if (name.indexOf("*") < 0)
{
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -33,26 +33,26 @@
<div class="UIAdminToolbarPortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer" >
- <div class="UITab NormalToolbarTab">
+ <div class="UITab NormalToolbarTab portlet-menu-item">
<div class="">
<a class="EditorIcon TBIcon" href="#">$editorLabel</a>
</div>
- <div class="MenuItemContainer" style="display:none;">
+ <div class="MenuItemContainer portlet-menu-cascade" style="display:none;">
<div class="SubBlock">
<% if(userCouldEditNavigation){ %>
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a>
</div>
<% } %>
<% if(userCouldEditPage){ %>
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
</div>
<% } %>
<% if(userCouldEditPortal){ %>
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
</div>
<% } %>
@@ -61,4 +61,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -13,20 +13,20 @@
<div class="UIStarToolBarPortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer">
- <div class="UITab" style="width: 62px">
+ <div class="UITab portlet-menu-item" style="width: 62px">
<div class=""></div>
- <div class="MenuItemContainer" style="display:none;">
- <div class="MenuItem" onclick="$changeLanguageAction">
+ <div class="MenuItemContainer portlet-menu-cascade" style="display:none;">
+ <div class="MenuItem portlet-menu-cascade-item" onclick="$changeLanguageAction">
<a href="#" class="ChangeLanguageIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeLanguage")%></a>
</div>
- <div class="MenuItem" onclick="$changeSkinAction">
+ <div class="MenuItem portlet-menu-cascade-item" onclick="$changeSkinAction">
<a href="#" class="ChangeSkinIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeSkin")%></a>
</div>
- <div class="MenuItem" onclick="eXo.portal.logout();">
+ <div class="MenuItem portlet-menu-cascade-item" onclick="eXo.portal.logout();">
<a href="#" class="SignOutIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.Logout")%></a>
</div>
</div>
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -20,7 +20,7 @@
String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar") ;
navTitle = navTitle.replace("{0}", OrganizationUtils.getGroupLabel(navigation.ownerId));
print """
- <div class="TitleBar"><div style="width: 99%" title="$navigation.ownerId">$navTitle</div></div>
+ <div class="TitleBar portlet-menu-description"><div style="width: 99%" title="$navigation.ownerId">$navTitle</div></div>
<div class="SubBlock">
""" ;
for(int i = 0; i < nodes.size(); i++) {
@@ -35,7 +35,7 @@
PageNode selectedNode = uicomponent.getSelectedPageNode();
String tabStyleNavigation = "";
if(selectedNode != null && node.getUri() == selectedNode.getUri()) {
- tabStyleNavigation = "SelectedItem";
+ tabStyleNavigation = "SelectedItem portlet-menu-item-selected";
}
boolean hasChild = (node.getChildren() != null && node.getChildren().size() > 0);
@@ -52,7 +52,7 @@
EntityEncoder entityEncoder = EntityEncoder.FULL;
label = entityEncoder.encode(label);
print """
- <div class="MenuItem $tabStyleNavigation">
+ <div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item">
<div class="$clazz">
""";
if(node.pageReference != null) {
@@ -65,7 +65,7 @@
""" ;
if(hasChild) {
print """
- <div class="MenuItemContainer" style="position: absolute; display:none">
+ <div class="MenuItemContainer portlet-menu-cascade-separator" style="position: absolute; display:none">
<div class="SubBlock">
""" ;
for(int j = 0; j < node.getChildren().size(); j++) {
@@ -85,12 +85,12 @@
<div class="UIUserToolBarGroupPortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer">
- <div class="UITab NormalToolbarTab">
+ <div class="UITab NormalToolbarTab portlet-menu-item">
<div class="">
<a class="GroupIcon TBIcon" href="<%= portalURI + "groupnavigation" %>"><%=_ctx.appRes("UIUserToolBarGroupPortlet.header.group")%></a>
</div>
<% if (!groupNavigations.isEmpty()) { %>
- <div style="display:none" class="MenuItemContainer">
+ <div style="display:none" class="MenuItemContainer portlet-menu-cascade">
<% for(navigation in groupNavigations) {
renderGroupPageNavigation(navigation);
} %>
@@ -99,4 +99,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -16,7 +16,7 @@
void renderPortalNavigations() {
print """
- <div style="position: absolute; display:none" class="MenuItemContainer">
+ <div style="position: absolute; display:none" class="MenuItemContainer portlet-menu-cascade">
<div class="SubBlock">
""";
boolean isCurrent = false;
@@ -38,7 +38,7 @@
EntityEncoder entityEncoder = EntityEncoder.FULL;
portal = entityEncoder.encode(portal);
print """
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<div $clazz>
<a href="$href" class="ItemIcon SiteIcon">$portal</a>
</div>
@@ -60,7 +60,7 @@
navigation = uicomponent.getCurrentPortalNavigation();
nodes = navigation.getNodes();
print """
- <div style="position: absolute; display:none" class="MenuItemContainer">
+ <div style="position: absolute; display:none" class="MenuItemContainer portlet-menu-cascade">
<div class="SubBlock">
""";
for(int i = 0; i < nodes.size(); i++) {
@@ -76,7 +76,7 @@
PageNode selectedNode = uicomponent.getSelectedPageNode();
String tabStyleNavigation = "";
if(selectedNode != null && node.getUri() == selectedNode.getUri()) {
- tabStyleNavigation = "SelectedItem";
+ tabStyleNavigation = "SelectedItem portlet-menu-cascade-item-selected";
}
boolean hasChild = (node.getChildren() != null && node.getChildren().size() > 0);
@@ -93,7 +93,7 @@
EntityEncoder entityEncoder = EntityEncoder.FULL;
label = entityEncoder.encode(label);
print """
- <div class="MenuItem $tabStyleNavigation">
+ <div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item">
<div class="$clazz">
""";
if(node.pageReference != null) {
@@ -106,7 +106,7 @@
""" ;
if(hasChild) {
print """
- <div class="MenuItemContainer" style="position: absolute; display:none">
+ <div class="MenuItemContainer portlet-menu-indicator" style="position: absolute; display:none">
<div class="SubBlock">
""" ;
for(int j = 0; j < node.getChildren().size(); j++) {
@@ -127,7 +127,7 @@
<div class="UIUserToolBarSitePortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer">
- <div class="UITab NormalToolbarTab">
+ <div class="UITab NormalToolbarTab portlet-menu-item">
<div class="">
<a class="SitesIcon TBIcon" href="<%= portalURI + "portalnavigation" %>">
<%=_ctx.appRes("UIUserToolBarSitePortlet.header.site")%>
@@ -137,4 +137,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -13,11 +13,11 @@
String [] columns = uicomponent.getColumns();
for(col in columns){
%>
- <th><%=_ctx.appRes(name + ".header."+col)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header."+col)%></th>
<%}%>
</tr>
</thead>
- <tbody>
+ <tbody class="portlet-table-body">
<%
String rowClass = null;
boolean even = true;
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -24,7 +24,7 @@
<div class="Refresh16x16Icon ControlIcon" title="<%=_ctx.appRes("UIGadgetInfo.title.refresh")%>" onclick="<%= uicomponent.event("Refresh") %>"><span></span></div>
<div class="ClearBoth"><span></span></div>
</div>
- <div class="Application">
+ <div class="Application ClearFix">
<div class="PortletIcons">
<img src="$gadgetThumbnail" onError="src='$srcBGError'" alt=""/>
</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-03-22 06:41:29 UTC (rev 6106)
@@ -484,9 +484,15 @@
/******************************** UIGadgetManagement ******************************/
.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons {
width: 150px;
- padding-top: 20px; text-align: center;
+ padding: 10px 0px;
+ text-align: center;
+ height: auto;
}
+.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons img {
+ width: 150px;
+}
+
.UIApplicationRegistryPortlet .UIGadgetManagement .ApplicationContent {
margin-left: 150px; /* orientation=lt */
margin-right: 150px; /* orientation=rt */
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2011-03-22 06:41:29 UTC (rev 6106)
@@ -812,7 +812,7 @@
*/
gadgets.Container = function() {
this.gadgets_ = {};
- this.parentUrl_ = 'http://' + document.location.host;
+ this.parentUrl_ = document.location.href + '://' + document.location.host;
this.country_ = 'ALL';
this.language_ = 'ALL';
this.view_ = 'default';
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-22 06:41:29 UTC (rev 6106)
@@ -238,14 +238,10 @@
color: #242424;
text-decoration: none;
background: #F5F9FA;
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
}
/* Selected menu item. */
.portlet-menu-item-selected {
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
color: #058ee6;
}
@@ -253,110 +249,77 @@
.portlet-menu-item-hover {
color: #058ee6;
text-decoration: none;
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
color: #058ee6;
}
/* Normal, unselected menu item that has sub-menus. */
.portlet-menu-cascade-item {
- line-height: 18px;
color: #585858;
}
/* Selected sub-menu item that has sub-menus */
.portlet-menu-cascade-item-selected {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
color: #058ee6;
}
.porlet-menu-cascade {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
}
.portlet-menu-cascade-item-hover {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
color: #058ee6;
}
.portlet-menu-cascade-item-hover-selected {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
color: #058ee6;
}
.portlet-menu-separator {
- line-height: 18px;
}
.portlet-menu-cascade-separator {
- line-height: 18px;
}
.portlet-menu-content {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #878787;
}
.portlet-menu-content-selected {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-content-hover {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-content-hover-selected {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-indicator {
- padding: 5px 40px;
color: #bebebe;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-selected {
- padding: 5px 40px;
color: #058ee6;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-hover {
- padding: 5px 40px;
color: #058ee6;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-hover-selected {
- padding: 5px 40px;
color: #058ee6;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-description {
- line-height: 18px;
}
.portlet-menu-caption {
- line-height: 18px;
}
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -24,27 +24,27 @@
<% if (name != null)
{ for (field in beanFields)
{ %>
- <th><%=_ctx.appRes(name + ".header." + field)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header." + field)%></th>
<% }
if (beanActions != null)
{ %>
- <th><%=_ctx.appRes(name + ".header.action")%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header.action")%></th>
<% }
}
if (name == null)
{
for (field in beanFields)
{ %>
- <th><%=_ctx.appRes(uiParent.getName() + ".header." + field)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(uiParent.getName() + ".header." + field)%></th>
<% }
if (beanActions != null && beanActions.length > 0)
{ %>
- <th><%=_ctx.appRes(uiParent.getName() + ".header.action")%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(uiParent.getName() + ".header.action")%></th>
<% }
} %>
</tr>
</thead>
- <tbody>
+ <tbody class="portlet-table-body">
<% if (uicomponent.getUIPageIterator().getAvailable() < 1)
{ %>
<tr>
@@ -60,7 +60,7 @@
for (bean in uicomponent.getBeans())
{
if (even) rowClass = "EvenRow";
- else rowClass = "OddRow";
+ else rowClass = "OddRow portlet-table-alternate";
even = !even;
%>
<tr class="$rowClass">
@@ -127,4 +127,4 @@
_ctx.renderUIComponent(uicomponent.getUIPageIterator());
}
%>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -13,12 +13,12 @@
<%
if(fieldName != null && fieldName.length() > 0 && !fieldName.equals(uicomponent.getId()) && !fieldName.equals(field.getName())) {
%>
- <td class="FieldLabel">
+ <td class="FieldLabel portlet-form-label">
<%=uicomponent.getLabel(field.getName()) %>
</td>
- <td class="FieldComponent"><% uiform.renderField(field) %></td>
+ <td class="FieldComponent portlet-input-field"><% uiform.renderField(field) %></td>
<%} else {%>
- <td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td>
+ <td class="FieldComponent portlet-input-field" colspan="2"><% uiform.renderField(field) %></td>
<%}%>
</tr>
<%
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -8,11 +8,11 @@
String [] columns = uicomponent.getColumns();
for(col in columns){
%>
- <th><%=_ctx.appRes(name + ".header."+col)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header."+col)%></th>
<%}%>
</tr>
</thead>
- <tbody>
+ <tbody class="portlet-table-body">
<%
String rowClass = null;
boolean even = true;
@@ -32,4 +32,4 @@
<%}%>
</tbody>
</table>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -28,8 +28,8 @@
</div>
<div class="SelectFileFrame" style="display: none;">
<div class="FileName">
- <div class="FileNameLabel"><span></span></div>
+ <div class="FileNameLabel portlet-form-label"><span></span></div>
</div>
<div class="RemoveFile" title="Remove Uploaded" onclick="eXo.webui.UIUpload.deleteUpload($uploadId);"></div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -15,15 +15,15 @@
<tr>
<%fieldName = uicomponent.getLabel(field.getName());%>
<%if(field instanceof UIFormInputBase && !fieldName.equals(uicomponent.getId())) { %>
- <td class="FieldLabel">
+ <td class="FieldLabel portlet-form-label">
<%if(fieldName != null && fieldName.length() > 0) {%>
<%=uicomponent.getLabel(field.getName()) %>
<%}%>
</td>
<% if(field instanceof UIFormInputBase && field.isEditable()) { %>
- <td class="FieldComponent"><% uiform.renderField(field) %></td>
+ <td class="FieldComponent portlet-input-field"><% uiform.renderField(field) %></td>
<% }else { %>
- <td class="NonEditableField"><% uiform.renderField(field) %></td>
+ <td class="NonEditableField portlet-input-field"><% uiform.renderField(field) %></td>
<% } %>
<%} else {%>
<td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td>
@@ -73,4 +73,4 @@
this.onsubmit = function(){ return false; }
}
}
-</script>
\ No newline at end of file
+</script>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -30,9 +30,9 @@
String label = _ctx.appRes(formName + ".label." + inputEntry.getId());
if(!label.equals(inputEntry.getId())) {
%>
- <td class="FieldLabel"><%=label%></td>
+ <td class="FieldLabel portlet-form-label"><%=label%></td>
<%}%>
- <td class="FieldComponent">
+ <td class="FieldComponent portlet-input-field">
<%
if(inputEntry instanceof UIFormRadioBoxInput) {
println "<div class=\"MultiRadioInput\">";
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -260,7 +260,7 @@
{
OrganizationService service = getApplicationComponent(OrganizationService.class);
Query q = new Query();
- if (keyword != null && keyword.trim().length() != 0)
+ if (keyword != null && (keyword = keyword.trim()).length() != 0)
{
if (keyword.indexOf("*") < 0)
{
@@ -292,7 +292,7 @@
// remove if user doesn't exist in selected group
MembershipHandler memberShipHandler = service.getMembershipHandler();
- if (groupId != null && groupId.trim().length() != 0)
+ if (groupId != null && (groupId = groupId.trim()).length() != 0)
{
for (Object user : results)
{
13 years, 2 months
- 1
- 0