[infinispan-commits] Infinispan SVN: r1840 - trunk/demos/ec2/src/main/java/org/infinispan/ec2demo.

[infinispan-commits at lists.jboss.org]

Author: noelo
Date: 2010-05-25 07:19:13 -0400 (Tue, 25 May 2010)
New Revision: 1840

Modified:
   trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
Log:
Cache config done by file rather than by code


Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java	2010-05-25 11:18:24 UTC (rev 1839)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java	2010-05-25 11:19:13 UTC (rev 1840)
@@ -3,17 +3,13 @@
  */
 package org.infinispan.ec2demo;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
+import java.io.IOException;
+
 import org.infinispan.manager.CacheManager;
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
-import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
-import java.io.IOException;
-import java.util.Properties;
 
 /**
  * @author noconnor at redhat.com
@@ -23,35 +19,14 @@
 	private static final Log myLogger = LogFactory.getLog(CacheBuilder.class);
 
 	public CacheBuilder(String inConfigFile) throws IOException {
-		//system property gets priority
-		String configFile = System.getProperty("EC2Demo-jgroups-config");		
-
-		if ((configFile==null)||(configFile.isEmpty()))
-			configFile = inConfigFile;
 		
-		if ((configFile==null)||(configFile.isEmpty()))
+		if ((inConfigFile==null)||(inConfigFile.isEmpty()))
 			throw new RuntimeException(
-					"Need to either set system property EC2Demo-jgroups-config to point to the jgroups configuration file or pass in the the location of the jgroups configuration file");
+					"Infinispan configuration file not found-->"+inConfigFile);
 
-		System.out.println("CacheBuilder called with "+configFile);
+		System.out.println("CacheBuilder called with "+inConfigFile);
 		
-		GlobalConfiguration gc = GlobalConfiguration.getClusteredDefault();
-		gc.setClusterName("infinispan-demo-cluster");
-		gc.setTransportClass(JGroupsTransport.class.getName());
-		Properties p = new Properties();
-		p.setProperty("configurationFile", configFile);
-		gc.setTransportProperties(p);
-
-		Configuration c = new Configuration();
-		c.setCacheMode(Configuration.CacheMode.DIST_SYNC);
-		c.setExposeJmxStatistics(true);
-		c.setUnsafeUnreliableReturnValues(true);
-		c.setNumOwners(3);
-		c.setL1CacheEnabled(true);
-		c.setInvocationBatchingEnabled(true);
-		c.setUseReplQueue(true);
-		c.setL1Lifespan(6000000);
-		cache_manager = new DefaultCacheManager(gc, c, false);
+		cache_manager = new DefaultCacheManager(inConfigFile, false);
 		//ShutdownHook shutdownHook = new ShutdownHook(cache_manager);
 		//Runtime.getRuntime().addShutdownHook(shutdownHook);
 	}