[portal-commits] JBoss Portal SVN: r13043 - in branches/JBoss_Portal_AS5_Deployer/core: src/main/org/jboss/portal/core/deployment/jboss and 6 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Mon Mar 16 18:32:40 EDT 2009
Author: mwringe
Date: 2009-03-16 18:32:39 -0400 (Mon, 16 Mar 2009)
New Revision: 13043
Removed:
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/
Modified:
branches/JBoss_Portal_AS5_Deployer/core/.classpath
branches/JBoss_Portal_AS5_Deployer/core/build.xml
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
Log:
Update the build scripts to properly build the jboss-portal deployable.
Update how some of the metadata is handled to prevent null pointer exceptions.
Remove ehcache.xml files and re-enable second level hibernate support with the HashtableCacheProvider.
Remove dtd files from core as they are being handled by the deployer.
Modified: branches/JBoss_Portal_AS5_Deployer/core/.classpath
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/.classpath 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/.classpath 2009-03-16 22:32:39 UTC (rev 13043)
@@ -86,5 +86,21 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-deployers-core-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-ha-server-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-javaee.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-kernel.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-mbeans.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-security-aspects.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-security-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbosssx-server.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossws-native-jaxrpc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossws-native-saaj.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_AS5_Deployer/core/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/build.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/build.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -183,9 +183,6 @@
<taskdef name="explode"
classname="org.jboss.portal.common.ant.Explode"
classpathref="explode.task.classpath"/>
- <taskdef name="implode"
- classname="org.jboss.portal.common.ant.Implode"
- classpathref="explode.task.classpath"/>
</target>
@@ -313,29 +310,34 @@
</fileset>
</jar>
- <!-- jboss-portal.sar -->
- <copy todir="${build.resources}/jboss-portal">
+ <!-- jboss-portal -->
+ <copy todir="${build.resources}/jboss-portal-tmp/jboss-portal.sar">
<fileset dir="${build.resources}/portal-core-sar"/>
</copy>
+
+ <!-- move the portal-aop.xml file out of the sar until JBAS-6617 is fixed -->
+ <move todir="${build.resources}/jboss-portal-tmp"
+ file="${build.resources}/jboss-portal-tmp/jboss-portal.sar/portal-aop.xml"/>
+
<!-- portal-server.war -->
- <copy todir="${build.resources}/jboss-portal/portal-server.war">
+ <copy todir="${build.resources}/jboss-portal-tmp/portal-server.war">
<fileset dir="${build.resources}/portal-server-war"/>
<fileset dir="${source.bin}/portal-server-war"/>
</copy>
<!-- portal-core.war -->
- <copy todir="${build.resources}/jboss-portal/portal-core.war">
+ <copy todir="${build.resources}/jboss-portal-tmp/portal-core.war">
<fileset dir="${build.resources}/portal-core-war"/>
<fileset dir="${source.bin}/portal-core-war"/>
</copy>
<!-- portal-ajax.war -->
- <copy todir="${build.resources}/jboss-portal/portal-ajax.war">
+ <copy todir="${build.resources}/jboss-portal-tmp/portal-ajax.war">
<fileset dir="${jboss.portal-theme.root}/resources/portal-ajax-war"/>
</copy>
<!-- hibernate configuration for identity -->
- <copy todir="${build.resources}/jboss-portal/conf/hibernate/user">
+ <copy todir="${build.resources}/jboss-portal-tmp/jboss-portal.sar/conf/hibernate/user">
<fileset dir="${jboss.portal/modules/identity.root}/resources/" includes="domain.hbm.xml"/>
</copy>
- <copy todir="${build.resources}/jboss-portal/lib">
+ <copy todir="${build.resources}/jboss-portal-tmp/jboss-portal.sar/lib">
<fileset dir="${build.lib}" includes="portal-core-lib.jar"/>
<fileset dir="${build.lib}" includes="jboss-portlet-api-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}"
@@ -368,68 +370,61 @@
<fileset dir="${jbpm.jpdl.lib}" includes="jbpm-jpdl.jar,jbpm-identity.jar"/>
</copy>
- <copy todir="${build.resources}/jboss-portal/lib" failonerror="false">
+ <copy todir="${build.resources}/jboss-portal-tmp/jboss-portal.sar/lib" failonerror="false">
<fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/>
<fileset dir="${jboss.portal-workflow.root}/lib" includes="portal-workflow-lib.jar"/>
</copy>
<!--dtd-->
- <copy todir="${build.resources}/jboss-portal/dtd">
+ <copy todir="${build.resources}/jboss-portal-tmp/jboss-portal.sar/dtd">
<fileset dir="${jboss.portal/modules/identity.root}/resources/dtd" includes="*.dtd"/>
</copy>
</target>
-
<target name="explode" depends="init">
- <explode
- file="${build.lib}/jboss-portal.sar"
- todir="${build.lib}"
- name="jboss-portal-exploded.sar"
- />
+ <explode file="${build.lib}/jboss-portal.zip"
+ todir="${build.lib}"
+ name="jboss-portal"/>
</target>
- <!-- Build the jboss-portal-ha.sar -->
+ <!-- Build the jboss-portal-har -->
<target name="output-ha" depends="artifacts">
- <copy todir="${build.resources}/jboss-portal-ha.sar">
+ <copy todir="${build.resources}/jboss-portal-ha">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
</copy>
- <copy todir="${build.resources}/jboss-portal-ha.sar">
+ <copy todir="${build.resources}/jboss-portal-ha/jboss-portal-ha.sar">
<filterset>
<filtersfile file="../build/etc/clustered.properties"/>
</filterset>
- <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
+ <fileset dir="${build.resources}/jboss-portal/jboss-portal.sar" includes="**/*.xml"/>
</copy>
- <!-- add jboss-cache-hibernate integration jar -->
- <copy todir="${build.resources}/jboss-portal-ha.sar/lib">
- <fileset dir="${org/jboss/cluster/hibernate.jbc.cacheprovider.root}/lib" includes="hibernate-jbc-cacheprovider.jar"/>
- </copy>
+ <zip destfile="${build.lib}/jboss-portal-ha.zip"
+ basedir="${build.resources}/jboss-portal-ha"/>
- <implode
- dir="${build.resources}/jboss-portal-ha.sar"
- tofile="${build.lib}/jboss-portal-ha.sar"/>
-
</target>
<!-- Build the jboss-portal.sar -->
<target name="output" depends="artifacts">
<!-- Build configurations -->
- <copy todir="${build.resources}/jboss-portal.sar">
- <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
+ <copy todir="${build.resources}/jboss-portal">
+ <fileset dir="${build.resources}/jboss-portal-tmp" excludes="**/*.xml"/>
</copy>
- <copy todir="${build.resources}/jboss-portal.sar">
+ <copy todir="${build.resources}/jboss-portal">
<filterset>
<filtersfile file="../build/etc/single.properties"/>
</filterset>
- <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
+ <fileset dir="${build.resources}/jboss-portal-tmp" includes="**/*.xml"/>
</copy>
<!-- Build archives -->
- <implode
- dir="${build.resources}/jboss-portal.sar"
- tofile="${build.lib}/jboss-portal.sar"/>
+ <zip destfile="${build.lib}/jboss-portal.zip"
+ basedir="${build.resources}/jboss-portal"/>
+ <copy todir="${build.lib}/jboss-portal">
+ <fileset dir="${build.resources}/jboss-portal"/>
+ </copy>
</target>
<!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed -->
@@ -540,14 +535,14 @@
description="Deploy."
depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="${build.lib}/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="${build.lib}/jboss-portal.zip" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
</target>
<target name="deploy-ha"
description="Deploy high availability."
depends="output-ha">
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy file="${build.lib}/jboss-portal-ha" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
</target>
<!--
@@ -557,14 +552,14 @@
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.zip"/>
</target>
<target name="undeploy-ha"
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/>
+ <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha"/>
</target>
<target name="tests" depends="init, _buildmagic:configure:deployment">
@@ -580,7 +575,7 @@
<sysproperty
key="jboss.aop.path"
- value="${build.resources}/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
+ value="${build.resources}/jboss-portal/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
<sysproperty
key="jboss.aop.class.path"
value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
@@ -690,7 +685,7 @@
<x-classpath>
<pathelement location="${build.lib}/portal-core-lib.jar"/>
<pathelement location="${build.lib}/portal-core-test-lib.jar"/>
- <pathelement location="${build.resources}/jboss-portal.sar"/>
+ <pathelement location="${build.resources}/jboss-portal/jboss-portal.sar"/>
<pathelement location="${jboss.portal/modules/test.resources}"/>
<pathelement location="${build.resources}"/>
@@ -782,10 +777,14 @@
-->
<target name="deploy-explode" depends="output,explode">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar" overwrite="true">
- <fileset dir="${build.lib}/jboss-portal-exploded.sar"/>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal" overwrite="true">
+ <fileset dir="${build.lib}/jboss-portal"/>
</copy>
</target>
+ <target name="undeploy-explode">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.zip"/>
+ </target>
<target name="explode-ha" depends="init">
<explode
file="${build.lib}/jboss-portal-ha.sar"
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java 2009-03-16 22:32:39 UTC (rev 13043)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
@@ -44,6 +43,7 @@
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.security.RoleSecurityBinding;
+import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.security.spi.provider.AuthorizationDomain;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
@@ -174,7 +174,15 @@
for (int i = 0; i < securityConstraints.getPolicyPermission().size(); i++)
{
PolicyPermissionMetaData policyMD = securityConstraints.getPolicyPermission().get(i);
- RoleSecurityBinding binding = new RoleSecurityBinding(policyMD.getActionNames(), policyMD.getRoleName());
+ RoleSecurityBinding binding;
+ if (policyMD.getUnchecked() == null)
+ {
+ binding = new RoleSecurityBinding(policyMD.getActionNames(), policyMD.getRoleName());
+ }
+ else
+ {
+ binding = new RoleSecurityBinding(policyMD.getActionNames(), SecurityConstants.UNCHECKED_ROLE_NAME);
+ }
bindings.add(binding);
}
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-16 22:32:39 UTC (rev 13043)
@@ -508,16 +508,16 @@
throws IllegalCoordinationException
{
// implicit mode parameter
- String bindingsImplicitMode = coordinationMD.getBindings().getImplicitMode();
- if (bindingsImplicitMode != null)
+ if (coordinationMD != null && coordinationMD.getBindings() != null && coordinationMD.getBindings().getImplicitMode() != null)
{
+ String bindingsImplicitMode = coordinationMD.getBindings().getImplicitMode();
this.coordinationConfigurator.setParameterBindingImplicitMode((PageContainer) portalObject, Boolean
.valueOf(bindingsImplicitMode));
}
// implicit mode event
- String wiringImplicitMode = coordinationMD.getWirings().getImplicitMode();
- if (wiringImplicitMode != null)
+ if (coordinationMD.getWirings() != null && coordinationMD.getWirings() != null && coordinationMD.getWirings().getImplicitMode() != null)
{
+ String wiringImplicitMode = coordinationMD.getWirings().getImplicitMode();
this.coordinationConfigurator.setEventWiringImplicitMode((PageContainer) portalObject, Boolean
.valueOf(wiringImplicitMode));
}
@@ -528,31 +528,36 @@
Map<Window, Set<QName>> bindings = new HashMap<Window, Set<QName>>();
- for (ParameterBindingMetaData parameterBindingMetaData : coordinationMD.getBindings().getParameterBindings())
- {
- for (WindowCoordinationMetaData windowsMetaData : parameterBindingMetaData.getWindowCoordination())
+ if (coordinationMD != null && coordinationMD.getBindings() != null && coordinationMD.getBindings().getParameterBindings() != null)
+ {
+ for (ParameterBindingMetaData parameterBindingMetaData : coordinationMD.getBindings().getParameterBindings())
{
- String windowName = windowsMetaData.getWindowName();
- Window window = page.getWindow(windowName);
-
- if (window == null)
+ for (WindowCoordinationMetaData windowsMetaData : parameterBindingMetaData.getWindowCoordination())
{
- throw new IllegalCoordinationException("Cannot obtain window: \"" + windowName + "\" on page: "
- + page.getName());
- }
+ String windowName = windowsMetaData.getWindowName();
+ Window window = page.getWindow(windowName);
- Set<QName> qNames = new HashSet<QName>();
- for (String name : windowsMetaData.getQNames())
- {
- QName qName = new QName(name);
- qNames.add(qName);
+ if (window == null)
+ {
+ throw new IllegalCoordinationException("Cannot obtain window: \"" + windowName + "\" on page: "
+ + page.getName());
+ }
+
+ Set<QName> qNames = new HashSet<QName>();
+ for (String name : windowsMetaData.getQNames())
+ {
+ QName qName = new QName(name);
+ qNames.add(qName);
+ }
+
+ bindings.put(window, qNames);
}
-
- bindings.put(window, qNames);
+ this.coordinationConfigurator.setParameterBinding(parameterBindingMetaData.getId(), bindings);
}
- this.coordinationConfigurator.setParameterBinding(parameterBindingMetaData.getId(), bindings);
}
-
+
+ if (coordinationMD != null && coordinationMD.getBindings() != null && coordinationMD.getBindings().getAliasBindings() != null)
+ {
for (AliasBindingMetaData aliasBindingMetaData : coordinationMD.getBindings().getAliasBindings())
{
@@ -565,18 +570,21 @@
this.coordinationConfigurator.setAliasBinding(page, aliasBindingMetaData.getId(), qNames);
}
+ }
- for (EventWiringMetaData wiringMetaData : coordinationMD.getWirings().getEventWiring())
+ if (coordinationMD != null && coordinationMD.getWirings() != null && coordinationMD.getWirings().getEventWiring() != null)
{
- Map<Window, QName> sources = new HashMap<Window, QName>();
- Map<Window, QName> destinations = new HashMap<Window, QName>();
+ for (EventWiringMetaData wiringMetaData : coordinationMD.getWirings().getEventWiring())
+ {
+ Map<Window, QName> sources = new HashMap<Window, QName>();
+ Map<Window, QName> destinations = new HashMap<Window, QName>();
- populateWindows(sources, wiringMetaData.getSources(), page);
- populateWindows(destinations, wiringMetaData.getDestinations(), page);
+ populateWindows(sources, wiringMetaData.getSources().getWindowCoordination(), page);
+ populateWindows(destinations, wiringMetaData.getDestinations().getWindowCoordination(), page);
- this.coordinationConfigurator.setEventWiring(sources, destinations, wiringMetaData.getName());
+ this.coordinationConfigurator.setEventWiring(sources, destinations, wiringMetaData.getName());
+ }
}
-
}
}
Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -1,61 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<ehcache>
-
- <!-- Sets the path to the directory where cache .data files are created.
-
- If the path is a Java System Property it is replaced by
- its value in the running VM.
-
- The following properties are translated:
- user.home - User's home directory
- user.dir - User's current working directory
- java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/instance"/>
-
-
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
-
- The following attributes are required for defaultCache:
-
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
-
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="1800"
- overflowToDisk="false"
- />
-</ehcache>
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -29,16 +29,14 @@
<session-factory>
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
- <!-- todo: renamble second level cache
- <property name="cache.use_second_level_cache">true</property> -->
- <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_second_level_cache">true</property>
<property name="cache.use_query_cache">false</property>
<property name="hibernate.hbm2ddl.auto">update</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
@@ -46,8 +44,8 @@
<!--
| Comment in clustered mode
@portal.clustered.xml.close@
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/instance/ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.clustered.xml.open@
-->
@@ -59,4 +57,4 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/instance/domain.hbm.xml"/>
</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>
\ No newline at end of file
Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -1,61 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<ehcache>
-
- <!-- Sets the path to the directory where cache .data files are created.
-
- If the path is a Java System Property it is replaced by
- its value in the running VM.
-
- The following properties are translated:
- user.home - User's home directory
- user.dir - User's current working directory
- java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/portal"/>
-
-
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
-
- The following attributes are required for defaultCache:
-
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
-
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="1800"
- overflowToDisk="false"
- />
-</ehcache>
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -29,15 +29,13 @@
<session-factory>
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
- <!-- todo: renable second level cache
- <property name="cache.use_second_level_cache">true</property> -->
- <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_second_level_cache">true</property>
<property name="cache.use_query_cache">false</property>
<property name="hibernate.hbm2ddl.auto">update</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
@@ -45,8 +43,8 @@
<!--
| Comment in clustered mode
@portal.clustered.xml.close@
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.clustered.xml.open@
-->
@@ -58,4 +56,4 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/portal/domain.hbm.xml"/>
</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>
\ No newline at end of file
Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -1,61 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<ehcache>
-
- <!-- Sets the path to the directory where cache .data files are created.
-
- If the path is a Java System Property it is replaced by
- its value in the running VM.
-
- The following properties are translated:
- user.home - User's home directory
- user.dir - User's current working directory
- java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/portlet"/>
-
-
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
-
- The following attributes are required for defaultCache:
-
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
-
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="1800"
- overflowToDisk="false"
- />
-</ehcache>
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -29,15 +29,13 @@
<session-factory>
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
- <!-- todo: renable second level cache
- <property name="cache.use_second_level_cache">true</property> -->
- <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_second_level_cache">true</property>
<property name="cache.use_query_cache">false</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
@@ -45,8 +43,8 @@
<!--
| Comment in clustered mode
@portal.clustered.xml.close@
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portlet/ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.clustered.xml.open@
-->
@@ -58,4 +56,4 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/portlet/domain.hbm.xml"/>
</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>
\ No newline at end of file
Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -1,61 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<ehcache>
-
- <!-- Sets the path to the directory where cache .data files are created.
-
- If the path is a Java System Property it is replaced by
- its value in the running VM.
-
- The following properties are translated:
- user.home - User's home directory
- user.dir - User's current working directory
- java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/user"/>
-
-
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
-
- The following attributes are required for defaultCache:
-
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
-
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="1800"
- overflowToDisk="false"
- />
-</ehcache>
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -29,15 +29,13 @@
<session-factory>
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
- <!-- todo: renable second level cache
- <property name="cache.use_second_level_cache">true</property> -->
- <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_second_level_cache">true</property>
<property name="cache.use_query_cache">false</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
@@ -45,8 +43,8 @@
<!--
| Comment in clustered mode
@portal.clustered.xml.close@
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/user/ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.clustered.xml.open@
-->
@@ -58,4 +56,4 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/user/domain.hbm.xml"/>
</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>
\ No newline at end of file
Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -1,61 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<ehcache>
-
- <!-- Sets the path to the directory where cache .data files are created.
-
- If the path is a Java System Property it is replaced by
- its value in the running VM.
-
- The following properties are translated:
- user.home - User's home directory
- user.dir - User's current working directory
- java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/workflow"/>
-
-
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
-
- The following attributes are required for defaultCache:
-
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
-
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="120"
- timeToLiveSeconds="120"
- overflowToDisk="false"
- />
-</ehcache>
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-03-16 22:29:50 UTC (rev 13042)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-03-16 22:32:39 UTC (rev 13043)
@@ -15,11 +15,10 @@
<property name="hibernate.use_sql_comments">true</property>
<!-- caching properties -->
- <!-- todo: renable second level cache -->
- <property name="cache.use_second_level_cache">false</property>
- <property name="cache.use_query_cache">false</property>
-<!-- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/workflow/ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> -->
+ <property name="cache.use_second_level_cache">true</property>
+ <property name="cache.use_query_cache">true</property>
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
<!-- managed environment transaction configuration -->
<property
More information about the portal-commits
mailing list