Return-Path: 
 <commits-return-6406-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
X-Original-To: apmail-continuum-commits-archive@www.apache.org
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1F40264EC
	for <apmail-continuum-commits-archive@www.apache.org>;
 Wed,  8 Jun 2011 00:33:47 +0000 (UTC)
Received: (qmail 41966 invoked by uid 500); 8 Jun 2011 00:33:47 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 41936 invoked by uid 500); 8 Jun 2011 00:33:47 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 41929 invoked by uid 99); 8 Jun 2011 00:33:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2011 00:33:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2011 00:33:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7B66B2388900; Wed,  8 Jun 2011 00:33:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1133217 - in /continuum/trunk: continuum-webapp/pom.xml
 continuum-webapp/src/main/resources/META-INF/plexus/application.xml pom.xml
Date: Wed, 08 Jun 2011 00:33:23 -0000
To: commits@continuum.apache.org
From: ctan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110608003323.7B66B2388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ctan
Date: Wed Jun  8 00:33:23 2011
New Revision: 1133217

URL: http://svn.apache.org/viewvc?rev=1133217&view=rev
Log:
[CONTINUUM-2633] enabled second level caching

Modified:
    continuum/trunk/continuum-webapp/pom.xml
    continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1133217&r1=1133216&r2=1133217&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Wed Jun  8 00:33:23 2011
@@ -659,6 +659,20 @@ under the License.
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jpox</groupId>
+      <artifactId>jpox-ehcache</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ehcache</groupId>
+          <artifactId>ehcache</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>

Modified: continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=1133217&r1=1133216&r2=1133217&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Wed Jun  8 00:33:23 2011
@@ -205,6 +205,22 @@
             <name>org.jpox.rdbms.dateTimezone</name>
             <value>JDK_DEFAULT_TIMEZONE</value>
           </property>
+          <property>
+            <name>org.jpox.cache.level2</name>
+            <value>true</value>
+          </property>
+          <property>
+            <name>org.jpox.cache.level2.type</name>
+            <value>ehcacheclassbased</value>
+          </property>
+          <property>
+            <name>org.jpox.cache.level2.configurationFile</name>
+            <value>/ehcache.xml</value>
+          </property>
+          <property>
+            <name>org.jpox.cache.level2.cacheName</name>
+            <value>default</value>
+          </property>
           <!-- this is required for some MySQL versions and configurations, see CONTINUUM-1113 -->
           <property>
             <name>org.jpox.rdbms.stringDefaultLength</name>

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1133217&r1=1133216&r2=1133217&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Wed Jun  8 00:33:23 2011
@@ -1635,6 +1635,11 @@ under the License.
         <artifactId>jsoup</artifactId>
         <version>1.5.2</version>
       </dependency>
+      <dependency>
+        <groupId>jpox</groupId>
+        <artifactId>jpox-ehcache</artifactId>
+        <version>1.1.9</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>