弃用ant打包

sagframe · Feb 20, 2018 · 083c61f · 083c61f
1 parent 65168ed
commit 083c61f
Show file tree

Hide file tree

Showing 41 changed files with 12 additions and 78 deletions.
diff --git a/trunk/sagacity-quickvo/.classpath b/trunk/sagacity-quickvo/.classpath
@@ -23,5 +23,10 @@
 	<classpathentry kind="lib" path="lib/dom4j-2.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-api-2.10.0.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-core-2.10.0.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/trunk/sagacity-quickvo/.project b/trunk/sagacity-quickvo/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/trunk/sagacity-quickvo/.settings/org.eclipse.core.resources.prefs b/trunk/sagacity-quickvo/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,4 @@
 eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/trunk/sagacity-quickvo/build-jar.bat b/trunk/sagacity-quickvo/build-jar.bat
diff --git a/trunk/sagacity-quickvo/build.xml b/trunk/sagacity-quickvo/build.xml
diff --git a/trunk/sagacity-quickvo/src/main/resources/META-INF/schema/quickvo.xsd b/trunk/sagacity-quickvo/src/main/resources/META-INF/schema/quickvo.xsd
@@ -111,7 +111,7 @@
 					</xsd:complexType>
 				</xsd:element>
 				<!-- 业务主键策略 -->
-				<xsd:element name="business-primary-key">
+				<xsd:element name="business-primary-key" maxOccurs="1">
 					<xsd:complexType>
 						<xsd:choice maxOccurs="unbounded">
 							<xsd:element name="table">

diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/QuickVOConstants.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/QuickVOConstants.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/QuickVOStart.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/QuickVOStart.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/TaskController.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/TaskController.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/config/XMLConfigLoader.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/config/XMLConfigLoader.class
diff --git a/...acity-quickvo/target/classes/org/sagacity/quickvo/engine/template/TemplateGenerator.class b/...acity-quickvo/target/classes/org/sagacity/quickvo/engine/template/TemplateGenerator.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/BusinessIdConfig.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/BusinessIdConfig.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/CascadeModel.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/CascadeModel.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/ColumnTypeMapping.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/ColumnTypeMapping.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/ConfigModel.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/ConfigModel.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/DataSourceModel.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/DataSourceModel.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/PrimaryKeyStrategy.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/PrimaryKeyStrategy.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/QuickColMeta.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/QuickColMeta.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/QuickModel.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/QuickModel.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/QuickVO.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/QuickVO.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/TableColumnMeta.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/TableColumnMeta.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/TableConstractModel.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/TableConstractModel.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/TableMeta.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/model/TableMeta.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/ClassLoaderUtil.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/ClassLoaderUtil.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$1.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$1.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$10.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$10.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$2.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$2.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$3.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$3.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$4.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$4.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$5.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$5.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$6.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$6.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$7.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$7.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$8.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$8.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$9.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper$9.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBHelper.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBUtil$DbType.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBUtil$DbType.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBUtil$Dialect.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBUtil$Dialect.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBUtil.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/DBUtil.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/FileUtil.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/FileUtil.class
diff --git a/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/StringUtil.class b/trunk/sagacity-quickvo/target/classes/org/sagacity/quickvo/utils/StringUtil.class
diff --git a/...o/target/classes/org/sagacity/quickvo/utils/callback/PreparedStatementResultHandler.class b/...o/target/classes/org/sagacity/quickvo/utils/callback/PreparedStatementResultHandler.class