7:39 p.m.
Author: steve.ebersole(a)jboss.com
Date: 2009-07-07 13:39:21 -0400 (Tue, 07 Jul 2009)
New Revision: 17024
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
Log:
HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache
Modified:
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java
===================================================================
---
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java 2009-07-07
17:36:04 UTC (rev 17023)
+++
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java 2009-07-07
17:39:21 UTC (rev 17024)
@@ -32,13 +32,13 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.Settings;
-import org.hibernate.test.tm.jbc2.BatchModeTransactionManagerLookup;
+import org.hibernate.test.tm.jbc.BatchModeTransactionManagerLookup;
/**
* Utilities for cache testing.
Modified:
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml
===================================================================
---
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml 2009-07-07
17:36:04 UTC (rev 17023)
+++
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml 2009-07-07
17:39:21 UTC (rev 17024)
@@ -146,7 +146,7 @@
<para>As part of its startup process, the region factory delegates
responsibility for providing JBoss Cache instances to an
implementation of the
-
<literal>org.hibernate.cache.jbc2.CacheInstanceManager</literal>
+
<literal>org.hibernate.cache.jbc.CacheInstanceManager</literal>
interface. The region factory separately requests a JBoss Cache
instance for entities, one for collections, one for queries and one
for timestamps. Whether the
<literal>CacheInstanceManager</literal>
Modified:
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml
===================================================================
---
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml 2009-07-07
17:36:04 UTC (rev 17023)
+++
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml 2009-07-07
17:39:21 UTC (rev 17024)
@@ -795,7 +795,7 @@
Provide a set of named JBoss Cache configurations in an XML
file (or just use the default set included in the
<literal>jbc2-configs.xml</literal> file found in the
- <literal>org.hibernate.cache.jbc2.builder</literal>
package
+ <literal>org.hibernate.cache.jbc.builder</literal>
package
in <literal>hibernate-jbosscache2.jar</literal>).
</para>
</listitem>
@@ -871,7 +871,7 @@
Provide a set of named JGroups configurations in an XML file
(or just use the default set included in the
<literal>jgroups-stacks.xml</literal> file found in the
- <literal>org.hibernate.cache.jbc2.builder</literal>
package
+ <literal>org.hibernate.cache.jbc.builder</literal>
package
in the <literal>hibernate-jbosscache2.jar</literal>).
</para>
</listitem>
Modified:
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml
===================================================================
---
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml 2009-07-07
17:36:04 UTC (rev 17023)
+++
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml 2009-07-07
17:39:21 UTC (rev 17024)
@@ -88,8 +88,8 @@
configuration option.
</para>
- <programlisting><![CDATA[hibernate.cache.region.factory_class=
-
org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory]]></programlisting>
+
<programlisting><![CDATA[<![CDATA[hibernate.cache.region.factory_class=
+
org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory]]>]]></programlisting>
<para>
To determine the correct factory class, you must decide
@@ -130,7 +130,7 @@
<variablelist>
<varlistentry>
-
<term><literal>org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory</literal></term>
+
<term><literal>org.hibernate.cache.jbc.SharedJBossCacheRegionFactory</literal></term>
<listitem>
<para>
Instantiates a single JBoss Cache instance for use with all
@@ -139,7 +139,7 @@
</listitem>
</varlistentry>
<varlistentry>
-
<term><literal>org.hibernate.cache.jbc2.JndiSharedJBossCacheRegionFactory</literal></term>
+
<term><literal>org.hibernate.cache.jbc.JndiSharedJBossCacheRegionFactory</literal></term>
<listitem>
<para>
Uses a single JBoss Cache instance for all cache data types.
@@ -151,7 +151,7 @@
</listitem>
</varlistentry>
<varlistentry>
-
<term><literal>org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory</literal></term>
+
<term><literal>org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory</literal></term>
<listitem>
<para>
Supports using multiple JBoss Cache instances with different
@@ -163,7 +163,7 @@
</listitem>
</varlistentry>
<varlistentry>
-
<term><literal>org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory</literal></term>
+
<term><literal>org.hibernate.cache.jbc.JndiMultiplexedJBossCacheRegionFactory</literal></term>
<listitem>
<para>
Functions like
<literal>JndiMultiplexedJBossCacheRegionFactory</literal>,
@@ -342,10 +342,10 @@
just configure the defaults, with query caching enabled:
</para>
- <programlisting><![CDATA[hibernate.cache.use_second_level_cache=true
+
<programlisting><![CDATA[<![CDATA[hibernate.cache.use_second_level_cache=true
hibernate.cache.use_query_cache=true
hibernate.cache.region.factory_class=
-
org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory]]></programlisting>
+
org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory]]>]]></programlisting>
<para>
You would end up using two JBoss Cache instances:
@@ -976,7 +976,7 @@
<para>
The <literal>jgroups-stacks.xml</literal> file found in the
- <literal>org.hibernate.cache.jbc2.builder</literal> package
+ <literal>org.hibernate.cache.jbc.builder</literal> package
in the <literal>hibernate-jbosscache2.jar</literal> provides a good
set of standard JGroups configurations; these should be suitable for
most needs. If you need to create your own configuration set, we
Modified:
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml
===================================================================
---
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml 2009-07-07
17:36:04 UTC (rev 17023)
+++
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml 2009-07-07
17:39:21 UTC (rev 17024)
@@ -98,7 +98,7 @@
is the group communication library used by JBoss Cache for intra-cluster
communication.</para></footnote>, need to be on the classpath. The
<literal>hibernate-jbosscache2.jar</literal> includes standard
- configuration files in the
<literal>org.hibernate.cache.jbc2.builder</literal>
+ configuration files in the
<literal>org.hibernate.cache.jbc.builder</literal>
package. The <literal>jbc2-configs.xml</literal> file is for JBoss
Cache and the <literal>jgroups-stacks.xml</literal> file is for
JGroups.
See <xref linkend="jbc-config"/> and <xref
linkend="jgroups-config"/>
@@ -161,8 +161,8 @@
Second Level Cache implementation:
</para>
- <programlisting><![CDATA[hibernate.cache.region.factory_class=
-
org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory]]></programlisting>
+
<programlisting><![CDATA[<![CDATA[hibernate.cache.region.factory_class=
+
org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory]]>]]></programlisting>
<para>
There are a number of values that can be provided for the
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
===================================================================
---
core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2009-07-07
17:36:04 UTC (rev 17023)
+++
core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2009-07-07
17:39:21 UTC (rev 17024)
@@ -732,7 +732,7 @@
</row>
<row>
<entry>JBoss Cache 2</entry>
-
<entry><literal>org.hibernate.cache.jbc2.JBossCacheRegionFactory</literal></entry>
+
<entry><literal>org.hibernate.cache.jbc.JBossCacheRegionFactory</literal></entry>
<entry>clustered (ip multicast), transactional</entry>
<entry>yes (replication or invalidation)</entry>
<entry>yes (clock sync req.)</entry>