Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to 6.5 GA gemfire .jar

Browse Source
This commit is contained in:
Mark Pollack
2010-10-13 11:08:45 -04:00
parent 1f2f5171ef
commit 9966894e6f
12 changed files with 128 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
View File

@@ -36,7 +36,7 @@ import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.query.CqInvalidException;
// /* TODO Check 6.0 and 6.5 compatibility import com.gemstone.gemfire.cache.query.CqInvalidException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -142,9 +142,10 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
if (ex instanceof IndexInvalidException) {
return GemfireCacheUtils.convertGemfireAccessException((IndexInvalidException) ex);
}
/* TODO Add back some mapping to be compatible with 6.0 and 6.0
if (ex instanceof CqInvalidException) {
return GemfireCacheUtils.convertGemfireAccessException((CqInvalidException) ex);
}
}*/
if (ex instanceof QueryInvalidException) {
return GemfireCacheUtils.convertGemfireAccessException((QueryInvalidException) ex);
}

5
src/main/java/org/springframework/data/gemfire/GemfireAccessor.java
View File

@@ -24,7 +24,7 @@ import org.springframework.dao.DataAccessException;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.query.CqInvalidException;
// TODO Check 6.0 and 6.5 compatibility import com.gemstone.gemfire.cache.query.CqInvalidException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
@@ -81,9 +81,10 @@ public class GemfireAccessor implements InitializingBean {
* @return the corresponding DataAccessException instance
*/
public DataAccessException convertGemFireQueryException(RuntimeException ex) {
/* TODO Check 6.0 and 6.5 compatibility
if (ex instanceof CqInvalidException) {
return GemfireCacheUtils.convertGemfireAccessException((CqInvalidException) ex);
}
}*/
if (ex instanceof IndexInvalidException) {
return GemfireCacheUtils.convertGemfireAccessException((IndexInvalidException) ex);

9
src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java
View File

@@ -72,7 +72,7 @@ import com.gemstone.gemfire.cache.VersionException;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.query.CqClosedException;
import com.gemstone.gemfire.cache.query.CqInvalidException;
// TODO Check 6.0 and 6.5 compatibility import com.gemstone.gemfire.cache.query.CqInvalidException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.QueryException;
@@ -257,11 +257,11 @@ public abstract class GemfireCacheUtils {
if (ex instanceof QueryInvalidException) {
return convertGemfireAccessException((QueryInvalidException) ex);
}
/* TODO Check 6.0 and 6.5 compatibility
if (ex instanceof CqInvalidException) {
return convertGemfireAccessException((CqInvalidException) ex);
}
*/
return null;
}
@@ -325,7 +325,8 @@ public abstract class GemfireCacheUtils {
* @param ex Gemfire unchecked exception
* @return new the corresponding DataAccessException instance
*/
/* TODO Check 6.0 and 6.5 compatibility
public static DataAccessException convertGemfireAccessException(CqInvalidException ex) {
return new GemfireQueryException(ex);
}
}*/
}

5
src/main/java/org/springframework/data/gemfire/GemfireQueryException.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.gemfire;
import org.springframework.dao.InvalidDataAccessResourceUsageException;
import com.gemstone.gemfire.cache.query.CqInvalidException;
//TODO Check 6.0 and 6.5 compatibility import com.gemstone.gemfire.cache.query.CqInvalidException;
import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
@@ -43,7 +43,8 @@ public class GemfireQueryException extends InvalidDataAccessResourceUsageExcepti
super(ex.getMessage(), ex);
}
/* TODO Check 6.0 and 6.5 compatibility
public GemfireQueryException(CqInvalidException ex) {
super(ex.getMessage(), ex);
}
}*/
}

4
src/main/java/org/springframework/data/gemfire/GemfireTemplate.java
View File

@@ -28,7 +28,7 @@ import org.springframework.util.ClassUtils;
import com.gemstone.gemfire.GemFireCheckedException;
import com.gemstone.gemfire.GemFireException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.query.CqInvalidException;
//TODO Check 6.0 and 6.5 compatibility import com.gemstone.gemfire.cache.query.CqInvalidException;
import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
import com.gemstone.gemfire.cache.query.SelectResults;
@@ -119,8 +119,10 @@ public class GemfireTemplate extends GemfireAccessor {
return result;
} catch (IndexInvalidException ex) {
throw convertGemFireQueryException(ex);
/* TODO Check 6.0 and 6.5 compatibility
} catch (CqInvalidException ex) {
throw convertGemFireQueryException(ex);
*/
} catch (QueryInvalidException ex) {
throw convertGemFireQueryException(ex);
} catch (GemFireCheckedException ex) {