Author: cbegin
Date: Sun Aug 2 22:17:57 2009
New Revision: 800150
URL: http://svn.apache.org/viewvc?rev=800150&view=rev
Log:
renamed CacheDomain to CacheNamespace etc.
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespace.java
- copied, changed from r797556,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespaceRef.java
- copied, changed from r797556,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespace.java
(from r797556,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespace.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespace.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java&r1=797556&r2=800150&rev=800150&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespace.java
Sun Aug 2 22:17:57 2009
@@ -10,7 +10,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
-public @interface CacheDomain {
+public @interface CacheNamespace {
public abstract Class<? extends org.apache.ibatis.cache.Cache>
implementation() default PerpetualCache.class;
public abstract Class<? extends org.apache.ibatis.cache.Cache> eviction()
default LruCache.class;
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespaceRef.java
(from r797556,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespaceRef.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespaceRef.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java&r1=797556&r2=800150&rev=800150&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheNamespaceRef.java
Sun Aug 2 22:17:57 2009
@@ -7,6 +7,6 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
-public @interface CacheDomainRef {
+public @interface CacheNamespaceRef {
public abstract Class value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java?rev=800150&r1=800149&r2=800150&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
Sun Aug 2 22:17:57 2009
@@ -52,14 +52,14 @@
}
private void parseCache() {
- CacheDomain cacheDomain = (CacheDomain)
type.getAnnotation(CacheDomain.class);
+ CacheNamespace cacheDomain = (CacheNamespace)
type.getAnnotation(CacheNamespace.class);
if (cacheDomain != null) {
assistant.useNewCache(cacheDomain.implementation(),
cacheDomain.eviction(), cacheDomain.flushInterval(), cacheDomain.size(),
!cacheDomain.readWrite(), null);
}
}
private void parseCacheRef() {
- CacheDomainRef cacheDomainRef = (CacheDomainRef)
type.getAnnotation(CacheDomainRef.class);
+ CacheNamespaceRef cacheDomainRef = (CacheNamespaceRef)
type.getAnnotation(CacheNamespaceRef.class);
if (cacheDomainRef != null) {
assistant.useCacheRef(cacheDomainRef.value().getName());
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java?rev=800150&r1=800149&r2=800150&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
Sun Aug 2 22:17:57 2009
@@ -5,7 +5,7 @@
import java.util.*;
-...@cachedomain
+...@cachenamespace
public interface BoundBlogMapper {
//======================================================
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java?rev=800150&r1=800149&r2=800150&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/IbatisConfig.java
Sun Aug 2 22:17:57 2009
@@ -3,6 +3,7 @@
import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
@@ -28,7 +29,7 @@
configuration.getTypeAliasRegistry().registerAlias(Author.class);
configuration.addMapper(BoundBlogMapper.class);
configuration.addMapper(BoundAuthorMapper.class);
- return new DefaultSqlSessionFactory(configuration);
+ return new SqlSessionFactoryBuilder().build(configuration);
} catch (Exception e) {
throw new RuntimeException("Error initializing SqlSessionFactory. Cause:
" + e, e);
}
