svn commit: r797196 - in /jakarta/jcs/trunk: src/java/org/apache/jcs/utils/config/PropertySetter.java xdocs/LateralTCPProperties.xml xdocs/changes.xml
[email protected] Thu, 23 Jul 2009 19:19:49 -0000
| Newsgroups | gmane.comp.jakarta.turbine.jcs.devel |
|---|---|
| Message-ID | <[email protected]> |
Author: asmuts
Date: Thu Jul 23 19:19:49 2009
New Revision: 797196
URL: http://svn.apache.org/viewvc?rev=797196&view=rev
Log:
fixing JCS-53: default properties should now work. updating change log
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetter.java
jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml
jakarta/jcs/trunk/xdocs/changes.xml
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetter.java
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetter.java?rev=797196&r1=797195&r2=797196&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetter.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetter.java Thu Jul 23 19:19:49 2009
@@ -112,7 +112,7 @@
{
int len = prefix.length();
- for ( Enumeration e = properties.keys(); e.hasMoreElements(); )
+ for ( Enumeration e = properties.propertyNames(); e.hasMoreElements(); )
{
String key = (String) e.nextElement();
Modified: jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml?rev=797196&r1=797195&r2=797196&view=diff
==============================================================================
--- jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml (original)
+++ jakarta/jcs/trunk/xdocs/LateralTCPProperties.xml Thu Jul 23 19:19:49 2009
@@ -1,151 +1,132 @@
<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<document>
- <properties>
- <title>Lateral TCP Auxiliary Cache Configuration</title>
- <author email="[email protected]">Aaron Smuts</author>
- </properties>
-
- <body>
- <section name="Lateral TCP Auxiliary Cache Configuration">
-
- <p>
- The following properties apply to the TCP Lateral Cache plugin.
- </p>
-
- <subsection name="TCP Configuration Properties">
- <table>
- <tr>
- <th>Property</th>
- <th>Description</th>
- <th>Required</th>
- <th>Default Value</th>
- </tr>
- <tr>
- <td>TcpServers</td>
- <td>
- This is the list of servers this cache should try to connect to.
- With UDP discovery this is not necessary.
- </td>
- <td>N</td>
- <td>none</td>
- </tr>
- <tr>
- <td>TcpListenerPort</td>
- <td>
- This is the port this cache should listen on.
- </td>
- <td>Y</td>
- <td>n/a</td>
- </tr>
- <tr>
- <td>AllowGet</td>
- <td>
- 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. This used to be
- controlled by the attribute PutOnlyMode.
- </td>
- <td>N</td>
- <td>true</td>
- </tr>
- <tr>
- <td>Receive</td>
- <td>
- Should this cache receive or only send to other laterals. You may want to
- set receive to false if you just need to broadcast to other caches. If you
- have a feed data parser, that doesn't need to receive updates, but you
- do want it to send invalidation messages, then you would set receive to false.
- If receive is false, the discovery service, if enabled, will only listen.
- </td>
- <td>N</td>
- <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>SocketTimeOut</td>
- <td>
- This allows you to set the socket (read) timeout.
- </td>
- <td>N</td>
- <td>1000</td>
- </tr>
- <tr>
- <td>OpenTimeOut</td>
- <td>
- This allows you to set the socket open timeout.
- </td>
- <td>N</td>
- <td>2000</td>
- </tr>
- <tr>
- <td>UdpDiscoveryAddr</td>
- <td>
- The address the UDP discovery process should broadcast messages to.
- </td>
- <td>N</td>
- <td>228.5.6.7</td>
- </tr>
- <tr>
- <td>UdpDiscoveryPort</td>
- <td>
- The port the UDP discovery process should send messages to.
- </td>
- <td>N</td>
- <td>6789</td>
- </tr>
- <tr>
- <td>UdpDiscoveryEnabled</td>
- <td>
- Whether or not the UDP discovery service should be used to
- locate other lateral caches.
- </td>
- <td>N</td>
- <td>true</td>
- </tr>
- </table>
- </subsection>
-
- <subsection name="Example Configuration">
- <source><![CDATA[
+ <properties>
+ <title>Lateral TCP Auxiliary Cache Configuration</title>
+ <author email="[email protected]">Aaron Smuts</author>
+ </properties>
+ <body>
+ <section name="Lateral TCP Auxiliary Cache Configuration">
+ <p> The following properties apply to the TCP Lateral Cache plugin.
+ </p>
+ <subsection name="TCP Configuration Properties">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Description</th>
+ <th>Required</th>
+ <th>Default Value</th>
+ </tr>
+ <tr>
+ <td>TcpServers</td>
+ <td> This is the list of servers this cache should try to connect
+ to. With UDP discovery this is not necessary.</td>
+ <td>N</td>
+ <td>none</td>
+ </tr>
+ <tr>
+ <td>TcpListenerPort</td>
+ <td> This is the port this cache should listen on.</td>
+ <td>Y</td>
+ <td>n/a</td>
+ </tr>
+ <tr>
+ <td>AllowGet</td>
+ <td> 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. This used to be controlled by the attribute
+ PutOnlyMode.</td>
+ <td>N</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>Receive</td>
+ <td> Should this cache receive or only send to other laterals. You
+ may want to set receive to false if you just need to broadcast to
+ other caches. If you have a feed data parser, that doesn't need
+ to receive updates, but you do want it to send invalidation
+ messages, then you would set receive to false. If receive is
+ false, the discovery service, if enabled, will only listen.</td>
+ <td>N</td>
+ <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>SocketTimeOut</td>
+ <td> This allows you to set the socket (read) timeout.</td>
+ <td>N</td>
+ <td>1000</td>
+ </tr>
+ <tr>
+ <td>OpenTimeOut</td>
+ <td> This allows you to set the socket open timeout.</td>
+ <td>N</td>
+ <td>2000</td>
+ </tr>
+ <tr>
+ <td>UdpDiscoveryAddr</td>
+ <td> The address the UDP discovery process should broadcast
+ messages to.</td>
+ <td>N</td>
+ <td>228.5.6.7</td>
+ </tr>
+ <tr>
+ <td>UdpDiscoveryPort</td>
+ <td> The port the UDP discovery process should send messages to.
+ </td>
+ <td>N</td>
+ <td>6789</td>
+ </tr>
+ <tr>
+ <td>UdpDiscoveryEnabled</td>
+ <td> Whether or not the UDP discovery service should be used to
+ locate other lateral caches.</td>
+ <td>N</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>ZombieQueueMaxSize</td>
+ <td> The number of elements the zombie queue will hold. This queue
+ is used to store events if we lose our connection with the
+ server.</td>
+ <td>N</td>
+ <td>1000</td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="Example Configuration">
+ <source><![CDATA[
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=
@@ -159,9 +140,9 @@
jcs.auxiliary.LTCP.attributes.FilterRemoveByHashCode=false
jcs.auxiliary.LTCP.attributes.SocketTimeoOt=1001
jcs.auxiliary.LTCP.attributes.OpenTimeOut=2002
+jcs.auxiliary.LTCP.attributes.ZombieQueueMaxSize=2000
]]></source>
- </subsection>
-
- </section>
- </body>
-</document>
+ </subsection>
+ </section>
+ </body>
+</document>
\ No newline at end of file
Modified: jakarta/jcs/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/xdocs/changes.xml?rev=797196&r1=797195&r2=797196&view=diff
==============================================================================
--- jakarta/jcs/trunk/xdocs/changes.xml (original)
+++ jakarta/jcs/trunk/xdocs/changes.xml Thu Jul 23 19:19:49 2009
@@ -19,11 +19,19 @@
<author email="[email protected]">Aaron Smuts</author>
</properties>
<body>
- <release version="forthcoming" date="in SVN">
+ <release version="1.3.3.3" date="2009-07-23" description="tempbuild">
+ <action dev="asmuts" type="update">TCP Lateral now uses a queuing
+ zombie service during recovery.</action>
+ <action dev="asmuts" type="update">Refactored UDP Discovery.
+ </action>
<action dev="asmuts" type="fix" issue="JCS-60">Slots for same key
updates now get added to the recycle bin.</action>
- <action dev="asmuts" type="update">Caught Throwable in
- JDBC disk cache shrinker, so it won't die.</action>
+ <action dev="asmuts" type="update" issue="JCS-58">Added File Disk
+ Cache.</action>
+ <action dev="asmuts" type="fix" issue="JCS-53">Default
+ properties should now work.</action>
+ <action dev="asmuts" type="update">Caught Throwable in JDBC disk
+ cache shrinker, so it won't die.</action>
</release>
<release version="1.3.3.2" date="2009-06-11" description="tempbuild">
<action dev="asmuts" type="update">Added a compressing serializer.