Author: jason.greene(a)jboss.com Date: 2008-10-21 18:41:07 -0400 (Tue, 21 Oct 2008) New Revision: 6998 Modified: pojo/tags/2.2.0.GA/src/main/docbook/faq/en/master.xml pojo/tags/2.2.0.GA/src/main/docbook/tutorial/en/master.xml pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/PojoCache.java pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/Reference.java Log: Merge version updates Modified: pojo/tags/2.2.0.GA/src/main/docbook/faq/en/master.xml =================================================================== --- pojo/tags/2.2.0.GA/src/main/docbook/faq/en/master.xml 2008-10-21 22:39:19 UTC (rev 6997) +++ pojo/tags/2.2.0.GA/src/main/docbook/faq/en/master.xml 2008-10-21 22:41:07 UTC (rev 6998) @@ -5,8 +5,8 @@ <article class="faq" lang="en"> <articleinfo> <title>Frequently Asked Questions about POJO Cache</title> - <releaseinfo>Release 2.1.0.GA</releaseinfo> - <pubdate>March 2008</pubdate> + <releaseinfo>Release 2.2.0.GA</releaseinfo> + <pubdate>October 2008</pubdate> <author> <firstname>Ben</firstname> Modified: pojo/tags/2.2.0.GA/src/main/docbook/tutorial/en/master.xml =================================================================== --- pojo/tags/2.2.0.GA/src/main/docbook/tutorial/en/master.xml 2008-10-21 22:39:19 UTC (rev 6997) +++ pojo/tags/2.2.0.GA/src/main/docbook/tutorial/en/master.xml 2008-10-21 22:41:07 UTC (rev 6998) @@ -2,8 +2,8 @@ <article lang="en"> <articleinfo> <title>POJO Cache Tutorial</title> - <releaseinfo>Release 2.1.0</releaseinfo> - <pubdate>March 2008</pubdate> + <releaseinfo>Release 2.2.0</releaseinfo> + <pubdate>October 2008</pubdate> <author> <firstname>Ben</firstname> <surname>Wang</surname> Modified: pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/PojoCache.java =================================================================== --- pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/PojoCache.java 2008-10-21 22:39:19 UTC (rev 6997) +++ pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/PojoCache.java 2008-10-21 22:41:07 UTC (rev 6998) @@ -112,6 +112,7 @@ * of any <code>Serializable</code> types. * </p> * + * @since 2.2 * @param object Any object. * @return <code>Fqn</code> of the internal data node. <code>null</code> if the object is * immediate, serializable, or not in the cache. @@ -133,6 +134,7 @@ * of the field that contains the reference to this object. * </p> * + * @since 2.2 * @param object Any object. * @return Collection of internal references to the given object. Empty collection if the object is * immediate, serializable, or not in the cache. @@ -271,10 +273,10 @@ * @param listener the listener to remove */ void removeListener(Object listener); - + /** * Get's the thread context for all POJO Cache operations. - * + * * @return the current thread's context * @since 2.1 */ Modified: pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/Reference.java =================================================================== --- pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/Reference.java 2008-10-21 22:39:19 UTC (rev 6997) +++ pojo/tags/2.2.0.GA/src/main/java/org/jboss/cache/pojo/Reference.java 2008-10-21 22:41:07 UTC (rev 6998) @@ -29,6 +29,7 @@ * references from other attached objects. * * @author Dan Berindei <dan.berindei(a)gmail.com&gt; + * @since 2.2 */ public interface Reference {