gatein SVN: r2874 - in portal/trunk/docs/reference-guide/en: modules/PortalDevelopment and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-28 11:12:34 -0400 (Wed, 28 Apr 2010)
New Revision: 2874
Added:
portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/decoratorPattern.png
portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/leftMarginPattern.png
Modified:
portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/portal-change-skin.png
portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/windowStyles.png
portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml
Log:
JBEPP-323: Removing the TODO and adding images. One image is EPP related, will need to be changed
Added: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/decoratorPattern.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/decoratorPattern.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/leftMarginPattern.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/leftMarginPattern.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/portal-change-skin.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/windowStyles.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml 2010-04-28 14:05:50 UTC (rev 2873)
+++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml 2010-04-28 15:12:34 UTC (rev 2874)
@@ -489,7 +489,6 @@
administrator choose a new application to add on a page he can decide
which style of decoration would go around the window if any.</para>
- <para><emphasis role="bold">TODO: replace french image with english one.</emphasis></para>
<para><mediaobject>
<imageobject>
<imagedata fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG"
@@ -810,22 +809,15 @@
cells are distributed around the BODY cell. You can use the width,
height and background image properties to achieve any decoration
effect that you want.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PortalDevelopment/Skinning/decoratorPattern.png" format="PNG"
+ width="418" />
+ </imageobject>
+ </mediaobject>
- <para><emphasis role="bold">TODO: replace ascii art with diagram </emphasis></para>
<programlisting role="HTML">
------------------------------------------------------------------------
-| | | |
-| TopLeft | TopCenter | TopRight |
-| | | |
------------------------------------------------------------------------
-| | | |
-| CenterLeft | BODY | CenterRight |
-| | | |
------------------------------------------------------------------------
-| | | |
-| BottomLeft | BottomCenter | BottomRight |
-| | | |
------------------------------------------------------------------------
<div class="Parent">
<div class="TopLeft">
<div class="TopRight">
@@ -855,15 +847,14 @@
browser the added or removed space will be taken from the right
block.</para>
- <para><emphasis role="bold">TODO: replace ascii art with diagram </emphasis></para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PortalDevelopment/Skinning/leftMarginPattern.png" format="PNG"
+ width="303" />
+ </imageobject>
+ </mediaobject>
+
<programlisting role="HTML">
-| | |
-| | |
-| |<--- fixed width --->| | will expand to right ----> |
-| | |
-| | |
-| | |
-----
<div class="Parent">
<div style="float: left; width: 100px">
</div>
14 years, 8 months
gatein SVN: r2873 - portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-28 10:05:50 -0400 (Wed, 28 Apr 2010)
New Revision: 2873
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-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-327: Sample LDAP configs should have JNDI connection pooling enabled
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-28 13:52:19 UTC (rev 2872)
+++ 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-28 14:05:50 UTC (rev 2873)
@@ -365,6 +365,16 @@
<name>createMissingContexts</name>
<value>true</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</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-28 13:52:19 UTC (rev 2872)
+++ 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-28 14:05:50 UTC (rev 2873)
@@ -326,6 +326,16 @@
<name>createMissingContexts</name>
<value>true</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</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-28 13:52:19 UTC (rev 2872)
+++ 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-28 14:05:50 UTC (rev 2873)
@@ -374,6 +374,16 @@
<name>createMissingContexts</name>
<value>true</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</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-28 13:52:19 UTC (rev 2872)
+++ 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-28 14:05:50 UTC (rev 2873)
@@ -328,6 +328,16 @@
<name>createMissingContexts</name>
<value>false</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</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-28 13:52:19 UTC (rev 2872)
+++ 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-28 14:05:50 UTC (rev 2873)
@@ -380,6 +380,16 @@
<name>sortExtensionSupported</name>
<value>false</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</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-28 13:52:19 UTC (rev 2872)
+++ 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-28 14:05:50 UTC (rev 2873)
@@ -340,6 +340,16 @@
<name>sortExtensionSupported</name>
<value>false</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
14 years, 8 months
gatein SVN: r2872 - in portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache: local and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-28 09:52:19 -0400 (Wed, 28 Apr 2010)
New Revision: 2872
Modified:
portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml
Log:
JBEPP-329: Change JCR default cache value to reduce the memory consumption
Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-04-28 13:09:02 UTC (rev 2871)
+++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-04-28 13:52:19 UTC (rev 2872)
@@ -19,7 +19,7 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false"
+ <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false"
lockAcquisitionTimeout="20000" />
<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
@@ -33,8 +33,8 @@
<default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="timeToLive" value="120000" />
+ <property name="maxNodes" value="5000" />
+ <property name="timeToLive" value="20000" />
</default>
</eviction>
-</jbosscache>
\ No newline at end of file
+</jbosscache>
Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2010-04-28 13:09:02 UTC (rev 2871)
+++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2010-04-28 13:52:19 UTC (rev 2872)
@@ -18,7 +18,7 @@
-->
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false"
+ <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false"
lockAcquisitionTimeout="20000" />
<!-- Configure the TransactionManager -->
@@ -32,9 +32,9 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
<default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="minTimeToLive" value="60000" />
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="20000" />
</default>
</eviction>
-</jbosscache>
\ No newline at end of file
+</jbosscache>
Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2010-04-28 13:09:02 UTC (rev 2871)
+++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2010-04-28 13:52:19 UTC (rev 2872)
@@ -19,7 +19,7 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+ <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
@@ -47,4 +47,4 @@
</properties>
</loader>
</loaders>
-</jbosscache>
\ No newline at end of file
+</jbosscache>
Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-04-28 13:09:02 UTC (rev 2871)
+++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-04-28 13:52:19 UTC (rev 2872)
@@ -18,7 +18,7 @@
-->
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/>
+ <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/>
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
@@ -30,8 +30,8 @@
<eviction wakeUpInterval="5000">
<default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
<property name="maxNodes" value="5000" />
- <property name="minTimeToLive" value="60000" />
+ <property name="minTimeToLive" value="20000" />
</default>
</eviction>
-</jbosscache>
\ No newline at end of file
+</jbosscache>
Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml 2010-04-28 13:09:02 UTC (rev 2871)
+++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml 2010-04-28 13:52:19 UTC (rev 2872)
@@ -18,7 +18,7 @@
-->
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+ <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
<loaders passivation="false" shared="true">
<preload>
@@ -40,4 +40,4 @@
</properties>
</loader>
</loaders>
-</jbosscache>
\ No newline at end of file
+</jbosscache>
14 years, 8 months
gatein SVN: r2871 - portal/trunk.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-28 09:09:02 -0400 (Wed, 28 Apr 2010)
New Revision: 2871
Modified:
portal/trunk/pom.xml
Log:
GTNPORTAL-1136: Upgrade PicketLink IDM to 1.1.2.GA
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-04-28 13:01:16 UTC (rev 2870)
+++ portal/trunk/pom.xml 2010-04-28 13:09:02 UTC (rev 2871)
@@ -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.CR01</org.picketlink.idm>
+ <org.picketlink.idm>1.1.2.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>
14 years, 8 months
gatein SVN: r2870 - portal/branches/EPP_5_0_Branch.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-28 09:01:16 -0400 (Wed, 28 Apr 2010)
New Revision: 2870
Modified:
portal/branches/EPP_5_0_Branch/pom.xml
Log:
JBEPP-328: Upgrade PicketLink IDM to 1.1.2.GA
Modified: portal/branches/EPP_5_0_Branch/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/pom.xml 2010-04-28 11:35:11 UTC (rev 2869)
+++ portal/branches/EPP_5_0_Branch/pom.xml 2010-04-28 13:01:16 UTC (rev 2870)
@@ -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.CR01</org.picketlink.idm>
+ <org.picketlink.idm>1.1.2.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>
14 years, 8 months
gatein SVN: r2869 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples.
by do-not-reply@jboss.org
Author: bdaw
Date: 2010-04-28 07:35:11 -0400 (Wed, 28 Apr 2010)
New Revision: 2869
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml
Log:
- GTNPORTAL-1135 - JNDI connection pooling options in sample ldap configs
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-04-28 10:50:12 UTC (rev 2868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-04-28 11:35:11 UTC (rev 2869)
@@ -365,6 +365,16 @@
<name>createMissingContexts</name>
<value>true</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-04-28 10:50:12 UTC (rev 2868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-04-28 11:35:11 UTC (rev 2869)
@@ -326,6 +326,16 @@
<name>createMissingContexts</name>
<value>true</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-04-28 10:50:12 UTC (rev 2868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-04-28 11:35:11 UTC (rev 2869)
@@ -374,6 +374,16 @@
<name>createMissingContexts</name>
<value>true</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-04-28 10:50:12 UTC (rev 2868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-04-28 11:35:11 UTC (rev 2869)
@@ -328,6 +328,16 @@
<name>createMissingContexts</name>
<value>false</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2010-04-28 10:50:12 UTC (rev 2868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2010-04-28 11:35:11 UTC (rev 2869)
@@ -380,6 +380,16 @@
<name>sortExtensionSupported</name>
<value>false</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2010-04-28 10:50:12 UTC (rev 2868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2010-04-28 11:35:11 UTC (rev 2869)
@@ -340,6 +340,16 @@
<name>sortExtensionSupported</name>
<value>false</value>
</option>
+ <option>
+ <name>customJNDIConnectionParameters</name>
+ <value>com.sun.jndi.ldap.connect.pool=true</value>
+ </option>
+ <option>
+ <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>
</options>
</identity-store>
</identity-stores>
14 years, 8 months
gatein SVN: r2868 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component.
by do-not-reply@jboss.org
Author: hoang_to
Date: 2010-04-28 06:50:12 -0400 (Wed, 28 Apr 2010)
New Revision: 2868
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
Log:
GTNPORTAL-1091: Refactor method and change access modifier
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-28 10:36:57 UTC (rev 2867)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-28 10:50:12 UTC (rev 2868)
@@ -191,14 +191,12 @@
selectedNavigation = navigation;
}
- public boolean isExistInPageList(String portalName) throws Exception {
+ private boolean stillKeptInPageList(String portalName) throws Exception {
List<PortalConfig> portals = this.getPortalConfigs();
-
for(PortalConfig p : portals) {
if(p.getName().equals(portalName))
return true;
}
-
return false;
}
@@ -208,14 +206,7 @@
{
UISiteManagement uicomp = event.getSource();
String portalName = event.getRequestContext().getRequestParameter(OBJECTID);
-
- //TODO nguyenanhkien2a(a)gmail.com (GTNPORTAL-1079)
- //We should check portal is existing in current UI to ensure exactly request of Delete action, not be of Refresh(F5) or Malware
- if(!uicomp.isExistInPageList(portalName))
- {
- return;
- }
-
+
UserPortalConfigService service = event.getSource().getApplicationComponent(UserPortalConfigService.class);
String defaultPortalName = service.getDefaultPortal();
@@ -242,9 +233,12 @@
}
else
{
- uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist",
- new String[]{portalName}));
- return;
+ if (uicomp.stillKeptInPageList(portalName))
+ {
+ uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist",
+ new String[]{portalName}));
+ return;
+ }
}
if (config == null && !Util.getUIPortal().getName().equals(portalName))
14 years, 8 months
gatein SVN: r2867 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: hangnguyen
Date: 2010-04-28 06:36:57 -0400 (Wed, 28 Apr 2010)
New Revision: 2867
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html
Log:
Testvn-356 : Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html 2010-04-28 10:26:46 UTC (rev 2866)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html 2010-04-28 10:36:57 UTC (rev 2867)
@@ -78,16 +78,6 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title='Organization']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//a[@title='Organization']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@title='Users and groups management']</td>
<td></td>
</tr>
14 years, 8 months
gatein SVN: r2866 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: hangnguyen
Date: 2010-04-28 06:26:46 -0400 (Wed, 28 Apr 2010)
New Revision: 2866
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html
Log:
Testvn-356 : Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html 2010-04-28 10:04:55 UTC (rev 2865)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html 2010-04-28 10:26:46 UTC (rev 2866)
@@ -77,16 +77,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//a[@title='Organization']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//a[@title='Organization']</td>
- <td></td>
-</tr>
-<tr>
<td>componentExoContextMenu</td>
<td>//a[@title='New Staff']</td>
<td></td>
14 years, 8 months