[exo-jcr-commits] exo-jcr SVN: r1339 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core and 2 other directories.

[do-not-reply at jboss.org]

Author: pnedonosko
Date: 2010-01-11 06:39:43 -0500 (Mon, 11 Jan 2010)
New Revision: 1339

Modified:
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/resources/binding.xml
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-338 lazy load for childs config (2); test workspace ws2 uses all lazy childs

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java	2010-01-11 11:00:15 UTC (rev 1338)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java	2010-01-11 11:39:43 UTC (rev 1339)
@@ -30,7 +30,7 @@
 
    protected String name;
    
-   protected long lazyReadThreshold;
+   protected int lazyReadThreshold;
 
    @Deprecated
    protected String autoInitializedRootNt;
@@ -195,12 +195,12 @@
       this.initializer = initializer;
    }
    
-   public long getLazyReadThreshold()
+   public int getLazyReadThreshold()
    {
       return lazyReadThreshold;
    }
 
-   public void setLazyReadThreshold(long lazyReadThreshold)
+   public void setLazyReadThreshold(int lazyReadThreshold)
    {
       this.lazyReadThreshold = lazyReadThreshold;
    }   

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java	2010-01-11 11:00:15 UTC (rev 1338)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java	2010-01-11 11:39:43 UTC (rev 1339)
@@ -160,7 +160,7 @@
       WorkspaceEntry wsConfig = (WorkspaceEntry)container.getComponentInstanceOfType(WorkspaceEntry.class);
 
       this.lazyReadThreshold =
-         wsConfig.getLazyReadThreshold() > 0 ? (int) wsConfig.getLazyReadThreshold() : DEFAULT_LAZY_READ_THRESHOLD;
+         wsConfig.getLazyReadThreshold() > 0 ? wsConfig.getLazyReadThreshold() : DEFAULT_LAZY_READ_THRESHOLD;
 
       WorkspaceFileCleanerHolder cleanerHolder =
          (WorkspaceFileCleanerHolder)container.getComponentInstanceOfType(WorkspaceFileCleanerHolder.class);

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/resources/binding.xml
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/resources/binding.xml	2010-01-11 11:00:15 UTC (rev 1338)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/resources/binding.xml	2010-01-11 11:39:43 UTC (rev 1339)
@@ -21,8 +21,8 @@
 
   <mapping name="workspace" class="org.exoplatform.services.jcr.config.WorkspaceEntry">
     <value name="name" field="name" style="attribute" />
-    <value name="lazy-read-threshold" field="lazyReadThreshold" style="attribute" 
-        deserializer="org.exoplatform.services.jcr.util.ConfigurationFormat.parseLong" usage="optional" />
+    <value name="lazy-read-threshold" field="lazyReadThreshold"  
+        deserializer="org.exoplatform.services.jcr.util.ConfigurationFormat.parseInt" style="attribute" usage="optional" />
     <value name="auto-init-root-nodetype" field="autoInitializedRootNt" style="attribute" usage="optional" />
     <value name="auto-init-permissions" field="autoInitPermissions" style="attribute" usage="optional" />
     <structure name="container" field="container">

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml	2010-01-11 11:00:15 UTC (rev 1338)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml	2010-01-11 11:39:43 UTC (rev 1339)
@@ -28,7 +28,7 @@
          <session-max-age>1h</session-max-age>
          <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
          <workspaces>
-            <workspace name="ws" lazy-read-threshold="2000">
+            <workspace name="ws">
                <!-- for system storage -->
                <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
                   <properties>
@@ -129,7 +129,7 @@
                </query-handler>
             </workspace>
 
-            <workspace name="ws2">
+            <workspace name="ws2" lazy-read-threshold="1">
                <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
                   <properties>
                      <property name="source-name" value="jdbcjcr2" />