You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jcs-dev@jakarta.apache.org by as...@apache.org on 2005/09/27 00:01:22 UTC

svn commit: r291763 - in /jakarta/jcs/trunk: .cvsignore project.properties project.xml src/conf/cacheTCP1.ccf src/conf/cacheTCP2.ccf src/test-conf/log4j.properties xdocs/LateralTCPAuxCache.xml xdocs/LateralTCPProperties.xml

Author: asmuts
Date: Mon Sep 26 15:01:16 2005
New Revision: 291763

URL: http://svn.apache.org/viewcvs?rev=291763&view=rev
Log:
Updated xdocs for new TCP config.
Updated some config files.
Added eclipse project and classpath files, modified cvsignore.
Changed log level for tests.

Modified:
    jakarta/jcs/trunk/.cvsignore
    jakarta/jcs/trunk/project.properties
    jakarta/jcs/trunk/project.xml
    jakarta/jcs/trunk/src/conf/cacheTCP1.ccf
    jakarta/jcs/trunk/src/conf/cacheTCP2.ccf
    jakarta/jcs/trunk/src/test-conf/log4j.properties
    jakarta/jcs/trunk/xdocs/LateralTCPAuxCache.xml
    jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml

Modified: jakarta/jcs/trunk/.cvsignore
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/.cvsignore?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
--- jakarta/jcs/trunk/.cvsignore (original)
+++ jakarta/jcs/trunk/.cvsignore Mon Sep 26 15:01:16 2005
@@ -1,7 +1,5 @@
 *~
 target
 test-reports
-.classpath
-.project
 *.log
 jars

Modified: jakarta/jcs/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/project.properties?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
--- jakarta/jcs/trunk/project.properties (original)
+++ jakarta/jcs/trunk/project.properties Mon Sep 26 15:01:16 2005
@@ -26,7 +26,7 @@
 maven.jcoverage.junit.fork = true
 maven.junit.sysproperties=java.security.policy
 java.security.policy=${basedir}/src/conf/cache.policy
-maven.junit.jvmargs=-Xmx160m
+maven.junit.jvmargs=-Xmx256m
 
 # -------------------------------------------------------------------
 # C H E C K S T Y L E  P R O P E R T I E S

Modified: jakarta/jcs/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/project.xml?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
--- jakarta/jcs/trunk/project.xml (original)
+++ jakarta/jcs/trunk/project.xml Mon Sep 26 15:01:16 2005
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <name>JCS</name>
   <id>jcs</id>
-  <currentVersion>1.2.6.7</currentVersion>
+  <currentVersion>1.2.6.8</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
@@ -183,14 +183,14 @@
       <id>berkeleydb</id>
       <version>1.5.0</version>
     </dependency>
-    
+    <!--
 	<dependency>
   		<groupId>maven-plugins</groupId>
   		<artifactId>maven-findbugs-plugin</artifactId>
   		<version>0.9.1</version>
   		<type>plugin</type>
 	</dependency>
-
+    -->
   </dependencies>
 
 

Modified: jakarta/jcs/trunk/src/conf/cacheTCP1.ccf
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/conf/cacheTCP1.ccf?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jcs/trunk/src/conf/cacheTCP2.ccf
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/conf/cacheTCP2.ccf?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jcs/trunk/src/test-conf/log4j.properties
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/log4j.properties?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/test-conf/log4j.properties (original)
+++ jakarta/jcs/trunk/src/test-conf/log4j.properties Mon Sep 26 15:01:16 2005
@@ -2,11 +2,11 @@
 
 log4j.category.org.apache.jcs=INFO
 log4j.category.org.apache.jcs.config=INFO
-log4j.category.org.apache.jcs.engine.DEBUG
-log4j.category.org.apache.jcs.engine.CacheEventQueueFactory=DEBUG
-log4j.category.org.apache.jcs.auxiliary.disk=DEBUG
-log4j.category.org.apache.jcs.auxiliary.remote=DEBUG
-log4j.category.org.apache.jcs.auxiliary.lateral=DEBUG
+log4j.category.org.apache.jcs.engine.INFO
+log4j.category.org.apache.jcs.engine.CacheEventQueueFactory=INFO
+log4j.category.org.apache.jcs.auxiliary.disk=INFO
+log4j.category.org.apache.jcs.auxiliary.remote=INFO
+log4j.category.org.apache.jcs.auxiliary.lateral=INFO
 log4j.category.org.apache.jcs.utils.threadpool=INFO
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: jakarta/jcs/trunk/xdocs/LateralTCPAuxCache.xml
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/xdocs/LateralTCPAuxCache.xml?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
--- jakarta/jcs/trunk/xdocs/LateralTCPAuxCache.xml (original)
+++ jakarta/jcs/trunk/xdocs/LateralTCPAuxCache.xml Mon Sep 26 15:01:16 2005
@@ -41,24 +41,20 @@
           Lateral Auxiliary Cache referenced by <code>LTCP</code>.  It
           connects to two servers defined in a comma separated list in
           the <code>TcpServers</code> attribute.  It listens to port
-          <code>1110</code> and does not run in
-          <code>PutOnlyMode</code>.  Setting <code>PutOnlyMode</code>
-          equal to <code>true</code> would cause the auxiliary cache to
+          <code>1110</code> and does <code>AllowGet</code>.  
+			Setting <code>AllowGet</code>
+          equal to <code>false</code> would cause the auxiliary cache to
           return <code>null</code> from any get request.  In most cases this
-          attribute should be set to <code>true</code>, since if the
+          attribute should be set to <code>false</code>, since if the
           lateral caches were properly configured, the elements in one
           would be present in all.
         </p>
         <source><![CDATA[
-jcs.auxiliary.LTCP=
-    org.apache.jcs.auxiliary.lateral.LateralCacheFactory
-jcs.auxiliary.LTCP.attributes=
-    org.apache.jcs.auxiliary.lateral.LateralCacheAttributes
-jcs.auxiliary.LTCP.attributes.TransmissionTypeName=TCP
-jcs.auxiliary.LTCP.attributes.TcpServers=
-    localhost:1111,localhost:1112
+jcs.auxiliary.LTCP=org.apache.jcs.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory
+jcs.auxiliary.LTCP.attributes=org.apache.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes
+jcs.auxiliary.LTCP.attributes.TcpServers=localhost:1111,localhost:1112
 jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110
-jcs.auxiliary.LTCP.attributes.PutOnlyMode=false
+jcs.auxiliary.LTCP.attributes.AllowGet=true
         ]]></source>
         <p>
 		  A mostly configurationless mode is available for the TCP
@@ -82,19 +78,22 @@
         </p>
         <p>
           The configuration below is the same as above, except the
-          <code>Receive</code> attribute is set to false.
+          <code>Receive</code> attribute is set to false.  It also uses UDP 
+          discovery to find the servers, rather than listing them in the
+          servers attribute.
         </p>
         <source><![CDATA[
-jcs.auxiliary.LTCP=
-    org.apache.jcs.auxiliary.lateral.LateralCacheFactory
-jcs.auxiliary.LTCP.attributes=
-    org.apache.jcs.auxiliary.lateral.LateralCacheAttributes
-jcs.auxiliary.LTCP.attributes.TransmissionTypeName=TCP
-jcs.auxiliary.LTCP.attributes.TcpServers=
-    localhost:1111,localhost:1112
-jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110
-jcs.auxiliary.LTCP.attributes.PutOnlyMode=false
-jcs.auxiliary.LTCP.attributes.Receive=false
+jcs.auxiliary.LTCP=org.apache.jcs.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory
+jcs.auxiliary.LTCP.attributes=org.apache.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes
+#jcs.auxiliary.LTCP.attributes.TcpServers=
+jcs.auxiliary.LTCP.attributes.TcpListenerPort=1118
+jcs.auxiliary.LTCP.attributes.UdpDiscoveryAddr=228.5.6.8
+jcs.auxiliary.LTCP.attributes.UdpDiscoveryPort=6780
+jcs.auxiliary.LTCP.attributes.UdpDiscoveryEnabled=true
+jcs.auxiliary.LTCP.attributes.Receive=true
+jcs.auxiliary.LTCP.attributes.AllowGet=false
+jcs.auxiliary.LTCP.attributes.IssueRemoveOnPut=false
+jcs.auxiliary.LTCP.attributes.FilterRemoveByHashCode=false
         ]]></source>
       </subsection>
                   
@@ -126,14 +125,12 @@
           any type of locking.
         </p>
       </subsection>
-      <subsection name="TODO">
+      <subsection name="Recent">
         <p>
-          I will be adding a <code>RemoveOnPut</code> attribute that
-          will cause the lateral cache to remove an element from the
-          cache rather than inserting it when a put command comes from
-          another lateral cache.  This will allow the local caches to
-          dictate their own memory usage pattern.  This setting should
-          be run with <code>PutOnlyMode</code> set to false.
+          I added a <code>IssueRemoveOnPut</code> attribute that
+          causes the lateral cache to remove an element from the
+          cache rather than inserting it when a put.  This allows the local caches to
+          dictate their own memory usage pattern. 
         </p>
       </subsection>
     </section>

Modified: jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml?rev=291763&r1=291762&r2=291763&view=diff
==============================================================================
--- jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml (original)
+++ jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml Mon Sep 26 15:01:16 2005
@@ -22,15 +22,6 @@
             <th>Default Value</th>
           </tr>
           <tr>
-            <td>TransmissionTypeName</td>
-            <td>
-              This tells the lateral factory what kind of lateral
-              to create.
-            </td>
-            <td>Y</td>
-            <td>n/a</td>
-          </tr>
-          <tr>
             <td>TcpServers</td>
             <td>
               This is the list of servers this cache should try to connect to.  
@@ -48,11 +39,12 @@
             <td>n/a</td>
           </tr>
           <tr>
-            <td>PutOnlyMode</td>
+            <td>AllowGet</td>
             <td>
-              Should this cache be allowed to get from other laterals.  True means
+              Should this cache be allowed to get from other laterals.  False means
               that it can only put, i.e. send updates and remove requests to other laterals.
-              Lateral gets are not recommended for performance reasons.
+              Lateral gets are not recommended for performance reasons.  This used to be
+              controlled by the attribute PutOnlyMode.
             </td>
             <td>N</td>
             <td>true</td>
@@ -70,6 +62,27 @@
             <td>true</td>
           </tr>    
           <tr>
+            <td>IssueRemoveOnPut</td>
+            <td>
+              If this is set to true, then the lateral client will send a remove command
+              rather than a put command to any registered listeners.
+            </td>
+            <td>N</td>
+            <td>false</td>
+          </tr>   
+          <tr>
+            <td>FilterRemoveByHashCode</td>
+            <td>
+              If this is true, and IssueRemoveOnPut is true, the client
+              will include the hashCode of the element to remove.  If it is also true
+              on the receiving end, the receiver will check to see if the element exists.  
+              If the element exists, and the hashCodes are the same, the item will not be 
+              removed.
+            </td>
+            <td>N</td>
+            <td>false</td>
+          </tr>                    
+          <tr>
             <td>UdpDiscoveryAddr</td>
             <td>
               The address the UDP discovery process should broadcast messages to.
@@ -99,16 +112,17 @@
       
       <subsection name="Example Configuration">
               <source><![CDATA[
-jcs.auxiliary.LTCP=org.apache.jcs.auxiliary.lateral.LateralCacheFactory
-jcs.auxiliary.LTCP.attributes=org.apache.jcs.auxiliary.lateral.LateralCacheAttributes
-jcs.auxiliary.LTCP.attributes.TransmissionTypeName=TCP
+jcs.auxiliary.LTCP=org.apache.jcs.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory
+jcs.auxiliary.LTCP.attributes=org.apache.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes
 #jcs.auxiliary.LTCP.attributes.TcpServers=
 jcs.auxiliary.LTCP.attributes.TcpListenerPort=1118
-jcs.auxiliary.LTCP.attributes.PutOnlyMode=true
-jcs.auxiliary.LTCP.attributes.Receive=true
 jcs.auxiliary.LTCP.attributes.UdpDiscoveryAddr=228.5.6.8
 jcs.auxiliary.LTCP.attributes.UdpDiscoveryPort=6780
 jcs.auxiliary.LTCP.attributes.UdpDiscoveryEnabled=true
+jcs.auxiliary.LTCP.attributes.Receive=true
+jcs.auxiliary.LTCP.attributes.AllowGet=false
+jcs.auxiliary.LTCP.attributes.IssueRemoveOnPut=false
+jcs.auxiliary.LTCP.attributes.FilterRemoveByHashCode=false
         ]]></source>
       </subsection>
       



---------------------------------------------------------------------
To unsubscribe, e-mail: jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jcs-dev-help@jakarta.apache.org