JFinal 2.0 release ^_^

.classpath

@@ -16,3 +16,5 @@
 </classpath>
 
 
+
+

.project

@@ -40,5 +40,3 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
-
-

.settings/org.eclipse.jdt.core.prefs

@@ -10,3 +10,5 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.6
+
+

README.rst

@@ -18,7 +18,7 @@ JFinal有如下主要特点
 #. 功能齐全，拥有struts2的绝大部分功能
 #. 体积小仅218K，且无第三方依赖
 
-**JFinal 极速开发QQ群欢迎您的加入: 335699801、38707273**
+**JFinal 极速开发QQ群欢迎您的加入: 335699801、326297041、424949661、38707273**
 
 **以下是JFinal实现Blog管理的示例：**
 
@@ -81,10 +81,10 @@ Blog()这行代码也不是必须)**
 ::
    
     public class BlogInterceptor implements Interceptor {
-        public void intercept(ActionInvocation ai) {
-            System.out.println("Before invoking " + ai.getActionKey());
-            ai.invoke();
-            System.out.println("After invoking " + ai.getActionKey());
+        public void intercept(Invocation inv) {
+            System.out.println("Before invoking " + inv.getActionKey());
+            inv.invoke();
+            System.out.println("After invoking " + inv.getActionKey());
         }
     }
 

pom.xml

@@ -123,14 +123,19 @@
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
 			<version>3.1</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
 			<version>2.7.2</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>de.ruedigermoeller</groupId>
+			<artifactId>fst</artifactId>
+			<version>2.29</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<!--
 		<dependency>

src/com/jfinal/aop/Before.java

@@ -23,11 +23,13 @@
 import java.lang.annotation.Target;
 
 /**
- * Before is used to configure Interceptor or Validator.
+ * Before is used to configure Interceptor and Validator.
  */
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
 public @interface Before {
 	Class<? extends Interceptor>[] value();
 }
+
+

src/com/jfinal/aop/Callback.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2011-2015, James Zhan 詹波 ([email protected]).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jfinal.aop;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+import static com.jfinal.aop.InterceptorBuilder.NULL_INTERS;
+
+/**
+ * Callback.
+ */
+class Callback implements MethodInterceptor {
+
+	private Object injectTarget = null;
+	private final Interceptor[] injectInters;
+
+	private static final Set<String> excludedMethodName = buildExcludedMethodName();
+
+	public Callback() {
+		this.injectInters = NULL_INTERS;
+	}
+
+	public Callback(Interceptor... injectInters) {
+		if (injectInters == null)
+			throw new IllegalArgumentException("injectInters can not be null.");
+		this.injectInters = injectInters;
+	}
+
+	public Callback(Object injectTarget, Interceptor... injectInters) {
+		if (injectTarget == null)
+			throw new IllegalArgumentException("injectTarget can not be null.");
+		if (injectInters == null)
+			throw new IllegalArgumentException("injectInters can not be null.");
+		this.injectTarget = injectTarget;
+		this.injectInters = injectInters;
+	}
+
+	public Object intercept(Object target, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
+		if (excludedMethodName.contains(method.getName())) {
+			if (method.getName().equals("finalize"))
+				return methodProxy.invokeSuper(target, args);
+			return this.injectTarget != null ? methodProxy.invoke(this.injectTarget, args) : methodProxy.invokeSuper(target, args);
+		}
+
+		if (this.injectTarget != null) {
+			target = this.injectTarget;
+			Interceptor[] finalInters = InterceptorBuilder.build(injectInters, target.getClass(), method);
+			Invocation invocation = new Invocation(target, method, args, methodProxy, finalInters);
+			invocation.useInjectTarget = true;
+			invocation.invoke();
+			return invocation.getReturnValue();
+		}
+		else {
+			Interceptor[] finalInters = InterceptorBuilder.build(injectInters, target.getClass(), method);
+			Invocation invocation = new Invocation(target, method, args, methodProxy, finalInters);
+			invocation.useInjectTarget = false;
+			invocation.invoke();
+			return invocation.getReturnValue();
+		}
+	}
+
+	private static final Set<String> buildExcludedMethodName() {
+		Set<String> excludedMethodName = new HashSet<String>();
+		Method[] methods = Object.class.getDeclaredMethods();
+		for (Method m : methods)
+			excludedMethodName.add(m.getName());
+
+		// getClass() registerNatives() can not be enhanced
+		// excludedMethodName.remove("getClass");	
+		// excludedMethodName.remove("registerNatives");
+		return excludedMethodName;
+	}
+}
+
+

src/com/jfinal/aop/ClearInterceptor.java → src/com/jfinal/aop/Clear.java

@@ -23,16 +23,26 @@
 import java.lang.annotation.Target;
 
 /**
- * ClearInterceptor is used to clear interceptors of different level.
- * It clear the upper layer interceptors by default and clear 
- * all layers with parameter ClearLayer.ALL
+ * Clear is used to clear all interceptors or the specified interceptors,
+ * it can not clear the interceptor which declare on method.
+ * 
+ * <pre>
+ * Example:
+ * 1: clear all interceptors but InterA and InterB will be kept, because InterA and InterB declare on method
+ * @Clear
+ * @Before({InterA.class, InterB.class})
+ * public void method(...)
+ * 
+ * 2: clear InterA and InterB, InterC and InterD will be kept
+ * @Clear({InterA.class, InterB.class})
+ * @Before({InterC.class, InterD.class})
+ * public void method(...)
+ * </pre>
  */
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-public @interface ClearInterceptor {
-	ClearLayer value() default ClearLayer.UPPER;
+@Target({ElementType.METHOD})
+public @interface Clear {
+	Class<? extends Interceptor>[] value() default {};
 }
 
-
-