weaver 2004/04/22 14:00:55
Modified: components/file-cache/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/file-cache Tag: NANOCONTAINER_DEPLOYER
project.properties
Log:
- supports setting of cache values via system properties
- Uses ChildAwareContainer
Revision Changes Path
No revision
No revision
1.1.2.3 +15 -10
jakarta-jetspeed-2/components/file-cache/src/java/META-INF/Attic/nanocontainer.groovy
Index: nanocontainer.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/file-cache/src/java/META-INF/Attic/nanocontainer.groovy,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- nanocontainer.groovy 20 Apr 2004 22:37:29 -0000 1.1.2.2
+++ nanocontainer.groovy 22 Apr 2004 21:00:55 -0000 1.1.2.3
@@ -14,22 +14,27 @@
* limitations under the License.
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.apache.jetspeed.cache.file.FileCache
-// create the root container
-container = new DefaultPicoContainer()
+container = new ChildAwareContainer(parent)
-Long scanRate = 10
-cacheSize = 20
-if(parent != null)
-{
- parent.registerComponentInstance(FileCache, new FileCache(scanRate, cacheSize))
-}
+scanRate =
Long.parseLong(System.getProperty("org.apache.jetspeed.file_cache.scan_rate","120"))
+cacheSize =
Integer.parseInt(System.getProperty("org.apache.jetspeed.file_cache.cache_size","100"))
-container.registerComponentInstance(FileCache, new FileCache(scanRate, cacheSize))
+initialCapacity =
Integer.parseInt(System.getProperty("org.apache.jetspeed.file_cache.initial_capacity","-1"))
+loadFactor =
Integer.parseInt(System.getProperty("org.apache.jetspeed.file_cache.load_factor","-1"))
+if(initialCapacity != -1 && loadFactor != -1)
+{
+ FileCache fileCache = new FileCache(initialCapacity, loadFactor, scanRate,
cacheSize)
+}
+else
+{
+ FileCache fileCache = new FileCache(scanRate, cacheSize)
+}
+container.registerComponentInstance(FileCache, fileCache)
return container
No revision
No revision
1.1.2.2 +8 -0
jakarta-jetspeed-2/components/file-cache/Attic/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/file-cache/Attic/project.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.properties 20 Apr 2004 19:43:13 -0000 1.1.2.1
+++ project.properties 22 Apr 2004 21:00:55 -0000 1.1.2.2
@@ -41,3 +41,11 @@
maven.junit.fork=true
+# Sets up the system properties for unit testing
+maven.junit.sysproperties=org.apache.jetspeed.file_cache.scan_rate \
+org.apache.jetspeed.file_cache.cache_size
+
+org.apache.jetspeed.file_cache.scan_rate=10
+org.apache.jetspeed.file_cache.cache_size=20
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
