April 2010 - gatein-commits - Jboss List Archives

gatein SVN: r2754 - in portal/trunk/component/common/src/main/java/conf/jcr/jbosscache: local and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-04-24 10:00:09 -0400 (Sat, 24 Apr 2010) New Revision: 2754 Modified: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml Log: GTNPORTAL-1126: Reduce JCR memory footprint Modified: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-04-24 13:57:08 UTC (rev 2753) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-04-24 14:00:09 UTC (rev 2754) @@ -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="64" 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 Modified: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2010-04-24 13:57:08 UTC (rev 2753) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2010-04-24 14:00:09 UTC (rev 2754) @@ -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="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />  @@ -32,9 +32,9 @@  <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/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2010-04-24 13:57:08 UTC (rev 2753) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2010-04-24 14:00:09 UTC (rev 2754) @@ -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="64" 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/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-04-24 13:57:08 UTC (rev 2753) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-04-24 14:00:09 UTC (rev 2754) @@ -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="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/>  <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/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml 2010-04-24 13:57:08 UTC (rev 2753) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml 2010-04-24 14:00:09 UTC (rev 2754) @@ -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="64" 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, 5 months

1
0
0 / 0

gatein SVN: r2753 - in portal/trunk: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-04-24 09:57:08 -0400 (Sat, 24 Apr 2010) New Revision: 2753 Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: GTNPORTAL-946: Externalize the various cache configuration in the configuration property file Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-24 13:57:08 UTC (rev 2753) @@ -34,8 +34,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values +gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter +gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml # IDM gatein.idm.datasource.name=java:jdbcidm Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-24 13:57:08 UTC (rev 2753) @@ -34,8 +34,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values +gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter +gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml # IDM gatein.idm.datasource.name=jdbcidm Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-24 13:57:08 UTC (rev 2753) @@ -55,8 +55,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> </properties> @@ -65,8 +65,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> <property name="max-volatile-time" value="60" /> @@ -75,8 +75,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" /> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-24 13:57:08 UTC (rev 2753) @@ -55,8 +55,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> </properties> @@ -65,8 +65,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> <property name="max-volatile-time" value="60" /> @@ -75,8 +75,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" /> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-24 13:57:08 UTC (rev 2753) @@ -57,8 +57,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" /> </properties> @@ -67,8 +67,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> <property name="max-volatile-time" value="60" /> @@ -77,8 +77,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" /> @@ -103,7 +103,7 @@ <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> - </properties> + </properties> ∂ <value-storages> <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> @@ -123,8 +123,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" /> </properties> @@ -133,8 +133,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" /> <property name="max-volatile-time" value="60" /> @@ -143,8 +143,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" /> @@ -189,8 +189,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-work" /> </properties> @@ -199,8 +199,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-work${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-work" /> <property name="max-volatile-time" value="60" /> @@ -209,8 +209,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_work" /> @@ -256,8 +256,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" /> </properties> @@ -266,8 +266,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" /> <property name="max-volatile-time" value="60" /> @@ -276,8 +276,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" /> @@ -323,8 +323,8 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml"/> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> <property name="jgroups-multiplexer-stack" value="true"/> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> </properties> @@ -333,8 +333,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml"/> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> <property name="jgroups-multiplexer-stack" value="true"/> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> <property name="max-volatile-time" value="60"/> @@ -343,8 +343,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m"/> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml"/> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> <property name="jgroups-multiplexer-stack" value="true"/> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system"/> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/>

14 years, 5 months

1
0
0 / 0

gatein SVN: r2752 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US: fallback_content and 1 other directory.

by do-not-reply＠jboss.org

Author: luc.texier(a)jboss.com Date: 2010-04-23 11:13:12 -0400 (Fri, 23 Apr 2010) New Revision: 2752 Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/fallback_content/Feedback.xml Log: JBEPP-274: luc's review pass #1 Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml 2010-04-23 14:28:36 UTC (rev 2751) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml 2010-04-23 15:13:12 UTC (rev 2752) @@ -17,14 +17,12 @@ <title>Overview</title> <para> - A relational database management system (RDBMS) Java Database Connectivity (JDBC) connector is required for &PRODUCT; to communicate with a database. - &PRODUCT; comes bundled with the Hypersonic SQL (HSQL) database so that users can get up and running quickly without having to initially set up - a database. However, HSQL should not be used in a production environment. + A Java Database Connectivity (JDBC) connector/driver is required for &PRODUCT; to communicate with a relational database management system (RDBMS). &PRODUCT; comes bundled with the Hypersonic SQL (HSQL) database in order for users to get up and running quickly without having to initially set up a database and the server. However, HSQL should not be used in a production environment and &HOLDER; does not offer ANY support for it. Therefore we recommend to setup a RDBMS and &PRODUCT; connect to it as follows: </para> <para>&PRODUCT; has two different database dependencies. One is the identity service configuration, which depends on Hibernate. The other - database dependency is the Java content repository (JCR) service, which + database dependency is the Java Content Repository (JCR) service, which depends on the native JDBC API. JCR has the capability to integrate with any existing datasource implementation.</para> @@ -335,4 +333,4 @@ </datasources>]]> </programlisting> </section> -</section> \ No newline at end of file +</section> Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-04-23 14:28:36 UTC (rev 2751) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-04-23 15:13:12 UTC (rev 2752) @@ -9,8 +9,8 @@ <section id="Getting_Started-Pre_Requisites"> <title>Pre-Requisites</title> <para> - You must have adequate disk space to install a JDK and &PRODUCT; (550MB) while also allowing enough space for your applications. Before installing &PRODUCT; you must have a working installation of Java. Since JBoss is 100% pure Java you can have it working on any Operating System / Platform that supports Java. - However, only some combinations are certified (tested prior to shipping) or supported (on which you can open support tickets), the certified combinations are listed below. + You must have adequate disk space to install a JDK and &PRODUCT; (about 520MB) while also allowing enough space for your applications. Before installing &PRODUCT; you must have a working installation of Java. Since JBoss is 100% pure Java you can have it working on any Operating System / Platform that supports Java. +  </para> <section id="Pre_Requisites-EAP"> <title>Enterprise Application Platform</title> @@ -21,9 +21,11 @@ </section> <section id="Pre_Requisites-Hardware_and_Operating_System_Requirements"> <title>System Requirements</title> + + <para>For the latest information on supported Operating System / JVM combinations and supported Database platforms, please always refer to <ulink url="http://www.jboss.com/products/platforms/portals/testedconfigurations/">http://www.jboss.com/products/platforms/portals/testedconfigurations/</ulink>. </para> <para> The following is a list of certified operating systems and JVM version combinations: @@ -128,7 +130,7 @@ </table> <para> - The following is a list of supported databases and database drivers: + The following is a list of supported databases and JDBC drivers: </para> <indexterm> <primary>System Requirements</primary> @@ -140,7 +142,7 @@ </indexterm> <table> <title> - Supported and Certified Database / Database driver Combinations. + Supported and Certified Database / JDBC driver Combinations. </title> <tgroup cols="2"> @@ -291,11 +293,13 @@ </tbody> </tgroup> </table> + </section> <section id="Pre_Requisites-Configuring_Your_Java_Environment"> @@ -559,29 +563,7 @@ </listitem> <listitem> <para> - In order to run java from the command line add the <literal>jre\bin</literal> directory to your path, for example: <literal>C:\Program Files\Java\jdk1.6.0_19\jre\bin</literal>. To do this: - <orderedlist> - <listitem> - <para> - Open the Control Panel from the Start Menu, switching to Classic View if necessary. - </para> - </listitem> - <listitem> - <para> - Open the System Control Panel applet. - </para> - </listitem> - <listitem> - <para> - Select the Advanced Tab - </para> - </listitem> - <listitem> - <para> - Click on the Environment Variables button. - </para> - </listitem> - </orderedlist> + In order to run java from the command line add the <literal>jre\bin</literal> directory to your path, for example: <literal>C:\Program Files\Java\jdk1.6.0_19\jre\bin</literal>. You may set these variables by going to the System Properties window then select the Advanced tab and finally click on the Environment Variables button. </para> </listitem> </itemizedlist> Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml 2010-04-23 14:28:36 UTC (rev 2751) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml 2010-04-23 15:13:12 UTC (rev 2752) @@ -8,10 +8,10 @@ <title>Installation</title> <section id="Download"> - <title>Download</title> + <title>Downloading</title> <para> - You can download the zip file from the JBoss Customer Support Portal (CSP), located at <ulink url="https://network.jboss.com">https://network.jboss.com</ulink>. + The officially supported archives are available from the JBoss Customer Support Portal (CSP) located at <ulink url="https://support.redhat.com">https://support.redhat.com</ulink>. Platforms including in your Support subscription are listed in the <literal>Software</literal> section. </para> </section> @@ -19,9 +19,8 @@ <title>Installing</title> <para> - To install from a zip file, simply unzip the downloaded file to a directory of your choice. You can unzip the platform on any operating system that supports the zip format. Six types of server configurations will be included in your installation - minimal, default, production, all, standard and web. - The Getting Started Guide of &JBEAP; explains in detail the different server configuration file sets. - + To install from a zip file, simply unzip the downloaded file to a directory of your choice. + <itemizedlist> <listitem> <para> @@ -32,11 +31,19 @@ </listitem> <listitem> <para> - You are done with the installation! You should now have a directory called <filename>jboss-epp-<replaceable><release></replaceable></filename>. Refer to the Getting Started Guide to understand and explore the Platform Directory Structure. + You are done with the installation! You should now have a directory called <filename>jboss-epp-<replaceable><release></replaceable></filename>. </para> </listitem> </itemizedlist> - </para> + </para> + <note> + <title>Note: server configurations</title> + <para> + Six types of server configurations will be included in your installation: <literal>minimal</literal>, <literal>default</literal>, <literal>production</literal>, <literal>all</literal>, <literal>standard</literal> and <literal>web</literal>. + The Getting Started Guide of &JBEAP; 5.0 explains in detail the different server configuration file sets. + </para> + </note> + </section> <section id="server-config-differences"> @@ -67,10 +74,10 @@ </listitem> </itemizedlist> </para> - <para><remark>Added the note below to account for all gatein.ear archives.</remark></para> +  <note><title>Note: gatein.ear archive</title> <para> - The getein.ear archive, which contains the Portal components, is located in the deploy folder of the <literal>default</literal>, <literal>all</literal> and <literal>production</literal> server configurations. + The gatein.ear archive, which contains the Portal components, is located in the deploy folder of the <literal>default</literal>, <literal>all</literal> and <literal>production</literal> server configurations. </para> </note> </section> Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml 2010-04-23 14:28:36 UTC (rev 2751) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml 2010-04-23 15:13:12 UTC (rev 2752) @@ -7,20 +7,18 @@ <chapter id="Introduction"> <title>Introduction</title> <para> - &PRODUCT; is the open source implementation of the Java EE suite of services and Portal services running atop &JBEAP;. It comprises a set of offerings - for enterprise customers who are looking for preconfigured profiles of JBoss Enterprise Middleware components that have been tested and certified together - to provide an integrated experience. Its easy-to-use server architecture and high flexibility makes JBoss the ideal choice for users just starting out with J2EE, as well as senior architects looking for a customizable middleware platform. + &PRODUCT; is the open source implementation of the Java EE suite of services and Portal services running atop &JBEAP;. It comprises a set of offerings for enterprise customers who are looking for preconfigured profiles of JBoss Enterprise Middleware components that have been tested and certified together to provide an integrated experience. Its easy-to-use server architecture and high flexibility makes JBoss the ideal choice for users just starting out with J2EE, as well as senior architects looking for a customizable middleware platform. </para> <para> - Because it is Java-based, &PRODUCT; is cross-platform and easy to install and use on any operating system that supports Java. The readily available source code is a powerful learning tool to debug the server and understand it. It also gives you the flexibility to create customized versions for your personal or business use. + Because it is Java-based, &PRODUCT; is cross-platform and easy to install and use on any operating system that supports Java. </para> <para> - Installing &PRODUCT; is simple and easy. You can have it installed and running in no time. This guide will teach you to install and uninstall it. + Installing &PRODUCT; is simple and easy. In this guide you will learn how to install, configure and secure &PRODUCT;. </para> <section id="Introduction-Other_Manuals"> <title>Other Manuals</title> <para> - If you are looking for detailed product information refer to the manuals available online at <ulink url="http://www.redhat.com/docs/manuals/jboss"></ulink>. + If you are looking for detailed information about other JBoss middleware products such as JBoss Enterprise Applications Platform please refer to the manuals available online at <ulink url="http://www.redhat.com/docs/manuals/jboss"></ulink>.  </para> </section> Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml 2010-04-23 14:28:36 UTC (rev 2751) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml 2010-04-23 15:13:12 UTC (rev 2752) @@ -28,45 +28,27 @@ On Microsoft Windows </title> <para> - Create an environment variable called <literal>JBOSS_HOME</literal> that points to the installation directory, for example: C:\Program Files\jboss-epp-5.0\jboss-as\. In order to run the server from the command line add the <filename>bin</filename> directory to your path, for example: <literal>C:\Program Files\jboss-epp-5.0\jboss-as\bin</literal>. To do this: - <orderedlist> - <listitem> - <para> - Open the Control Panel from the Start Menu, switching to Classic View if necessary. - </para> - </listitem> - <listitem> - <para> - Open the System Control Panel applet. - </para> - </listitem> - <listitem> - <para> - Select the Advanced Tab - </para> - </listitem> - <listitem> - <para> - Click on the Environment Variables button. - </para> - </listitem> - </orderedlist> + Create an environment variable called <literal>JBOSS_HOME</literal> that points to the installation directory, for example: C:\jboss-epp-5.0\jboss-as\. + In order to run the server from the command line add the <filename>bin</filename> directory to your path, for example: <literal>C:\jboss-epp-5.0\jboss-as\bin</literal>. + You may set these variables by going to the System Properties window then select the Advanced tab and finally click on the Environment Variables button </para> </formalpara> </section> <section id="Adjust_Memory_Settings"> <title>Adjust memory settings</title> + <para> - In the event of memory issues, adjust the memory settings before deploying the applications. You can do this by updating <literal>JAVA_OPTS</literal> settings in the file <filename>JBOSS_DIST/jboss-as/bin/run.conf</filename>. The default values listed in the sample below are usually sufficient: + If the server is running out of memory, you may adjust the memory settings before deploying the applications. You can do this by updating <literal>JAVA_OPTS</literal> settings in the file <filename>JBOSS_DIST/jboss-as/bin/run.conf</filename> on Linux or <filename>JBOSS_DIST/jboss-as/bin/run.conf.bat</filename> on Windows. The default values don't take in account the memory requirements of your applications: <programlisting> -Xms1303m -Xmx1303m -XX:MaxPermSize=256m .... </programlisting> Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/fallback_content/Feedback.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/fallback_content/Feedback.xml 2010-04-23 14:28:36 UTC (rev 2751) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/fallback_content/Feedback.xml 2010-04-23 15:13:12 UTC (rev 2752) @@ -10,7 +10,7 @@ <secondary>contact information for this manual</secondary> </indexterm> <para> - If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.redhat.com/bugzilla/</ulink> against the product <application>&PRODUCT;</application>. + If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a support ticket with your comments via the JBoss Customer Support Portal available at <ulink url="http://support.redhat.com">http://support.redhat.com</ulink> against the product <application>&PRODUCT;</application>. </para> <para> When submitting a bug report, be sure to mention the manual's identifier: <citetitle>&BOOKID;</citetitle>

14 years, 5 months

1
0
0 / 0

gatein SVN: r2751 - in portal/trunk/server: jboss/patch-ear/src/main/jboss/server/default/deploy/jbossweb.sar and 1 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-04-23 10:28:36 -0400 (Fri, 23 Apr 2010) New Revision: 2751 Added: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/jbossweb.sar/ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/jbossweb.sar/context.xml Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/server.xml Log: GTNPORTAL-1118: enable cross context sessions in the tomcat and jboss server configuration files. Added: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/jbossweb.sar/context.xml =================================================================== --- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/jbossweb.sar/context.xml (rev 0) +++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/jbossweb.sar/context.xml 2010-04-23 14:28:36 UTC (rev 2751) @@ -0,0 +1,20 @@ + +<Context cookies="true" crossContext="true"> +  + <Manager pathname="" /> + +  + <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener> + +  + <SessionCookie path="/"/> + +</Context> Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/server.xml =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/conf/server.xml 2010-04-23 13:58:03 UTC (rev 2750) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/server.xml 2010-04-23 14:28:36 UTC (rev 2751) @@ -63,7 +63,8 @@ --> <Connector port="8080" protocol="HTTP/1.1" maxThreads="150" connectionTimeout="20000" - redirectPort="8443" URIEncoding="UTF-8"/> + redirectPort="8443" URIEncoding="UTF-8" + emptySessionPath="true"/> <!-- Define a SSL HTTP/1.1 Connector on port 8443 This connector uses the JSSE configuration, when using APR, the

14 years, 5 months

1
0
0 / 0

gatein SVN: r2750 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-04-23 09:58:03 -0400 (Fri, 23 Apr 2010) New Revision: 2750 Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java Log: GTNPORTAL-1092 Fix is incorrect in 2744 Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-04-23 10:54:09 UTC (rev 2749) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-04-23 13:58:03 UTC (rev 2750) @@ -90,7 +90,7 @@ { listMemberhip.add(((MembershipType)obj).getName()); } - if(listMemberhip.contains("*")) + if(!listMemberhip.contains("*")) { listMemberhip.add("*"); }

14 years, 5 months

1
0
0 / 0

gatein SVN: r2749 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: mvanco(a)redhat.com Date: 2010-04-23 06:54:09 -0400 (Fri, 23 Apr 2010) New Revision: 2749 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html Log: UI Tests: one more improvement for POR_14_01_006 - wait for close dialogs when creating node Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html 2010-04-23 10:42:41 UTC (rev 2748) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html 2010-04-23 10:54:09 UTC (rev 2749) @@ -137,6 +137,11 @@ <td>1,1</td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Page Selector</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Save</td> <td></td> @@ -147,6 +152,11 @@ <td>1,1</td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Navigation Management</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=POR_14_01_006</td> <td></td>

14 years, 5 months

1
0
0 / 0

gatein SVN: r2748 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: mvanco(a)redhat.com Date: 2010-04-23 06:42:41 -0400 (Fri, 23 Apr 2010) New Revision: 2748 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_07_003_CheckDisplayLanguageOfPortalInPublicMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html Log: UI Tests: fixed tests POR_07_003, POR_14_01_006, SNF_PRL_22 - waiting issues Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_07_003_CheckDisplayLanguageOfPortalInPublicMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_07_003_CheckDisplayLanguageOfPortalInPublicMode.html 2010-04-22 23:33:56 UTC (rev 2747) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_07_003_CheckDisplayLanguageOfPortalInPublicMode.html 2010-04-23 10:42:41 UTC (rev 2748) @@ -127,6 +127,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> <td>verifyElementPresent</td> <td>link=Sign in</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html 2010-04-22 23:33:56 UTC (rev 2747) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html 2010-04-23 10:42:41 UTC (rev 2748) @@ -77,7 +77,7 @@ <td></td> </tr> <tr> - <td>waitForText</td> + <td>waitForElementPresent</td> <td>name</td> <td></td> </tr> @@ -102,6 +102,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Search and Select Page</td> <td>1,1</td> @@ -112,14 +117,19 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>xpath=//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Save</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>clickAt</td> @@ -128,11 +138,16 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=POR_14_01_006</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=POR_14_01_006</td> <td></td> </tr> @@ -187,6 +202,11 @@ <td></td> </tr> <tr> + <td>waitForElementNotPresent</td> + <td>link=POR_14_01_006</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-04-22 23:33:56 UTC (rev 2747) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-04-23 10:42:41 UTC (rev 2748) @@ -142,6 +142,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> <td>1,1</td> @@ -162,6 +167,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Site</td> <td></td> @@ -222,6 +232,11 @@ <td>1,1</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Sign out</td> <td>1,1</td>

14 years, 5 months

1
0
0 / 0

gatein SVN: r2747 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-04-22 19:33:56 -0400 (Thu, 22 Apr 2010) New Revision: 2747 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java Log: - GTNWSRP-30: Added possibility to force registration modification when we might need it. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2010-04-22 22:23:54 UTC (rev 2746) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2010-04-22 23:33:56 UTC (rev 2747) @@ -427,7 +427,7 @@ // we might be in a situation where the producer changed the registration back to the initial state // which is, granted, pretty rare... attempt modifyRegistration log.debug("modifyRegistration was called after OperationFailedFault when a check of registration data didn't reveal any issue..."); - modifyRegistration(); + modifyRegistration(true); } result.setRegistrationResult(registrationResult); @@ -1062,11 +1062,16 @@ public void modifyRegistration() throws PortletInvokerException { + modifyRegistration(false); + } + + private void modifyRegistration(boolean force) throws PortletInvokerException + { if (persistentRegistrationInfo.getRegistrationHandle() != null) { persistentEndpointInfo.refresh(); - if (isModifyRegistrationRequired()) + if (force || isModifyRegistrationRequired()) { try {

14 years, 5 months

1
0
0 / 0

gatein SVN: r2746 - components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-04-22 18:23:54 -0400 (Thu, 22 Apr 2010) New Revision: 2746 Modified: components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java Log: - GTNPC-20: Fixed incorrect markup in doEdit. Modified: components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java =================================================================== --- components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java 2010-04-22 18:29:08 UTC (rev 2745) +++ components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java 2010-04-22 22:23:54 UTC (rev 2746) @@ -1,25 +1,25 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.gatein.pc.samples.google; @@ -137,10 +137,10 @@ renderResponse.getWriter().print( "<div align='center'>\n" + " <br/>\n" + - " <form method='post' action='" + renderResponse.createActionURL() + "'\n" + + " <form method='post' action='" + renderResponse.createActionURL() + "'>\n" + " <font class='portlet-font'>Change location (zip code): </font>\n" + " <input class='portlet-form-input-field' type='text' value='' size='12' name='" + ZIP + "'/>\n" + - " <input class='portlet-form-input-field' type='submit' name='submit' value='submit'>\n" + + " <input class='portlet-form-input-field' type='submit' name='submit' value='submit'/>\n" + " </form>\n" + "</div>"); }

14 years, 5 months

1
0
0 / 0

gatein SVN: r2745 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: mvanco(a)redhat.com Date: 2010-04-22 14:29:08 -0400 (Thu, 22 Apr 2010) New Revision: 2745 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html Log: UI Tests: fixed tests SNF_PRL_28 and SNF_PRL_23 - waiting issues + change xpath for gadget on dashboard Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html 2010-04-22 08:48:42 UTC (rev 2744) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html 2010-04-22 18:29:08 UTC (rev 2745) @@ -212,6 +212,11 @@ <td></td> </tr> <tr> + <td>waitForElementNotPresent</td> + <td>//a[@title='test_grp_label_23']</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Save</td> <td></td> @@ -227,6 +232,11 @@ <td></td> </tr> <tr> + <td>waitForElementNotPresent</td> + <td>link=test_grp_label_23</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html 2010-04-22 08:48:42 UTC (rev 2744) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html 2010-04-22 18:29:08 UTC (rev 2745) @@ -148,12 +148,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@class='GadgetTitle' and @style='display: block;']</td> + <td>xpath=//div[@class='CenterControlBar']//div[@class='GadgetTitle' and text()='Calculator']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>xpath=//div[@class='GadgetTitle' and @style='display: block;']</td> + <td>xpath=//div[@class='CenterControlBar']//div[@class='GadgetTitle' and text()='Calculator']</td> <td></td> </tr> <tr>

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits April 2010