[hibernate-commits] Hibernate SVN: r12751 - in shards/trunk/src: java/org/hibernate/shards/cfg and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: max.ross
Date: 2007-07-11 02:43:23 -0400 (Wed, 11 Jul 2007)
New Revision: 12751

Modified:
   shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java
   shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java
   shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java
   shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java
Log:
HSHARDS-38
Allow cache region prefix to vary across shards.

Modified: shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java	2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java	2007-07-11 06:43:23 UTC (rev 12751)
@@ -229,6 +229,7 @@
     safeSet(prototypeConfiguration, Environment.PASS, config.getShardPassword());
     safeSet(prototypeConfiguration, Environment.URL, config.getShardUrl());
     safeSet(prototypeConfiguration, Environment.DATASOURCE, config.getShardDatasource());
+    safeSet(prototypeConfiguration, Environment.CACHE_REGION_PREFIX, config.getShardCacheRegionPrefix());
     safeSet(prototypeConfiguration, Environment.SESSION_FACTORY_NAME, config.getShardSessionFactoryName());
     safeSet(prototypeConfiguration, ShardedEnvironment.SHARD_ID_PROPERTY, config.getShardId().toString());
   }

Modified: shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java	2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java	2007-07-11 06:43:23 UTC (rev 12751)
@@ -56,4 +56,8 @@
   public String getShardDatasource() {
     return config.getProperty(Environment.DATASOURCE);
   }
+
+  public String getShardCacheRegionPrefix() {
+    return config.getProperty(Environment.CACHE_REGION_PREFIX);
+  }
 }

Modified: shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java	2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java	2007-07-11 06:43:23 UTC (rev 12751)
@@ -59,4 +59,10 @@
    * @return the datasource for the shard
    */
   String getShardDatasource();
+
+  /**
+   * @see org.hibernate.cfg.Environment#CACHE_REGION_PREFIX
+   * @return the cache region prefix for the shard
+   */
+  String getShardCacheRegionPrefix();
 }

Modified: shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java	2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java	2007-07-11 06:43:23 UTC (rev 12751)
@@ -54,7 +54,7 @@
     shardStrategyFactory = new MyShardStrategyFactory();
     Configuration protoConfig = new Configuration();
     protoConfig.setProperty(Environment.DIALECT, HSQLDialect.class.getName());
-    shardConfig = new MyShardConfig("user", "url", "pwd", "sfname", 33);
+    shardConfig = new MyShardConfig("user", "url", "pwd", "sfname", "prefix", 33);
 
     shardedConfiguration =
         new ShardedConfiguration(
@@ -90,7 +90,8 @@
   }
 
   public void testShardIdRequired() {
-    ShardConfiguration config = new MyShardConfig("user", "url", "pwd", "sfname", null);
+    ShardConfiguration config =
+        new MyShardConfig("user", "url", "pwd", "sfname", null, null);
     try {
       shardedConfiguration.populatePrototypeWithVariableProperties(config);
       fail("expected npe");
@@ -132,14 +133,16 @@
     private final String url;
     private final String password;
     private final String sessionFactoryName;
+    private final String cacheRegionPrefix;
     private final Integer shardId;
 
     public MyShardConfig(String user, String url, String password,
-        String sessionFactoryName, Integer shardId) {
+        String sessionFactoryName, String cacheRegionPrefix, Integer shardId) {
       this.user = user;
       this.url = url;
       this.password = password;
       this.sessionFactoryName = sessionFactoryName;
+      this.cacheRegionPrefix = cacheRegionPrefix;
       this.shardId = shardId;
     }
 
@@ -166,5 +169,9 @@
     public String getShardDatasource() {
       return null;
     }
+
+    public String getShardCacheRegionPrefix() {
+      return cacheRegionPrefix;
+    }
   }
 }

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java	2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java	2007-07-11 06:43:23 UTC (rev 12751)
@@ -47,5 +47,9 @@
   public String getShardDatasource() {
     throw new UnsupportedOperationException();
   }
+
+  public String getShardCacheRegionPrefix() {
+    throw new UnsupportedOperationException();
+  }
 }