Author: hfnukal Date: 2011-07-01 01:57:42 -0400 (Fri, 01 Jul 2011) New Revision: 6782 Removed: epp/portal/branches/EPP_5_2_Branch/distribution/pack/ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/ Modified: epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/jar/ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml Log: JBEPP-970 jcr dataset and jbosscache version Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:ignore - *.iml .idea + *.iml .idea .project Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-06-30 14:28:21 UTC (rev 6781) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-07-01 05:57:42 UTC (rev 6782) @@ -20,10 +20,14 @@ # Data gatein.data.dir=${jboss.server.data.dir}/gatein +# DB +gatein.db.data.dir=${gatein.data.dir}/db + # JCR gatein.jcr.config.type=local -gatein.jcr.datasource.name=java:jdbcjcr +gatein.jcr.datasource.name=java:gatein-jcr 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.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties 2011-06-30 14:28:21 UTC (rev 6781) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties 2011-07-01 05:57:42 UTC (rev 6782) @@ -25,10 +25,10 @@ # JCR gatein.jcr.config.type=local -gatein.jcr.datasource.name=jdbcjcr +gatein.jcr.datasource.name=gatein-jcr gatein.jcr.datasource.dialect=auto gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} +gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/gatein-jcr_${name} gatein.jcr.datasource.username=sa gatein.jcr.datasource.password= Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml 2011-06-30 14:28:21 UTC (rev 6781) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml 2011-07-01 05:57:42 UTC (rev 6782) @@ -29,11 +29,63 @@ <key>org.exoplatform.container.PropertyConfigurator</key> <type>org.exoplatform.container.PropertyConfigurator</type> <init-params> + <!-- The name of the default portal container --> <value-param> <name>properties.url</name> <value>configuration.properties</value> </value-param> + <!-- The name of the default rest ServletContext --> + <value-param> + <name>default.rest.context</name> + <value>rest</value> + </value-param> + <!-- The name of the default realm --> + <value-param> + <name>default.realm.name</name> + <value>gatein-domain</value> + </value-param> + <!-- The default portal container definition --> + <!-- It cans be used to avoid duplicating configuration --> + <object-param> + <name>default.portal.definition</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinition"> + <!-- The path to the external properties file --> + <field name="externalSettingsPath"> + <string>configuration.properties</string> + </field> + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value> + <string>eXoResources</string> + </value> + <value> + <string>portal</string> + </value> + <value> + <string>dashboard</string> + </value> + <value> + <string>exoadmin</string> + </value> + <value> + <string>eXoGadgets</string> + </value> + <value> + <string>eXoGadgetServer</string> + </value> + <value> + <string>rest</string> + </value> + <value> + <string>wsrp-producer</string> + </value> + <value> + <string>web</string> + </value> + </collection> + </field> + </object> + </object-param> </init-params> </component> - </configuration> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-06-30 14:28:21 UTC (rev 6781) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-01 05:57:42 UTC (rev 6782) @@ -1315,7 +1315,7 @@ <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> <!-- TODO: change <version>3.2.7.GA</version>--> - <version>3.2.6.GA</version> + <version>3.2.7.GA</version> <exclusions> <exclusion> <artifactId>jboss-transaction-api</artifactId> Property changes on: epp/portal/branches/EPP_5_2_Branch/starter/jar ___________________________________________________________________ Added: svn:ignore + target Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-06-30 14:28:21 UTC (rev 6781) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-07-01 05:57:42 UTC (rev 6782) @@ -27,7 +27,7 @@ <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 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>