gatein SVN: r1692 - in components/wsrp/trunk: admin-gui and 7 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-15 13:03:09 -0500 (Mon, 15 Feb 2010)
New Revision: 1692
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta07
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/api/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/common/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/consumer/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -21,8 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-Beta07</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/1.0.0-Beta07</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/producer/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/test/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-02-15 17:34:16 UTC (rev 1691)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-02-15 18:03:09 UTC (rev 1692)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta07-SNAPSHOT</version>
+ <version>1.0.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 10 months
gatein SVN: r1691 - in components/wsrp/trunk/admin-gui/src/main: webapp/jsf/consumers and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-15 12:34:16 -0500 (Mon, 15 Feb 2010)
New Revision: 1691
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
Log:
- Minor display change of consumer status.
- Added comments to remove hardcoding of service injection in JSF beans.
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-15 17:21:01 UTC (rev 1690)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-15 17:34:16 UTC (rev 1691)
@@ -478,6 +478,7 @@
public ConsumerRegistry getRegistry()
{
+ // todo: fix this, the registry needs to be injected more cleanly
if (registry == null)
{
registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class);
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-02-15 17:21:01 UTC (rev 1690)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-02-15 17:34:16 UTC (rev 1691)
@@ -63,6 +63,7 @@
public ConsumerRegistry getRegistry()
{
+ // todo: fix this, the registry needs to be injected more cleanly
if (registry == null)
{
registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class);
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java 2010-02-15 17:21:01 UTC (rev 1690)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java 2010-02-15 17:34:16 UTC (rev 1691)
@@ -57,6 +57,7 @@
public ProducerConfigurationService getConfigurationService()
{
+ // todo: fix this, the configuration service needs to be injected more cleanly
if (configurationService == null)
{
configurationService = (ProducerConfigurationService)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ProducerConfigurationService.class);
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-15 17:21:01 UTC (rev 1690)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-15 17:34:16 UTC (rev 1691)
@@ -110,14 +110,16 @@
</div>
</f:subview>
<c:if test="#{empty showAddConsumer}">
- <span
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left">
- <h:outputFormat value="#{i18n.path_consumers_consumer}">
- <f:param value="#{consumer.id}"/>
- </h:outputFormat>
- (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
- #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
- </span>
+ <strong>
+ <h:outputFormat value="#{i18n.path_consumers_consumer}">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
+ </strong>
+ <span
+ class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} swatch">
+ #{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
+ </span>
</c:if>
</div>
</webui:blueHeaderBar>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-15 17:21:01 UTC (rev 1690)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-15 17:34:16 UTC (rev 1691)
@@ -213,6 +213,16 @@
vertical-align: top;
}
+.wsrp-consumers-ui .swatch {
+ border: 1px solid #aaa;
+ border-right-color: #555;
+ border-bottom-color: #555;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ margin: 1px;
+ padding: 2px 4px;
+}
+
.wsrp-consumers-ui .active {
background-color: #C7DDB7;
font-weight: bold;
14 years, 10 months
gatein SVN: r1690 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget/impl and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-15 12:21:01 -0500 (Mon, 15 Feb 2010)
New Revision: 1690
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
GTNPORTAL-649 : Update to MOP 1.0.0-CR1
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-15 17:21:01 UTC (rev 1690)
@@ -236,7 +236,7 @@
{
LocalGadgetData localData = (LocalGadgetData)data;
url =
- "jcr/repository/" + chromatticLifeCycle.getWorkspaceName() + "/app:gadgets/app:" + def.getName()
+ "jcr/repository/" + chromatticLifeCycle.getWorkspaceName() + "/production/app:gadgets/app:" + def.getName()
+ "/app:data/app:resources/" + localData.getFileName();
}
else
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-15 17:21:01 UTC (rev 1690)
@@ -26,7 +26,7 @@
# JCR
gatein.jcr.config.type=local
gatein.jcr.datasource.name=java:jdbcjcr
-gatein.jcr.datasource.dialect=hsqldb
+gatein.jcr.datasource.dialect=auto
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
@@ -35,7 +35,3 @@
#IDM
gatein.idm.datasource.name=java:jdbcidm
gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
-
-# temporary here, need to remove it
-jbosscache-cl-cache.jdbc.node.type=OBJECT
-
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-15 17:21:01 UTC (rev 1690)
@@ -26,7 +26,7 @@
# JCR
gatein.jcr.config.type=local
gatein.jcr.datasource.name=jdbcjcr
-gatein.jcr.datasource.dialect=hsqldb
+gatein.jcr.datasource.dialect=auto
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
@@ -35,7 +35,3 @@
#IDM
gatein.idm.datasource.name=jdbcidm
gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
-
-# temporary here, need to remove it
-jbosscache-cl-cache.jdbc.node.type=OBJECT
-
Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-02-15 17:21:01 UTC (rev 1690)
@@ -27,10 +27,10 @@
<!-- System -->
<workspaces>
<workspace name="system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcexo"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="auto"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -63,7 +63,7 @@
<property name="index-dir" value="${gatein.tmp.dir}/jcr/jcrlucenedb/system"/>
</properties>
</query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <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/exo.portal.component.test.jcr-jbosscache-lock-config.xml" />
@@ -73,10 +73,10 @@
<!-- Portal system data -->
<workspace name="portal-test">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcexo"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="auto"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -109,7 +109,7 @@
<property name="index-dir" value="${gatein.tmp.dir}/jcr/jcrlucenedb/portal-test"/>
</properties>
</query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <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/exo.portal.component.test.jcr-jbosscache-lock-config.xml" />
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/pom.xml 2010-02-15 17:21:01 UTC (rev 1690)
@@ -38,10 +38,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.0-CR1</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-CR1</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.0-CR1</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.0-CR1</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.0-CR2</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-CR2</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.0-CR2</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.0-CR2</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>SNAPSHOT-r790473</org.shindig.version>
<org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
@@ -49,12 +49,12 @@
<org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.Beta5</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta06</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.0-Beta16</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.0-CR01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.0-beta17</version.chromattic>
+ <version.chromattic>1.0.0-cr1</version.chromattic>
<version.reflect>1.0.0-beta5</version.reflect>
<!-- ************** -->
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-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-15 17:21:01 UTC (rev 1690)
@@ -29,7 +29,7 @@
<!-- System -->
<workspaces>
<workspace name="system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
<property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
@@ -74,7 +74,7 @@
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <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" />
@@ -86,11 +86,7 @@
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_repositoty_system_pk" />
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
-<!--
- <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
--->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
@@ -99,7 +95,7 @@
<!-- Portal system data -->
<workspace name="portal-system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
<property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
@@ -144,7 +140,7 @@
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <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" />
@@ -156,11 +152,7 @@
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_repositoty_portal_system_pk" />
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
-<!--
- <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
--->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
@@ -169,7 +161,7 @@
<!-- Portal work data -->
<workspace name="portal-work">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
<property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
@@ -214,7 +206,7 @@
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <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" />
@@ -226,20 +218,16 @@
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_repositoty_portal_work_pk" />
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
-<!--
- <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
--->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
- <!-- Workspace for WSRP -->
+ <!-- WSRP -->
<workspace name="wsrp-system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
<property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
@@ -285,7 +273,7 @@
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <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" />
@@ -297,11 +285,7 @@
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_repositoty_wsrp_system_pk" />
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
-<!--
- <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
--->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-15 17:21:01 UTC (rev 1690)
@@ -551,10 +551,8 @@
</values-param>
<properties-param>
<name>options</name>
- <!--<property name="org.chromattic.api.Option.root_node.path" value="/production"/>-->
- <!--<property name="org.chromattic.api.Option.root_node.create" value="true"/>-->
- <property name="org.chromattic.api.Option.root_node.path" value="/"/>
- <property name="org.chromattic.api.Option.root_node.create" value="false"/>
+ <property name="org.chromattic.api.Option.root_node.path" value="/production"/>
+ <property name="org.chromattic.api.Option.root_node.create" value="true"/>
</properties-param>
</init-params>
</component-plugin>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-15 16:06:16 UTC (rev 1689)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-15 17:21:01 UTC (rev 1690)
@@ -256,10 +256,8 @@
</values-param>
<properties-param>
<name>options</name>
- <!--<property name="org.chromattic.api.Option.root_node.path" value="/production"/>-->
- <!--<property name="org.chromattic.api.Option.root_node.create" value="true"/>-->
- <property name="org.chromattic.api.Option.root_node.path" value="/"/>
- <property name="org.chromattic.api.Option.root_node.create" value="false"/>
+ <property name="org.chromattic.api.Option.root_node.path" value="/production"/>
+ <property name="org.chromattic.api.Option.root_node.create" value="true"/>
</properties-param>
</init-params>
</component-plugin>
14 years, 10 months
gatein SVN: r1689 - portal/trunk/docs/reference-guide/en/images.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-15 11:06:16 -0500 (Mon, 15 Feb 2010)
New Revision: 1689
Removed:
portal/trunk/docs/reference-guide/en/images/sso.png
Log:
Not used anymore
Deleted: portal/trunk/docs/reference-guide/en/images/sso.png
===================================================================
(Binary files differ)
14 years, 10 months
gatein SVN: r1688 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-15 10:28:10 -0500 (Mon, 15 Feb 2010)
New Revision: 1688
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-02-15 15:27:55 UTC (rev 1687)
+++ components/mop/trunk/api/pom.xml 2010-02-15 15:28:10 UTC (rev 1688)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01</version>
+ <version>1.0.0-CR02-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-02-15 15:27:55 UTC (rev 1687)
+++ components/mop/trunk/core/pom.xml 2010-02-15 15:28:10 UTC (rev 1688)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01</version>
+ <version>1.0.0-CR02-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-02-15 15:27:55 UTC (rev 1687)
+++ components/mop/trunk/pom.xml 2010-02-15 15:28:10 UTC (rev 1688)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01</version>
+ <version>1.0.0-CR02-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR01</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR01</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-CR01</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-02-15 15:27:55 UTC (rev 1687)
+++ components/mop/trunk/spi/pom.xml 2010-02-15 15:28:10 UTC (rev 1688)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01</version>
+ <version>1.0.0-CR02-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 10 months
gatein SVN: r1687 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-15 10:27:55 -0500 (Mon, 15 Feb 2010)
New Revision: 1687
Added:
components/mop/tags/1.0.0-CR01/
Log:
[maven-scm] copy for tag 1.0.0-CR01
Copied: components/mop/tags/1.0.0-CR01 (from rev 1686, components/mop/trunk)
14 years, 10 months
gatein SVN: r1686 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-15 10:27:31 -0500 (Mon, 15 Feb 2010)
New Revision: 1686
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-CR01
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-02-15 15:25:36 UTC (rev 1685)
+++ components/mop/trunk/api/pom.xml 2010-02-15 15:27:31 UTC (rev 1686)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01-SNAPSHOT</version>
+ <version>1.0.0-CR01</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-02-15 15:25:36 UTC (rev 1685)
+++ components/mop/trunk/core/pom.xml 2010-02-15 15:27:31 UTC (rev 1686)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01-SNAPSHOT</version>
+ <version>1.0.0-CR01</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-02-15 15:25:36 UTC (rev 1685)
+++ components/mop/trunk/pom.xml 2010-02-15 15:27:31 UTC (rev 1686)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01-SNAPSHOT</version>
+ <version>1.0.0-CR01</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-CR01</url>
</scm>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-02-15 15:25:36 UTC (rev 1685)
+++ components/mop/trunk/spi/pom.xml 2010-02-15 15:27:31 UTC (rev 1686)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR01-SNAPSHOT</version>
+ <version>1.0.0-CR01</version>
</parent>
<!-- ****************** -->
14 years, 10 months
gatein SVN: r1685 - components/mop/trunk/core.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-15 10:25:36 -0500 (Mon, 15 Feb 2010)
New Revision: 1685
Modified:
components/mop/trunk/core/pom.xml
Log:
GTNMOP-17 : Update to Chromattic 1.0.0-cr1 and JCR 1.12.0-CR2
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-02-15 13:13:43 UTC (rev 1684)
+++ components/mop/trunk/core/pom.xml 2010-02-15 15:25:36 UTC (rev 1685)
@@ -38,7 +38,7 @@
<description>Model Object for Portal Core</description>
<properties>
- <org.chromattic.version>1.0.0-beta17</org.chromattic.version>
+ <org.chromattic.version>1.0.0-CR1</org.chromattic.version>
</properties>
<dependencies>
14 years, 10 months
gatein SVN: r1684 - portal/trunk/docs/reference-guide/en/images.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-02-15 08:13:43 -0500 (Mon, 15 Feb 2010)
New Revision: 1684
Added:
portal/trunk/docs/reference-guide/en/images/opensso-shot.png
Log:
missing image
Added: portal/trunk/docs/reference-guide/en/images/opensso-shot.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/opensso-shot.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 10 months
gatein SVN: r1683 - portal/trunk/testsuite.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2010-02-15 06:13:59 -0500 (Mon, 15 Feb 2010)
New Revision: 1683
Removed:
portal/trunk/testsuite/ui-tests/
Log:
GTNPORTAL-548 Clean-up old ui tests
14 years, 10 months