Author: chris.laprun(a)jboss.com Date: 2011-02-14 06:10:18 -0500 (Mon, 14 Feb 2011) New Revision: 5877 Removed: portal/branches/wsrp-extraction/component/wsrp/ portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/wsrp/ Modified: portal/branches/wsrp-extraction/component/pom.xml portal/branches/wsrp-extraction/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/wsrp-extraction/packaging/reports/ portal/branches/wsrp-extraction/pom.xml portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: - GTNWSRP-200, GTNPORTAL-911: Removed WSRP component and configuration from GateIn codebase. Modified: portal/branches/wsrp-extraction/component/pom.xml =================================================================== --- portal/branches/wsrp-extraction/component/pom.xml 2011-02-14 10:31:51 UTC (rev 5876) +++ portal/branches/wsrp-extraction/component/pom.xml 2011-02-14 11:10:18 UTC (rev 5877) @@ -38,7 +38,6 @@ <module>test</module> <module>common</module> <module>pc</module> - <module>wsrp</module> <module>resources</module> <module>application-registry</module> <module>portal</module> Modified: portal/branches/wsrp-extraction/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/wsrp-extraction/packaging/module/src/main/javascript/portal.packaging.module.js 2011-02-14 10:31:51 UTC (rev 5876) +++ portal/branches/wsrp-extraction/packaging/module/src/main/javascript/portal.packaging.module.js 2011-02-14 11:10:18 UTC (rev 5877) @@ -41,7 +41,6 @@ var pcVersion = "${org.gatein.pc.version}"; var wciVersion = "${org.gatein.wci.version}"; var commonVersion = "${org.gatein.common.version}"; - var wsrpVersion = "${org.gatein.wsrp.version}"; var shindigVersion = "${org.shindig.version}"; var groovyVersion = "${org.codehaus.groovy.version}"; var rhinoVersion = "${rhino.version}"; @@ -79,19 +78,6 @@ addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")). addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA")); - - module.component.wsrp = new Project("org.exoplatform.portal", "gatein.portal.component.wsrp", "jar", module.version) - .addDependency(new Project("org.gatein.wsrp", "wsrp-producer", "war", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-admin-gui", "war", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp2-ws", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-jcr-impl", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-wss-jboss5", "jar", wsrpVersion)); - module.component.scripting = new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version). addDependency(new Project("rhino", "js", "jar", rhinoVersion)). @@ -184,7 +170,6 @@ addDependency(module.component.resources). addDependency(module.component.identity). addDependency(module.component.pc). - addDependency(module.component.wsrp). addDependency(module.webui.eXo). addDependency(kernel.container). Property changes on: portal/branches/wsrp-extraction/packaging/reports ___________________________________________________________________ Modified: svn:ignore - *.iml .idea + .idea Modified: portal/branches/wsrp-extraction/pom.xml =================================================================== --- portal/branches/wsrp-extraction/pom.xml 2011-02-14 10:31:51 UTC (rev 5876) +++ portal/branches/wsrp-extraction/pom.xml 2011-02-14 11:10:18 UTC (rev 5877) @@ -48,7 +48,6 @@ <org.gatein.wci.version>2.1.0-Alpha02</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version> <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm> - <org.gatein.wsrp.version>2.1.0-Alpha01-SNAPSHOT</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> @@ -577,33 +576,6 @@ <version>${org.gatein.pc.version}</version> </dependency> <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <version>${org.gatein.wsrp.version}</version> - <!-- TODO: remove --> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> <groupId>org.gatein.mop</groupId> <artifactId>mop-api</artifactId> <version>${org.gatein.mop.version}</version> @@ -686,11 +658,11 @@ <artifactId>exo.portal.component.application-registry</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> </dependency> - <dependency> + <!--<dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.xml-parser</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> + </dependency>--> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> Modified: portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-02-14 10:31:51 UTC (rev 5876) +++ portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-02-14 11:10:18 UTC (rev 5877) @@ -27,7 +27,6 @@ <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/resource-compressor-configuration.xml</import> <import>war:/conf/common/portlet-container-configuration.xml</import> - <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> <import>war:/conf/common/autologin-configuration.xml</import> <import>war:/conf/common/remindpwd-configuration.xml</import> Modified: portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-02-14 10:31:51 UTC (rev 5876) +++ portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-02-14 11:10:18 UTC (rev 5877) @@ -224,141 +224,6 @@ </properties> </lock-manager> </workspace> - - <!-- WSRP --> - <workspace name="wsrp-system"> - <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}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="wsrp-system" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <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> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <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="${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" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <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}-wsrp-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <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> - - <!-- Producer portlet states --> - <workspace name="pc-system"> - <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}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/pc${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="pc-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/pc${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <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> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <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="${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"/> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m"/> - <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}-pc-system"/> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> - <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> - </workspaces> </repository> </repositories>