Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[HHH-4475] Fix resource locations to reflect repackaging 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17633 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Brian Stansberry 2009-10-06 18:15:30 +00:00
parent dbcf806b7e
commit 06491edd23
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java vendored
View File

@ -104,12 +104,12 @@ public class MultiplexingCacheInstanceManager implements CacheInstanceManager {
* Default value for {@link #CACHE_FACTORY_RESOURCE_PROP}. Specifies * Default value for {@link #CACHE_FACTORY_RESOURCE_PROP}. Specifies
* the "jbc2-configs.xml" file in this package. * the "jbc2-configs.xml" file in this package.
*/ */
public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc2/builder/jbc2-configs.xml"; public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc-configs.xml";
/** /**
* Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies * Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies
* the "jgroups-stacks.xml" file in this package. * the "jgroups-stacks.xml" file in this package.
*/ */
public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml"; public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
/** /**
* Default value for {@link #ENTITY_CACHE_RESOURCE_PROP}. * Default value for {@link #ENTITY_CACHE_RESOURCE_PROP}.
*/ */

2
cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java vendored
View File

@ -79,7 +79,7 @@ public class SharedCacheInstanceManager implements CacheInstanceManager {
* Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies * Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies
* the "jgroups-stacks.xml" file in this package. * the "jgroups-stacks.xml" file in this package.
*/ */
public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml"; public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
private Cache cache; private Cache cache;
private ChannelFactory channelFactory; private ChannelFactory channelFactory;

0
cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc2-configs.xml → cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml vendored
View File

8
cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java → cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java vendored
View File

@ -33,7 +33,7 @@ import org.jboss.cache.CacheManager;
* @author <a href="brian.stansberry@jboss.com">Brian Stansberry</a> * @author <a href="brian.stansberry@jboss.com">Brian Stansberry</a>
* @version $Revision: 1 $ * @version $Revision: 1 $
*/ */
public class Jbc2ConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase public class JbcConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
{ {
private static final AtomicReference<CacheManager> cacheManagerRef = new AtomicReference<CacheManager>(); private static final AtomicReference<CacheManager> cacheManagerRef = new AtomicReference<CacheManager>();
@ -57,17 +57,17 @@ public class Jbc2ConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
private Cache cache; private Cache cache;
/** /**
* Create a new Jbc2ConfigsXmlValidityTestCase. * Create a new JbcConfigsXmlValidityTestCase.
* *
* @param name * @param name
*/ */
public Jbc2ConfigsXmlValidityTestCase(String name) public JbcConfigsXmlValidityTestCase(String name)
{ {
super(name); super(name);
} }
public static Test suite() throws Exception { public static Test suite() throws Exception {
TestSuite suite = new TestSuite(Jbc2ConfigsXmlValidityTestCase.class); TestSuite suite = new TestSuite(JbcConfigsXmlValidityTestCase.class);
return new CacheManagerTestSetup(suite, cacheManagerRef); return new CacheManagerTestSetup(suite, cacheManagerRef);
} }

5
cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java vendored
View File

@ -18,6 +18,7 @@ package org.hibernate.test.cache.jbc.functional.util;
import junit.framework.Test; import junit.framework.Test;
import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
import org.hibernate.test.util.SelectedClassnameClassLoader; import org.hibernate.test.util.SelectedClassnameClassLoader;
import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup; import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup;
@ -31,8 +32,8 @@ import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup;
public class IsolatedCacheTestSetup extends SelectedClassnameClassLoaderTestSetup public class IsolatedCacheTestSetup extends SelectedClassnameClassLoaderTestSetup
{ {
public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc2-configs.xml"; public static final String DEF_CACHE_FACTORY_RESOURCE = MultiplexingCacheInstanceManager.DEF_CACHE_FACTORY_RESOURCE;
public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml"; public static final String DEF_JGROUPS_RESOURCE = MultiplexingCacheInstanceManager.DEF_JGROUPS_RESOURCE;
private String[] isolatedClasses; private String[] isolatedClasses;
private String cacheConfig; private String cacheConfig;

5
cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
View File

@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicReference;
import junit.extensions.TestSetup; import junit.extensions.TestSetup;
import junit.framework.Test; import junit.framework.Test;
import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
import org.jboss.cache.CacheManager; import org.jboss.cache.CacheManager;
import org.jboss.cache.CacheManagerImpl; import org.jboss.cache.CacheManagerImpl;
import org.jgroups.ChannelFactory; import org.jgroups.ChannelFactory;
@ -36,8 +37,8 @@ import org.jgroups.JChannelFactory;
*/ */
public class CacheManagerTestSetup extends TestSetup public class CacheManagerTestSetup extends TestSetup
{ {
public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc2-configs.xml"; public static final String DEF_CACHE_FACTORY_RESOURCE = MultiplexingCacheInstanceManager.DEF_CACHE_FACTORY_RESOURCE;
public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml"; public static final String DEF_JGROUPS_RESOURCE = MultiplexingCacheInstanceManager.DEF_JGROUPS_RESOURCE;
private final String jbcConfig; private final String jbcConfig;
private final String jgConfig; private final String jgConfig;