Author: ronvoe122
Date: 2006-11-02 11:14:19-0800
New Revision: 10320
Added:
branches/release/b21/src/conf/conf/JCSAdminServlet.properties
branches/release/b21/www/repository/commons-fileupload/jars/commons-fileupload-1.1.1.jar (contents, props changed)
branches/release/b21/www/repository/commons-io/
branches/release/b21/www/repository/commons-io/jars/
branches/release/b21/www/repository/commons-io/jars/commons-io-1.2.jar (contents, props changed)
branches/release/b21/www/repository/concurrent/
branches/release/b21/www/repository/concurrent/jars/
branches/release/b21/www/repository/concurrent/jars/concurrent-1.3.4.jar (contents, props changed)
branches/release/b21/www/repository/jcs/jars/jcs-1.2.7.9.2.jar (contents, props changed)
Removed:
branches/release/b21/www/repository/commons-fileupload/jars/commons-fileupload-1.0.jar
branches/release/b21/www/repository/jcs/jars/jcs-1.0-dev.jar
Modified:
branches/release/b21/project.xml
branches/release/b21/src/conf/classes/cache.ccf
branches/release/b21/src/conf/conf/componentConfiguration.xml
branches/release/b21/src/webapp/WEB-INF/web.xml
Log:
Adjusted configuration of JCS and TurbineCacheService and upgraded JCS to a recent version:
- removed the configuration for a cache region, which is never used and added a configuration for a region which is used, but was not configured
- cache.ccf
- increased the interval in which the turbineCacheService checks for expired objects in JCS from 5ms to 5s
- componentConfiguration.xml
- added the basic configuation for the JCSAdminServlet, which can be used to monitor the cache activity
- to use the servlet the velocity templates of the servlet have to be downloaded an placed in the class path of Scarab
- web.xml, JCSAdminServlet.properties
- upgraded the JCS from 1.0 to 1.2.7.9.2
- more stable, the upgrade is recommended in the JCS-dev-mailinglist
- it saves one thread per configured cache region
- jcs1.0 started one thread per region to move the data from the memory cache to the disk cache,
even if there is no disk cache configured (as in Scarab).
- the JCSAdminServlet runs stable with this release
- jcs-1.2.7.9.2.jar, concurrent-1.3.4.jar
- upgraded commons-fileupload to v1.1.1
- a class in commons-fileupload which is put in the JCS-cache was not serializable
- commons-fileupload-1.1.1.jar, commons-io-1.2.jar
Modified: branches/release/b21/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/project.xml?view=diff&rev=10320&p1=branches/release/b21/project.xml&p2=branches/release/b21/project.xml&r1=10319&r2=10320
==============================================================================
--- branches/release/b21/project.xml (original)
+++ branches/release/b21/project.xml 2006-11-02 11:14:19-0800
@@ -262,7 +262,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
+ <version>1.1.1</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -270,6 +270,16 @@
<url>http://jakarta.apache.org/commons/fileupload/index.html</url>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>http://jakarta.apache.org/commons/io/index.html</url>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
@@ -333,6 +343,16 @@
</properties>
</dependency>
<dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ <url>http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
+ </dependency>
+ <dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>1.3.1</version>
@@ -390,7 +410,7 @@
<dependency>
<groupId>jcs</groupId>
<artifactId>jcs</artifactId>
- <version>1.0-dev</version>
+ <version>1.2.7.9.2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
Modified: branches/release/b21/src/conf/classes/cache.ccf
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/classes/cache.ccf?view=diff&rev=10320&p1=branches/release/b21/src/conf/classes/cache.ccf&p2=branches/release/b21/src/conf/classes/cache.ccf&r1=10319&r2=10320
==============================================================================
--- branches/release/b21/src/conf/classes/cache.ccf (original)
+++ branches/release/b21/src/conf/classes/cache.ccf 2006-11-02 11:14:19-0800
@@ -6,15 +6,6 @@
jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-# this is copied from example, not sure of its utility
-# SYSTEM CACHE
-# should be defined for the storage of group attribute list
-jcs.system.groupIdCache=
-jcs.system.groupIdCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.system.groupIdCache.cacheattributes.MaxObjects=1000
-jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.system.groupIdCache.elementattributes=org.apache.jcs.engine.ElementAttributes
-
# CACHE REGIONS AVAILABLE
# Regions preconfigured for caching
@@ -108,5 +99,10 @@
jcs.region.org_tigris_scarab_om_GlobalParameter.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
jcs.region.org_tigris_scarab_om_GlobalParameter.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.region.org_tigris_scarab_om_DependType=
+jcs.region.org_tigris_scarab_om_DependType.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.org_tigris_scarab_om_DependType.cacheattributes.MaxObjects=1000
+jcs.region.org_tigris_scarab_om_DependType.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.region.org_tigris_scarab_om_DependType.elementattributes=org.apache.jcs.engine.ElementAttributes
@JCS_CACHE_PROPERTIES@
Added: branches/release/b21/src/conf/conf/JCSAdminServlet.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/conf/JCSAdminServlet.properties?view=auto&rev=10320
==============================================================================
--- (empty file)
+++ branches/release/b21/src/conf/conf/JCSAdminServlet.properties 2006-11-02 11:14:19-0800
@@ -0,0 +1,6 @@
+# define a resource loader to load the velocity templates of the JCSAdminServlet from the classpath
+resource.loader=class
+class.resource.loader.description=Velocity Classpath Resource Loader
+class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+class.resource.loader.cache=true
+class.resource.loader.modificationCheckInterval=0
Modified: branches/release/b21/src/conf/conf/componentConfiguration.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/conf/componentConfiguration.xml?view=diff&rev=10320&p1=branches/release/b21/src/conf/conf/componentConfiguration.xml&p2=branches/release/b21/src/conf/conf/componentConfiguration.xml&r1=10319&r2=10320
==============================================================================
--- branches/release/b21/src/conf/conf/componentConfiguration.xml (original)
+++ branches/release/b21/src/conf/conf/componentConfiguration.xml 2006-11-02 11:14:19-0800
@@ -11,7 +11,7 @@
<upload repository="WEB-INF" sizeMax="157286400"
sizeThreshold="8192" />
<parser />
- <cache cacheInitialSize="20" cacheCheckFrequency="5" />
+ <cache cacheInitialSize="20" cacheCheckFrequency="5000" />
<localization>
<bundles>
Modified: branches/release/b21/src/webapp/WEB-INF/web.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/web.xml?view=diff&rev=10320&p1=branches/release/b21/src/webapp/WEB-INF/web.xml&p2=branches/release/b21/src/webapp/WEB-INF/web.xml&r1=10319&r2=10320
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/web.xml (original)
+++ branches/release/b21/src/webapp/WEB-INF/web.xml 2006-11-02 11:14:19-0800
@@ -31,6 +31,14 @@
<servlet-name>Notificator</servlet-name>
<servlet-class>org.tigris.scarab.notification.ScarabNewNotificationManager</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>JCSAdminServlet</servlet-name>
+ <servlet-class>org.apache.jcs.admin.servlet.JCSAdminServlet</servlet-class>
+ <init-param>
+ <param-name>properties</param-name>
+ <param-value>WEB-INF/conf/JCSAdminServlet.properties</param-value>
+ </init-param>
+ </servlet>
<!--
@@ -111,6 +119,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>JCSAdminServlet</servlet-name>
+ <url-pattern>/JCSAdminServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
<url-pattern>*.jws</url-pattern>
</servlet-mapping>
Removed: branches/release/b21/www/repository/commons-fileupload/jars/commons-fileupload-1.0.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/www/repository/commons-fileupload/jars/commons-fileupload-1.0.jar?view=auto&rev=10319
Added: branches/release/b21/www/repository/commons-fileupload/jars/commons-fileupload-1.1.1.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/www/repository/commons-fileupload/jars/commons-fileupload-1.1.1.jar?view=auto&rev=10320
==============================================================================
Binary file. No diff available.
Added: branches/release/b21/www/repository/commons-io/jars/commons-io-1.2.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/www/repository/commons-io/jars/commons-io-1.2.jar?view=auto&rev=10320
==============================================================================
Binary file. No diff available.
Added: branches/release/b21/www/repository/concurrent/jars/concurrent-1.3.4.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/www/repository/concurrent/jars/concurrent-1.3.4.jar?view=auto&rev=10320
==============================================================================
Binary file. No diff available.
Removed: branches/release/b21/www/repository/jcs/jars/jcs-1.0-dev.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/www/repository/jcs/jars/jcs-1.0-dev.jar?view=auto&rev=10319
Added: branches/release/b21/www/repository/jcs/jars/jcs-1.2.7.9.2.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/www/repository/jcs/jars/jcs-1.2.7.9.2.jar?view=auto&rev=10320
==============================================================================
Binary file. No diff available.
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.