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>