gatein SVN: r2897 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 11:05:01 -0400 (Thu, 29 Apr 2010)
New Revision: 2897
Added:
components/wsrp/tags/1.1.1-GA/
Log:
[maven-scm] copy for tag 1.1.1-GA
Copied: components/wsrp/tags/1.1.1-GA (from rev 2896, components/wsrp/trunk)
14 years, 8 months
gatein SVN: r2896 - in components/wsrp/trunk: admin-gui and 8 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 11:04:33 -0400 (Thu, 29 Apr 2010)
New Revision: 2896
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
[maven-release-plugin] prepare release 1.1.1-GA
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
@@ -68,12 +68,12 @@
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.FINAL</version>
</dependency>
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.FINAL</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -97,4 +97,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/api/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/common/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/consumer/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/1.1.1-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/1.1.1-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/1.1.1-GA</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/producer/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/test/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-29 15:04:33 UTC (rev 2896)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.1-GA-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 8 months
gatein SVN: r2895 - portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 10:45:21 -0400 (Thu, 29 Apr 2010)
New Revision: 2895
Modified:
portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml
Log:
JBEPP-332: Upgrade to portletbridge 2.0.0 GA
Modified: portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml 2010-04-29 14:34:27 UTC (rev 2894)
+++ portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml 2010-04-29 14:45:21 UTC (rev 2895)
@@ -41,13 +41,13 @@
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.FINAL</version>
</dependency>
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.FINAL</version>
</dependency>
</dependencies>
14 years, 8 months
gatein SVN: r2894 - in portal/branches/EPP_5_0_Branch: component/identity/src/main/java/org/exoplatform/services/organization/idm and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-29 10:34:27 -0400 (Thu, 29 Apr 2010)
New Revision: 2894
Modified:
portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java
portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
portal/branches/EPP_5_0_Branch/pom.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml
Log:
JBEPP-330: Improve caching for LDAP
Modified: portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java 2010-04-29 14:34:27 UTC (rev 2894)
@@ -35,6 +35,7 @@
import java.util.List;
import org.picketlink.idm.cache.APICacheProvider;
+import org.picketlink.idm.spi.cache.IdentityStoreCacheProvider;
/*
@@ -50,8 +51,10 @@
public class PicketLinkIDMCacheService
{
- private final List<APICacheProvider> cacheProviders = new LinkedList<APICacheProvider>();
+ private final List<APICacheProvider> apiCacheProviders = new LinkedList<APICacheProvider>();
+ private final List<IdentityStoreCacheProvider> storeCacheProviders = new LinkedList<IdentityStoreCacheProvider>();
+
public PicketLinkIDMCacheService()
{
}
@@ -61,20 +64,36 @@
if (cacheProvider != null)
{
- cacheProviders.add(cacheProvider);
+ apiCacheProviders.add(cacheProvider);
}
}
+ public void register(IdentityStoreCacheProvider cacheProvider)
+ {
+
+ if (cacheProvider != null)
+ {
+ storeCacheProviders.add(cacheProvider);
+ }
+
+ }
+
+
@Managed
@ManagedDescription("Ivalidate cache namespace")
@Impact(ImpactType.WRITE)
public void invalidate(@ManagedDescription("Cache namespace") @ManagedName("namespace")String namespace)
{
- for (APICacheProvider cacheProvider : cacheProviders)
+ for (APICacheProvider cacheProvider : apiCacheProviders)
{
cacheProvider.invalidate(namespace);
}
+
+ for (IdentityStoreCacheProvider cacheProvider : storeCacheProviders)
+ {
+ cacheProvider.invalidate(namespace);
+ }
}
@Managed
@@ -82,9 +101,14 @@
@Impact(ImpactType.WRITE)
public void invalidateAll()
{
- for (APICacheProvider cacheProvider : cacheProviders)
+ for (APICacheProvider cacheProvider : apiCacheProviders)
{
cacheProvider.invalidateAll();
}
+
+ for (IdentityStoreCacheProvider cacheProvider : storeCacheProviders)
+ {
+ cacheProvider.invalidateAll();
+ }
}
}
Modified: portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-04-29 14:34:27 UTC (rev 2894)
@@ -31,11 +31,13 @@
import org.picketlink.idm.api.cfg.IdentityConfiguration;
import org.picketlink.idm.common.exception.IdentityConfigurationException;
import org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl;
+import org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
import org.picketlink.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration;
import org.picketlink.idm.spi.configuration.metadata.IdentityConfigurationMetaData;
import org.picocontainer.Startable;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -61,16 +63,16 @@
public static final String REALM_NAME_OPTION = "portalRealm";
- public static final String CACHE_CONFIG_OPTION = "cacheConfig";
+ public static final String CACHE_CONFIG_API_OPTION = "apiCacheConfig";
+ public static final String CACHE_CONFIG_STORE_OPTION = "storeCacheConfig";
+
private IdentitySessionFactory identitySessionFactory;
private String config;
private String realmName = "idm_realm";
- private String cacheConfig;
-
private IdentityConfiguration identityConfiguration;
private PicketLinkIDMServiceImpl()
@@ -87,7 +89,8 @@
ValueParam config = initParams.getValueParam(PARAM_CONFIG_OPTION);
ValueParam jndiName = initParams.getValueParam(PARAM_JNDI_NAME_OPTION);
ValueParam realmName = initParams.getValueParam(REALM_NAME_OPTION);
- ValueParam cacheConfig = initParams.getValueParam(CACHE_CONFIG_OPTION);
+ ValueParam apiCacheConfig = initParams.getValueParam(CACHE_CONFIG_API_OPTION);
+ ValueParam storeCacheConfig = initParams.getValueParam(CACHE_CONFIG_STORE_OPTION);
if (config == null && jndiName == null)
{
@@ -118,14 +121,32 @@
identityConfiguration.getIdentityConfigurationRegistry().register(hibernateService.getSessionFactory(), "hibernateSessionFactory");
- if (cacheConfig != null)
+ if (apiCacheConfig != null)
{
- InputStream configStream = confManager.getInputStream(cacheConfig.getValue());
- JBossCacheAPICacheProviderImpl cacheProvider = new JBossCacheAPICacheProviderImpl();
- cacheProvider.initialize(configStream);
- picketLinkIDMCache.register(cacheProvider);
- identityConfiguration.getIdentityConfigurationRegistry().register(cacheProvider, "apiCacheProvider");
+ InputStream configStream = confManager.getInputStream(apiCacheConfig.getValue());
+
+
+ JBossCacheAPICacheProviderImpl apiCacheProvider = new JBossCacheAPICacheProviderImpl();
+ apiCacheProvider.initialize(configStream);
+ picketLinkIDMCache.register(apiCacheProvider);
+ identityConfiguration.getIdentityConfigurationRegistry().register(apiCacheProvider, "apiCacheProvider");
+
+ configStream.close();
+
}
+ if (storeCacheConfig != null)
+ {
+ InputStream configStream = confManager.getInputStream(storeCacheConfig.getValue());
+
+ JBossCacheIdentityStoreCacheProviderImpl storeCacheProvider = new JBossCacheIdentityStoreCacheProviderImpl();
+ storeCacheProvider.initialize(configStream);
+ picketLinkIDMCache.register(storeCacheProvider);
+ identityConfiguration.getIdentityConfigurationRegistry().register(storeCacheProvider, "storeCacheProvider");
+
+
+ configStream.close();
+
+ }
}
else
{
Modified: portal/branches/EPP_5_0_Branch/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/pom.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/pom.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -47,7 +47,7 @@
<org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.2.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.3.GA</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.0-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -91,15 +91,25 @@
</value-param>
<value-param>
- <name>cacheConfig</name>
+ <name>apiCacheConfig</name>
<value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value>
</value-param>
<value-param profiles="cluster">
- <name>cacheConfig</name>
+ <name>apiCacheConfig</name>
<value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value>
</value-param>
+ <value-param>
+ <name>storeCacheConfig</name>
+ <value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value>
+ </value-param>
+
+ <value-param profiles="cluster">
+ <name>storeCacheConfig</name>
+ <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value>
+ </value-param>
+
</init-params>
</component>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -373,8 +373,11 @@
<name>customSystemProperties</name>
<value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value>
<value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value>
- <value>com.sun.jndi.ldap.connect.pool.debug=fine</value>
</option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>storeCacheProvider</value>
+ </option>
</options>
</identity-store>
</identity-stores>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -334,8 +334,11 @@
<name>customSystemProperties</name>
<value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value>
<value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value>
- <value>com.sun.jndi.ldap.connect.pool.debug=fine</value>
</option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>storeCacheProvider</value>
+ </option>
</options>
</identity-store>
</identity-stores>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -382,8 +382,11 @@
<name>customSystemProperties</name>
<value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value>
<value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value>
- <value>com.sun.jndi.ldap.connect.pool.debug=fine</value>
</option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>storeCacheProvider</value>
+ </option>
</options>
</identity-store>
</identity-stores>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -336,8 +336,11 @@
<name>customSystemProperties</name>
<value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value>
<value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value>
- <value>com.sun.jndi.ldap.connect.pool.debug=fine</value>
</option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>storeCacheProvider</value>
+ </option>
</options>
</identity-store>
</identity-stores>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -388,8 +388,11 @@
<name>customSystemProperties</name>
<value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value>
<value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value>
- <value>com.sun.jndi.ldap.connect.pool.debug=fine</value>
</option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>storeCacheProvider</value>
+ </option>
</options>
</identity-store>
</identity-stores>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2010-04-29 13:46:58 UTC (rev 2893)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2010-04-29 14:34:27 UTC (rev 2894)
@@ -348,8 +348,11 @@
<name>customSystemProperties</name>
<value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value>
<value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value>
- <value>com.sun.jndi.ldap.connect.pool.debug=fine</value>
</option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>storeCacheProvider</value>
+ </option>
</options>
</identity-store>
</identity-stores>
14 years, 8 months
gatein SVN: r2893 - portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-29 09:46:58 -0400 (Thu, 29 Apr 2010)
New Revision: 2893
Modified:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html
Log:
EPP5 UI Tests: improved test SNF_PRL_29
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html 2010-04-29 12:54:34 UTC (rev 2892)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html 2010-04-29 13:46:58 UTC (rev 2893)
@@ -68,6 +68,11 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>link=Add Gadgets</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>link=Add New Page</td>
<td></td>
</tr>
@@ -192,6 +197,11 @@
<td>\13</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Site</td>
<td></td>
@@ -267,6 +277,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Save</td>
<td></td>
14 years, 8 months
gatein SVN: r2892 - portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-29 08:54:34 -0400 (Thu, 29 Apr 2010)
New Revision: 2892
Modified:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html
Log:
EPP5 UI Tests: improved test SNF_PRL_12 - portlets are verified after auto import (so fixed positions can't be used)
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-04-29 12:14:27 UTC (rev 2891)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-04-29 12:54:34 UTC (rev 2892)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
@@ -63,15 +68,25 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td>
+ <td>//a[@title='Administration']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td>
+ <td>//a[@title='Administration']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='Application Registry']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//a[@title='Application Registry']</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForTextPresent</td>
<td>ApplicationRegistryPortlet</td>
<td></td>
@@ -88,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td>
+ <td>//a[@title='New Account']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td>
+ <td>//a[@title='New Account']</td>
<td></td>
</tr>
<tr>
@@ -113,12 +128,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td>
+ <td>//a[@title='Organization Management']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td>
+ <td>//a[@title='Organization Management']</td>
<td></td>
</tr>
<tr>
@@ -138,27 +153,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']/div[2]//a</td>
+ <td>//a[@title='Dashboard']</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']/div[2]//a</td>
- <td></td>
-</tr>
-<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']/div[2]//a</td>
+ <td>//a[@title='Dashboard']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td>
+ <td>//a[@title='Dashboard Portlet']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td>
+ <td>//a[@title='Dashboard Portlet']</td>
<td></td>
</tr>
<tr>
@@ -178,12 +188,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td>
+ <td>//a[@title='Gadget Wrapper Portlet']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td>
+ <td>//a[@title='Gadget Wrapper Portlet']</td>
<td></td>
</tr>
<tr>
@@ -198,7 +208,7 @@
</tr>
<tr>
<td>echo</td>
- <td>--It is possible to verify all portlets.......</td>
+ <td>--It is possible to verify some portlets.......</td>
<td></td>
</tr>
<tr>
14 years, 8 months
gatein SVN: r2891 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/core and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-29 08:14:27 -0400 (Thu, 29 Apr 2010)
New Revision: 2891
Added:
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java
Log:
GTNPORTAL-1139: Create a UIFilterableTree in UI Framework
Added: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIFilterableTree.gtmpl 2010-04-29 12:14:27 UTC (rev 2891)
@@ -0,0 +1,93 @@
+<%
+ import org.exoplatform.webui.core.UIRightClickPopupMenu;
+ import org.exoplatform.webui.application.WebuiRequestContext;
+
+ def selected = uicomponent.getSelected();
+ def sibling = uicomponent.getSibbling();
+ def children = uicomponent.getChildren();
+
+ UIRightClickPopupMenu uiPopupMenu = uicomponent.getUIRightClickPopupMenu();
+ WebuiRequestContext rcontext = _ctx.getRequestContext();
+
+ if(uiPopupMenu != null){
+ String id = uicomponent.getParent().getId();
+ rcontext.getJavascriptManager().importJavascript('eXo.webui.UIRightClickPopupMenu');
+ rcontext.getJavascriptManager().addJavascript("eXo.webui.UIRightClickPopupMenu.disableContextMenu('"+id+"');");
+ uicomponent.renderUIComponent(uiPopupMenu);
+ }
+%>
+<div class="UITrees ScrollArea">
+ <div class="TreeContainer JSContainer">
+ <div style="padding-bottom: 12px">
+ <div class="HomeNode">
+ <a class="LevelUpArrowIcon" href="<%=uicomponent.getActionLink();%>" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UITree.tooltip.UpLevel")%>" style="display: block;"><span></span></a>
+ </div>
+ <%
+ int count=0;
+ for(object in sibling) {
+ if(uicomponent.displayThisNode(object, rcontext)){
+ if(count==sibling.size()-1) {
+ %>
+ <div class="LastNode Node">
+ <%
+ String objId = String.valueOf(uicomponent.getId(object));
+ String actionLink = uicomponent.event("ChangeNode", objId);
+ %>
+ <%=uicomponent.renderNode(object);%>
+ <%
+ if(uicomponent.isSelected(object)){%>
+ <div class = "ChildrenContainer" actionLink="$actionLink" display = "block">
+ <%
+ int countChild=0;
+ for(child in children) {
+ if(uicomponent.displayThisNode(child, rcontext)){
+ if(countChild==children.size()-1) {
+ %>
+ <div class="LastNode Node">
+ <%=uicomponent.renderNode(child);%>
+ </div>
+ <% } else { %>
+ <div class="Node">
+ <%=uicomponent.renderNode(child);%>
+ </div>
+ <% } %>
+ <% } %>
+ <%countChild++;} %>
+ </div>
+ <%}%>
+ </div>
+ <% } else { %>
+ <div class="Node">
+ <%
+ String objId = String.valueOf(uicomponent.getId(object));
+ String actionLink = uicomponent.event("ChangeNode", objId);
+ %>
+ <%=uicomponent.renderNode(object);%>
+ <%
+ if(uicomponent.isSelected(object)){%>
+ <div class = "ChildrenContainer" actionLink="$actionLink" display = "block">
+ <%
+ int countChild=0;
+ for(child in children) {
+ if(uicomponent.displayThisNode(child, rcontext)){
+ if(countChild==children.size()-1) {
+ %>
+ <div class="LastNode Node">
+ <%=uicomponent.renderNode(child);%>
+ </div>
+ <% } else { %>
+ <div class="Node">
+ <%=uicomponent.renderNode(child);%>
+ </div>
+ <% } %>
+ <% } %>
+ <%countChild++;} %>
+ </div>
+ <%}%>
+ </div>
+ <% } %>
+ <% } %>
+ <%count++;}%>
+ </div>
+ </div>
+</div>
\ No newline at end of file
Added: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java (rev 0)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIFilterableTree.java 2010-04-29 12:14:27 UTC (rev 2891)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.webui.core;
+
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.config.annotation.EventConfig;
+
+/**
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * @version $Id$
+ *
+ */
+@ComponentConfig(template = "system:/groovy/webui/core/UIFilterableTree.gtmpl", events = @EventConfig(listeners = UITree.ChangeNodeActionListener.class))
+@Serialized
+public class UIFilterableTree extends UITree
+{
+
+ private TreeNodeFilter nodeFilter;
+
+ public UIFilterableTree() throws Exception
+ {
+ super();
+ }
+
+ public boolean displayThisNode(Object nodeObject, WebuiRequestContext context)
+ {
+ if(nodeFilter == null)
+ {
+ return true;
+ }
+ return !nodeFilter.filterThisNode(nodeObject, context);
+ }
+
+ public void setTreeNodeFilter(TreeNodeFilter _nodeFilter)
+ {
+ this.nodeFilter = _nodeFilter;
+ }
+
+ public static interface TreeNodeFilter
+ {
+ public boolean filterThisNode(Object nodeObject, WebuiRequestContext context);
+ }
+}
14 years, 8 months
gatein SVN: r2890 - portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-29 08:11:34 -0400 (Thu, 29 Apr 2010)
New Revision: 2890
Added:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortal.html
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html
Modified:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html
Log:
EPP5 UI Tests: Added new tests for verification of portlet and portal view permissions, improved tests POR_10_002, 22_019
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html 2010-04-29 03:06:07 UTC (rev 2889)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html 2010-04-29 12:11:34 UTC (rev 2890)
@@ -147,6 +147,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>publicMode</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>publicMode</td>
<td></td>
@@ -212,13 +217,18 @@
<td>exact:*</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Save</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
+ <td>//div[@class='Content']/div[@class='Label' and text()='Test_POR_10_002']</td>
<td></td>
</tr>
<tr>
@@ -243,12 +253,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
+ <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=Test_POR_10_002')]</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
+ <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=Test_POR_10_002')]</td>
<td></td>
</tr>
<tr>
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html 2010-04-29 03:06:07 UTC (rev 2889)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html 2010-04-29 12:11:34 UTC (rev 2890)
@@ -182,12 +182,17 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
<td>type</td>
<td>searchTerm</td>
<td>Test_POR_22_019</td>
</tr>
<tr>
- <td>type</td>
+ <td>select</td>
<td>searchOption</td>
<td>label=Title</td>
</tr>
@@ -222,8 +227,13 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=View Page Properties</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIPageEditor']/div[3]/div/div/div[1]/table/tbody/tr/td/div[1]/div/div/div/div</td>
+ <td>link=View Page Properties</td>
<td></td>
</tr>
<tr>
@@ -232,8 +242,13 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[contains(@onclick=, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
+ <td>xpath=//div[contains(@onclick=, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td>
<td></td>
</tr>
<tr>
@@ -332,7 +347,7 @@
<td></td>
</tr>
<tr>
- <td>assertConfirmation</td>
+ <td>waitForConfirmation</td>
<td>Do you want to delete this page?</td>
<td></td>
</tr>
Added: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortal.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortal.html (rev 0)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortal.html 2010-04-29 12:11:34 UTC (rev 2890)
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_VerifyRightsPortlet</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_VerifyRightsPortlet</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portal view permissions--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Add new portal</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add New Portal</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Add New Portal</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>portalWithLimitedViewRights</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[contains(@class, 'Tab') and text()='Permission Setting']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[contains(@class, 'Tab') and text()='Permission Setting']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Access Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Access Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Add Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=exact:*</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=exact:*</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Select Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Select Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPermissionSelector']//a[text()='Platform']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPermissionSelector']//a[text()='Platform']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPermissionSelector']//a[text()='Administrators']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPermissionSelector']//a[text()='Administrators']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPermissionSelector']//a[text()='*']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPermissionSelector']//a[text()='*']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portal created--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UISiteManagement']//div[@class='Label' and text()='portalWithLimitedViewRights']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>8000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UISiteManagement']//div[@class='Label' and text()='portalWithLimitedViewRights']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=portalWithLimitedViewRights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=portalWithLimitedViewRights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='BreadcumbsInfoBar']//a[text()='Home' and contains(@href, 'portalWithLimitedViewRights')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Sign out from created portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Can not connect to this portal</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portal with mary account--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>mary</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>link=portalWithLimitedViewRights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/portal/public/portalWithLimitedViewRights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Can not connect to this portal</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/portal/private/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Sign in as root and verify portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=portalWithLimitedViewRights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=portalWithLimitedViewRights')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=portalWithLimitedViewRights')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmation</td>
+ <td>Are you sure you want to delete this portal?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementNotPresent</td>
+ <td>link=portalWithLimitedViewRights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
Added: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html (rev 0)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html 2010-04-29 12:11:34 UTC (rev 2890)
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_VerifyRightsPortlet</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_VerifyRightsPortlet</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portlet view permissions--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Add IFrame portlet on Site map page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--DnD IFrame portlet on page--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[contains(@class, 'Tab')]/a[@title='Administration']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[contains(@class, 'Tab')]/a[@title='web']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='web/IFramePortlet']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>dragAndDropToObject</td>
+ <td>//div[@id='web/IFramePortlet']</td>
+ <td>//div[@class='UIRowContainer']</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIRowContainer']/div[1]//div[contains(text(), 'IFrame Portlet')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Edit view permissions--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIRowContainer']/div[1]//a[@title='Edit Portlet']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@class='UIRowContainer']/div[1]//a[@title='Edit Portlet']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Change URL</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='MiddleTab' and text()='Access Permission']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@class='MiddleTab' and text()='Access Permission']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>publicMode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>publicMode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>3000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>publicMode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Add Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=exact:*</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=exact:*</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='EdittedSaveButton' and @title='Finish']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[@class='EdittedSaveButton' and @title='Finish']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portlet added on page--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='PortletName' and text()='IFrame']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portlet no visible in public mode--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>//div[@class='PortletName' and text()='IFrame']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portlet not visible for mary--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>mary</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>//div[@class='PortletName' and text()='IFrame']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify portlet visible for root--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@class='PortletName' and text()='IFrame']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete portlet from page--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIRowContainer']/div[1]//a[@title='Delete Portlet']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@class='UIRowContainer']/div[1]//a[@title='Delete Portlet']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmation</td>
+ <td>Are you sure you want to delete this portlet?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementNotPresent</td>
+ <td>//div[@class='UIRowContainer']/div[1]//div[contains(text(), 'IFrame Portlet')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='EdittedSaveButton' and @title='Finish']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[@class='EdittedSaveButton' and @title='Finish']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=SiteMap</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>//div[@class='PortletName' and text()='IFrame']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
14 years, 8 months
gatein SVN: r2889 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-04-28 23:06:07 -0400 (Wed, 28 Apr 2010)
New Revision: 2889
Added:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Non-tech-docs.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Videos.png
Log:
replace Introduction images and links
Added: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Non-tech-docs.png
===================================================================
(Binary files differ)
Property changes on: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Non-tech-docs.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Videos.png
===================================================================
(Binary files differ)
Property changes on: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Videos.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 8 months
gatein SVN: r2887 - in portal/trunk: web/portal/src/main/webapp/groovy/webui/core and 1 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-04-28 22:48:03 -0400 (Wed, 28 Apr 2010)
New Revision: 2887
Added:
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
Log:
GTNPORTAL-1023 Implement the UIConfirmation component. We can use this component when want to confirm, please read spec in wiki-int.exoplatform.org
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-04-29 01:47:23 UTC (rev 2886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-04-29 02:48:03 UTC (rev 2887)
@@ -1370,3 +1370,10 @@
UIListPermissionSelectorPopup.title.ListPermissionSelector=Select Permission
UIUserToolBarDashboard.page.ClickAndType=Click & Type Page Name
+
+ #######################################################################
+ # org.exoplatform.webui.core.UIConfirmation #
+ #######################################################################
+
+UIConfirmation.title.exoMessages=Confirm message
+UIConfirmation.Close=Close
Added: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2010-04-29 02:48:03 UTC (rev 2887)
@@ -0,0 +1,144 @@
+<%
+ /**
+ * Created by The eXo Platform SAS
+ * Author : Nguyen Duc Khoi
+ * khoi.nguyen(a)exoplatform.com
+ * Apr 22, 2010
+ */
+%>
+<%
+ import org.exoplatform.webui.core.UIConfirmation.ActionConfirm;
+
+ String popupId = uicomponent.getId();
+ def rcontext = _ctx.getRequestContext();
+ rcontext.getJavascriptManager().importJavascript('eXo.webui.UIHorizontalTabs');
+ rcontext.getJavascriptManager().importJavascript('eXo.webui.UIPopupWindow');
+
+ def message = uicomponent.getMessage();
+ def actions = uicomponent.getActions();
+
+ void printTab(String messages, String title, boolean isSelected)
+ {
+ String cssClass = "NormalTab";
+ if(!isSelected) {
+ cssClass = "SelectedTab";
+ isSelected = true;
+ }
+ println """
+ <div class="UITab MessageTabDialog">
+ <div class="$cssClass">
+ <div class="LeftTab">
+ <div class="RightTab">
+ """;
+ println "<div class=\"MiddleTab\" onclick=\"eXo.webui.UIHorizontalTabs.displayTabContent(this)\"><div class=\"TabIcon ${title}Icon\">"+_ctx.appRes("UIPopupMessages.label."+"${title}") +"</div></div>";
+ println """
+ </div>
+ </div>
+ </div>
+ </div>
+ """;
+ }
+
+ void printMessage(String message, String messageType)
+ {
+ println "<div class=\"UITabContent\"";
+ println " <div class=\"PopupMessageBox\">";
+ println " <div class=\"$messageType\">";
+ println " <div class=\"PopupMessageContainer\">";
+ println " <div class=\"MessageContainer\">";
+ println " <div class=\"PopupIcon ${messageType}Icon\"><span></span></div>";
+ println " <div class=\"PopupMessage\">";
+ println message;
+ println " </div>";
+ println " <div style=\"clear:left\"><span></span></div>";
+ println " </div>";
+ println " </div>";
+ println " </div>";
+ println " </div>";
+ println "</div>";
+ }
+
+ void printAction(List actions)
+ {
+ for(act in actions)
+ {
+ println "<td>";
+ println " <div onclick="+uicomponent.event("Click", act.getEventId())+" class=\"ActionButton LightBlueStyle\">";
+ println " <div class=\"ButtonLeft\">";
+ println " <div class=\"ButtonRight\">";
+ println " <div class=\"ButtonMiddle\">";
+ println " <a href=\"javascript:void(0);\"> ${act.getActionKey()} </a>";
+ println " </div>";
+ println " </div>";
+ println " </div>";
+ println " </div>";
+ println "</td>";
+ }
+ }
+%>
+ <div class="UIPopupWindow" id="$popupId" style="width: 550px; display: none;">
+ <div class="ExoMessageDecorator">
+ <div class="TopLeftCornerDecorator">
+ <div class="TopRightCornerDecorator">
+ <div class="TopCenterDecorator">
+ <div class="OverflowContainer">
+ <div class="PopupTitleIcon"><span></span></div>
+ <div class="CloseButton" title="<%=_ctx.appRes("UIConfirmation.Close")%>" onclick="<%=uicomponent.event("Close")%>"><span></span></div>
+ <div class="PopupTitle"><%= _ctx.appRes("UIConfirmation.title.exoMessages") %></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="MiddleLeftSideDecorator">
+ <div class="MiddleRightSideDecorator">
+ <div class="MiddleCenterDecorator">
+ <div class="UIWindowContent">
+ <div class="PopupContent">
+ <div class="UIPopupMessages">
+ <div class="UIHorizontalTabs">
+ <div class="TabsContainer">
+ <%
+ boolean flag = true
+ flag = printTab(message, "Warning", flag);
+ %>
+ </div>
+ </div>
+ <div class="UITabContentContainer">
+ <%
+ printMessage(message, "ErrorMessage");
+ %>
+ </div>
+ <div class="MessageActionBar">
+ <div class="UIAction">
+ <table class="ActionContainer">
+ <tr>
+ <%
+ printAction(actions);
+ %>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div><span></span></div>
+ <div class="BottomLeftCornerDecorator">
+ <div class="BottomRightCornerDecorator">
+ <div class="BottomCenterDecorator"><span></span></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <%
+ rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', false);");
+ if(uicomponent.hasMessage()){
+ rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId');");
+ rcontext.getJavascriptManager().addJavascript("window.setTimeout(\"eXo.webui.UIPopupWindow.increasezIndex('$popupId')\", 100);");
+ }
+ %>
\ No newline at end of file
Added: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java (rev 0)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java 2010-04-29 02:48:03 UTC (rev 2887)
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.webui.core;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.config.annotation.EventConfig;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
+import org.exoplatform.webui.form.UIFormInputWithActions.ActionData;
+
+/**
+ * Created by The eXo Platform SAS
+ * Author : Nguyen Duc Khoi
+ * khoi.nguyen(a)exoplatform.com
+ * Apr 22, 2010
+ *
+ * Display a confirm popup message
+ *
+ */
+
+@ComponentConfig(
+ template = "system:/groovy/webui/core/UIConfirmation.gtmpl",
+ events={
+ @EventConfig(listeners = UIConfirmation.CloseActionListener.class),
+ @EventConfig(listeners = UIConfirmation.ClickActionListener.class)
+ }
+)
+
+public class UIConfirmation extends UIPopupWindow
+{
+ private String message_;
+
+ private Object caller_;
+
+ private List<ActionConfirm> actions_;
+
+ public UIConfirmation()
+ {
+ this.message_ = "";
+ this.caller_ = new Object();
+ setShow(true);
+ }
+
+ public UIConfirmation(String message, Object caller)
+ {
+ this.message_ = message;
+ this.caller_ = caller;
+ setShow(true);
+ }
+
+ public void setMessage(String message)
+ {
+ this.message_ = message;
+ }
+
+ public String getMessage()
+ {
+ return message_;
+ }
+
+ public Object getCaller()
+ {
+ return caller_;
+ }
+
+ public void setCaller(Object caller)
+ {
+ this.caller_ = caller;
+ }
+
+ public void addMessage(String message)
+ {
+ this.message_ = message;
+ }
+
+ public void clearMessage()
+ {
+ this.message_ = "";
+ }
+
+ public void setActions(List<ActionConfirm> actions_)
+ {
+ this.actions_ = actions_;
+ }
+
+ public List<ActionConfirm> getActions()
+ {
+ return actions_;
+ }
+
+ /**
+ * Check if message null or empty then don't display popup
+ *
+ * @return {@link Boolean}
+ */
+ public boolean hasMessage()
+ {
+ return (message_!=null) && (!message_.equals(""));
+ }
+
+ private void hidePopup(WebuiRequestContext context)
+ {
+ this.clearMessage();
+ if(this.getParent() == null)
+ {
+ context.addUIComponentToUpdateByAjax(this);
+ return;
+ }
+
+ if(!this.isShow())
+ {
+ return;
+ }
+ }
+
+ public static class CloseActionListener extends EventListener<UIConfirmation>
+ {
+ @Override
+ public void execute(Event<UIConfirmation> event) throws Exception
+ {
+ UIConfirmation uiConfirmation = event.getSource();
+ WebuiRequestContext context = event.getRequestContext();
+ uiConfirmation.hidePopup(context);
+ }
+ }
+
+ public static class ClickActionListener extends EventListener<UIConfirmation>
+ {
+ @Override
+ public void execute(Event<UIConfirmation> event) throws Exception
+ {
+ WebuiRequestContext context = event.getRequestContext();
+ UIConfirmation uiConfirmation = event.getSource();
+
+ UIComponent uiComponent = (UIComponent)uiConfirmation.getCaller();
+ Event<UIComponent> xEvent = uiComponent.createEvent(context.getRequestParameter(OBJECTID), event.getExecutionPhase(), context);
+
+ if(xEvent != null)
+ {
+ xEvent.broadcast();
+ }
+
+ uiConfirmation.hidePopup(context);
+ }
+ }
+
+ /**
+ * Created by The eXo Platform SAS
+ * Author : Nguyen Duc Khoi
+ * khoi.nguyen(a)exoplatform.com
+ * Apr 22, 2010
+ *
+ * Define actions which are rendered
+ *
+ */
+
+ public static class ActionConfirm implements Serializable
+ {
+ private String eventId_;
+
+ private String actionKey_;
+
+ public ActionConfirm(){ }
+
+ public ActionConfirm(String eventId, String actionKey)
+ {
+ this.eventId_ = eventId;
+ this.actionKey_ = actionKey;
+ }
+
+ public void setEventId(String eventId)
+ {
+ this.eventId_ = eventId;
+ }
+
+ public String getEventId()
+ {
+ return eventId_;
+ }
+
+ public void setActionKey(String actionKey)
+ {
+ this.actionKey_ = actionKey;
+ }
+
+ public String getActionKey()
+ {
+ return actionKey_;
+ }
+ }
+}
14 years, 8 months