13 年前 · 125c4b00bf
--- a/jfinal/.gitignore
+++ b/jfinal/.gitignore
--- a/jfinal/README.md
+++ b/jfinal/README.md
--- a/jfinal/WebRoot/META-INF/MANIFEST.MF
+++ b/jfinal/WebRoot/META-INF/MANIFEST.MF
--- a/jfinal/WebRoot/WEB-INF/lib/1_lib_description.txt
+++ b/jfinal/WebRoot/WEB-INF/lib/1_lib_description.txt
--- a/jfinal/WebRoot/WEB-INF/web.xml
+++ b/jfinal/WebRoot/WEB-INF/web.xml
--- a/jfinal/WebRoot/favicon.ico
+++ b/jfinal/WebRoot/favicon.ico
--- a/jfinal/.classpath
+++ b/jfinal/.classpath
@@ -1,12 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>

			
 
				-<classpath>

			
 
				-	<classpathentry kind="src" path="src"/>

			
 
				-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>

			
 
				-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>

			
 
				-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">

			
 
				-		<attributes>

			
 
				-			<attribute name="owner.project.facets" value="java"/>

			
 
				-		</attributes>

			
 
				-	</classpathentry>

			
 
				-	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>

			
 
				-</classpath>

			
--- a/jfinal/.project
+++ b/jfinal/.project
@@ -1,36 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>

			
 
				-<projectDescription>

			
 
				-	<name>jfinal</name>

			
 
				-	<comment></comment>

			
 
				-	<projects>

			
 
				-	</projects>

			
 
				-	<buildSpec>

			
 
				-		<buildCommand>

			
 
				-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>

			
 
				-			<arguments>

			
 
				-			</arguments>

			
 
				-		</buildCommand>

			
 
				-		<buildCommand>

			
 
				-			<name>org.eclipse.jdt.core.javabuilder</name>

			
 
				-			<arguments>

			
 
				-			</arguments>

			
 
				-		</buildCommand>

			
 
				-		<buildCommand>

			
 
				-			<name>org.eclipse.wst.common.project.facet.core.builder</name>

			
 
				-			<arguments>

			
 
				-			</arguments>

			
 
				-		</buildCommand>

			
 
				-		<buildCommand>

			
 
				-			<name>org.eclipse.wst.validation.validationbuilder</name>

			
 
				-			<arguments>

			
 
				-			</arguments>

			
 
				-		</buildCommand>

			
 
				-	</buildSpec>

			
 
				-	<natures>

			
 
				-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

			
 
				-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

			
 
				-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

			
 
				-		<nature>org.eclipse.jdt.core.javanature</nature>

			
 
				-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>

			
 
				-	</natures>

			
 
				-</projectDescription>

			
--- a/jfinal/.settings/.jsdtscope
+++ b/jfinal/.settings/.jsdtscope
@@ -1,12 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>

			
 
				-<classpath>

			
 
				-	<classpathentry kind="src" path="WebRoot"/>

			
 
				-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>

			
 
				-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">

			
 
				-		<attributes>

			
 
				-			<attribute name="hide" value="true"/>

			
 
				-		</attributes>

			
 
				-	</classpathentry>

			
 
				-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>

			
 
				-	<classpathentry kind="output" path=""/>

			
 
				-</classpath>

			
--- a/jfinal/.settings/org.eclipse.core.resources.prefs
+++ b/jfinal/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +0,0 @@
 
				-#Tue Sep 11 23:24:31 CST 2012

			
 
				-eclipse.preferences.version=1

			
 
				-encoding/<project>=UTF-8

			
--- a/jfinal/.settings/org.eclipse.jdt.core.prefs
+++ b/jfinal/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +0,0 @@
 
				-#Tue Sep 11 23:24:18 CST 2012

			
 
				-eclipse.preferences.version=1

			
 
				-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

			
 
				-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

			
 
				-org.eclipse.jdt.core.compiler.compliance=1.6

			
 
				-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

			
 
				-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

			
 
				-org.eclipse.jdt.core.compiler.source=1.6

			
--- a/jfinal/.settings/org.eclipse.wst.common.component
+++ b/jfinal/.settings/org.eclipse.wst.common.component
@@ -1,9 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>

			
 
				-<project-modules id="moduleCoreId" project-version="1.5.0">

			
 
				-    <wb-module deploy-name="jfinal">

			
 
				-        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>

			
 
				-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>

			
 
				-        <property name="context-root" value="jfinal"/>

			
 
				-        <property name="java-output-path" value="/jfinal/WebRoot/WEB-INF/classes"/>

			
 
				-    </wb-module>

			
 
				-</project-modules>

			
--- a/jfinal/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/jfinal/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,9 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8"?>

			
 
				-<faceted-project>

			
 
				-  <fixed facet="jst.web"/>

			
 
				-  <fixed facet="java"/>

			
 
				-  <fixed facet="wst.jsdt.web"/>

			
 
				-  <installed facet="jst.web" version="2.5"/>

			
 
				-  <installed facet="wst.jsdt.web" version="1.0"/>

			
 
				-  <installed facet="java" version="1.6"/>

			
 
				-</faceted-project>

			
--- a/jfinal/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/jfinal/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -1 +0,0 @@
 
				-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
			
--- a/jfinal/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/jfinal/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -1 +0,0 @@
 
				-Window
			
--- a/jfinal/src/com/jfinal/aop/ActionInvocationWrapper.java
+++ b/jfinal/src/com/jfinal/aop/ActionInvocationWrapper.java
--- a/jfinal/src/com/jfinal/aop/Before.java
+++ b/jfinal/src/com/jfinal/aop/Before.java
--- a/jfinal/src/com/jfinal/aop/ClearInterceptor.java
+++ b/jfinal/src/com/jfinal/aop/ClearInterceptor.java
--- a/jfinal/src/com/jfinal/aop/ClearLayer.java
+++ b/jfinal/src/com/jfinal/aop/ClearLayer.java
--- a/jfinal/src/com/jfinal/aop/Interceptor.java
+++ b/jfinal/src/com/jfinal/aop/Interceptor.java
--- a/jfinal/src/com/jfinal/aop/InterceptorStack.java
+++ b/jfinal/src/com/jfinal/aop/InterceptorStack.java
--- a/jfinal/src/com/jfinal/aop/PrototypeInterceptor.java
+++ b/jfinal/src/com/jfinal/aop/PrototypeInterceptor.java
--- a/jfinal/src/com/jfinal/config/Constants.java
+++ b/jfinal/src/com/jfinal/config/Constants.java
--- a/jfinal/src/com/jfinal/config/Handlers.java
+++ b/jfinal/src/com/jfinal/config/Handlers.java
--- a/jfinal/src/com/jfinal/config/Interceptors.java
+++ b/jfinal/src/com/jfinal/config/Interceptors.java
--- a/jfinal/src/com/jfinal/config/JFinalConfig.java
+++ b/jfinal/src/com/jfinal/config/JFinalConfig.java
--- a/jfinal/src/com/jfinal/config/Plugins.java
+++ b/jfinal/src/com/jfinal/config/Plugins.java
--- a/jfinal/src/com/jfinal/config/Routes.java
+++ b/jfinal/src/com/jfinal/config/Routes.java
--- a/jfinal/src/com/jfinal/core/Action.java
+++ b/jfinal/src/com/jfinal/core/Action.java
--- a/jfinal/src/com/jfinal/core/ActionHandler.java
+++ b/jfinal/src/com/jfinal/core/ActionHandler.java
--- a/jfinal/src/com/jfinal/core/ActionInvocation.java
+++ b/jfinal/src/com/jfinal/core/ActionInvocation.java
--- a/jfinal/src/com/jfinal/core/ActionMapping.java
+++ b/jfinal/src/com/jfinal/core/ActionMapping.java
--- a/jfinal/src/com/jfinal/core/ActionRender.java
+++ b/jfinal/src/com/jfinal/core/ActionRender.java
--- a/jfinal/src/com/jfinal/core/ActionReporter.java
+++ b/jfinal/src/com/jfinal/core/ActionReporter.java
--- a/jfinal/src/com/jfinal/core/Config.java
+++ b/jfinal/src/com/jfinal/core/Config.java
--- a/jfinal/src/com/jfinal/core/Const.java
+++ b/jfinal/src/com/jfinal/core/Const.java
--- a/jfinal/src/com/jfinal/core/Controller.java
+++ b/jfinal/src/com/jfinal/core/Controller.java
--- a/jfinal/src/com/jfinal/core/InterceptorBuilder.java
+++ b/jfinal/src/com/jfinal/core/InterceptorBuilder.java
--- a/jfinal/src/com/jfinal/core/JFinal.java
+++ b/jfinal/src/com/jfinal/core/JFinal.java
--- a/jfinal/src/com/jfinal/core/JFinalFilter.java
+++ b/jfinal/src/com/jfinal/core/JFinalFilter.java
--- a/jfinal/src/com/jfinal/core/ModelInjector.java
+++ b/jfinal/src/com/jfinal/core/ModelInjector.java
--- a/jfinal/src/com/jfinal/core/TypeConverter.java
+++ b/jfinal/src/com/jfinal/core/TypeConverter.java
--- a/jfinal/src/com/jfinal/ext/handler/ContextPathHandler.java
+++ b/jfinal/src/com/jfinal/ext/handler/ContextPathHandler.java
--- a/jfinal/src/com/jfinal/ext/handler/DownloadHandler.java
+++ b/jfinal/src/com/jfinal/ext/handler/DownloadHandler.java
--- a/jfinal/src/com/jfinal/ext/handler/FakeStaticHandler.java
+++ b/jfinal/src/com/jfinal/ext/handler/FakeStaticHandler.java
--- a/jfinal/src/com/jfinal/ext/handler/RoutesHandler.java
+++ b/jfinal/src/com/jfinal/ext/handler/RoutesHandler.java
--- a/jfinal/src/com/jfinal/ext/handler/ServerNameRedirect301Handler.java
+++ b/jfinal/src/com/jfinal/ext/handler/ServerNameRedirect301Handler.java
--- a/jfinal/src/com/jfinal/ext/handler/UrlSkipHandler.java
+++ b/jfinal/src/com/jfinal/ext/handler/UrlSkipHandler.java
--- a/jfinal/src/com/jfinal/ext/interceptor/GET.java
+++ b/jfinal/src/com/jfinal/ext/interceptor/GET.java
--- a/jfinal/src/com/jfinal/ext/interceptor/LogInterceptor.java
+++ b/jfinal/src/com/jfinal/ext/interceptor/LogInterceptor.java
--- a/jfinal/src/com/jfinal/ext/interceptor/NoUrlPara.java
+++ b/jfinal/src/com/jfinal/ext/interceptor/NoUrlPara.java
--- a/jfinal/src/com/jfinal/ext/interceptor/POST.java
+++ b/jfinal/src/com/jfinal/ext/interceptor/POST.java
--- a/jfinal/src/com/jfinal/ext/interceptor/Restful.java
+++ b/jfinal/src/com/jfinal/ext/interceptor/Restful.java
--- a/jfinal/src/com/jfinal/ext/interceptor/SessionInViewInterceptor.java
+++ b/jfinal/src/com/jfinal/ext/interceptor/SessionInViewInterceptor.java
--- a/jfinal/src/com/jfinal/ext/render/CaptchaRender.java
+++ b/jfinal/src/com/jfinal/ext/render/CaptchaRender.java
--- a/jfinal/src/com/jfinal/ext/render/JsonWithContentTypeRender.java
+++ b/jfinal/src/com/jfinal/ext/render/JsonWithContentTypeRender.java
--- a/jfinal/src/com/jfinal/handler/Handler.java
+++ b/jfinal/src/com/jfinal/handler/Handler.java
--- a/jfinal/src/com/jfinal/handler/HandlerFactory.java
+++ b/jfinal/src/com/jfinal/handler/HandlerFactory.java
--- a/jfinal/src/com/jfinal/i18n/I18N.java
+++ b/jfinal/src/com/jfinal/i18n/I18N.java
--- a/jfinal/src/com/jfinal/log/ILoggerFactory.java
+++ b/jfinal/src/com/jfinal/log/ILoggerFactory.java
--- a/jfinal/src/com/jfinal/log/JdkLogger.java
+++ b/jfinal/src/com/jfinal/log/JdkLogger.java
--- a/jfinal/src/com/jfinal/log/JdkLoggerFactory.java
+++ b/jfinal/src/com/jfinal/log/JdkLoggerFactory.java
--- a/jfinal/src/com/jfinal/log/Log4jLogger.java
+++ b/jfinal/src/com/jfinal/log/Log4jLogger.java
--- a/jfinal/src/com/jfinal/log/Log4jLoggerFactory.java
+++ b/jfinal/src/com/jfinal/log/Log4jLoggerFactory.java
--- a/jfinal/src/com/jfinal/log/Logger.java
+++ b/jfinal/src/com/jfinal/log/Logger.java
--- a/jfinal/src/com/jfinal/log/NullLoggerFactory.java
+++ b/jfinal/src/com/jfinal/log/NullLoggerFactory.java
--- a/jfinal/src/com/jfinal/plugin/IPlugin.java
+++ b/jfinal/src/com/jfinal/plugin/IPlugin.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/ActiveRecordException.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/ActiveRecordException.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/ActiveRecordPlugin.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/ActiveRecordPlugin.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/CPI.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/CPI.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/Db.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/Db.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/DbKit.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/DbKit.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/IAtom.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/IAtom.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/ICallback.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/ICallback.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/IDataSourceProvider.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/IDataSourceProvider.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/Model.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/Model.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/ModelBuilder.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/ModelBuilder.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/OneConnectionPerThread.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/OneConnectionPerThread.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/Page.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/Page.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/Record.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/Record.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/RecordBuilder.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/RecordBuilder.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/SqlReporter.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/SqlReporter.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/TableInfo.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/TableInfo.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/TableInfoBuilder.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/TableInfoBuilder.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/TableInfoMapping.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/TableInfoMapping.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/cache/EhCache.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/cache/EhCache.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/cache/ICache.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/cache/ICache.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/dialect/AnsiSqlDialect.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/dialect/AnsiSqlDialect.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/dialect/Dialect.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/dialect/Dialect.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/dialect/MysqlDialect.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/dialect/MysqlDialect.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/dialect/OracleDialect.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/dialect/OracleDialect.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/dialect/PostgreSqlDialect.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/dialect/PostgreSqlDialect.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/dialect/Sqlite3Dialect.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/dialect/Sqlite3Dialect.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/Transaction.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/Transaction.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/Tx.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/Tx.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/TxByActionKeys.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/TxByActionKeys.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/TxByRegex.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/TxByRegex.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/TxReadCommitted.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/TxReadCommitted.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/TxReadUncommitted.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/TxReadUncommitted.java
--- a/jfinal/src/com/jfinal/plugin/activerecord/tx/TxRepeatableRead.java
+++ b/jfinal/src/com/jfinal/plugin/activerecord/tx/TxRepeatableRead.java
		`@@ -1 +0,0 @@`
		`-org.eclipse.wst.jsdt.launching.baseBrowserLibrary`