Pull request #10: fix 打包报错

Merge in PG/plugin-decision-batch-role from ~ELIJAH/plugin-decision-batch-role:release/10.0 to release/10.0

* commit '54bfd928b4f22a66989043b66887d1819d5fb78d':
  fix 打包报错

build.xml

@@ -19,7 +19,7 @@
         <delete dir="${classes}"/>
         <delete dir="fr-plugin-${plugin-name}-${plugin-version}"/>
         <xmlproperty file="${basedir}/plugin.xml"/>
-        <delete dir="${destLoc}/${plugin.name}"/>
+        <delete dir="${destLoc}/${plugin-name}"/>
     </target>
     <path id="compile.classpath">
         <fileset dir="${libs}">
@@ -43,7 +43,7 @@
         <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
         <delete dir="tmp"/>
         <copy todir="tmp">
-            <fileset dir="${resources_from}\src">
+            <fileset dir="${resources_from}/src/main/resources">
                 <patternset refid="resources4Jar"/>
             </fileset>
         </copy>
@@ -54,15 +54,17 @@
     </target>
     <target name="compile_javas">
         <echo message="编译${compile_files}下的Java文件"/>
-        <javac destdir="${classes}" debug="false" optimize="on" source="${source_jdk_version}"
+        <javac destdir="${classes}" debug="false" optimize="on" includeantruntime="false" source="${source_jdk_version}" target="${target_jdk_version}" fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}" executable="${compile_jdk_version}/bin/javac">
-               target="${target_jdk_version}"
+            <src path="${basedir}/src/main/java"/>
-               fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
-               executable="${compile_jdk_version}/bin/javac">
-            <src path="${basedir}/src"/>
             <exclude name="**/.svn/**"/>
+            <exclude name="**/.git/**"/>
             <compilerarg line="-encoding UTF8 "/>
             <classpath refid="compile.classpath"/>
         </javac>
+        <taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
+            <classpath refid="compile.classpath"/>
+        </taskdef>
+        <pretreatment baseDir="${basedir}"/>
     </target>
 
     <target name="jar_classes">
@@ -79,8 +81,8 @@
             <param name="resources_from" value="${basedir}"/>
         </antcall>
         <antcall target="compile_javas">
-            <param name="source_jdk_version" value="1.6"/>
+            <param name="source_jdk_version" value="1.7"/>
-            <param name="target_jdk_version" value="1.6"/>
+            <param name="target_jdk_version" value="1.7"/>
             <param name="compile_jdk_version" value="${jdk.home}"/>
             <param name="compile_files" value="${basedir}/src"/>
         </antcall>
@@ -90,8 +92,8 @@
             <param name="jar_name" value="${plugin-jar}"/>
         </antcall>
         <delete dir="${classes}"/>
-
     </target>
+
     <target name="jar" depends="super_jar">
         <antcall target="zip"/>
     </target>
@@ -105,12 +107,14 @@
                 <include name="${plugin-jar}"/>
                 <include name="plugin.xml"/>
             </fileset>
+            <fileset dir="${libs}">
+                <include name="*"/>
+            </fileset>
         </copy>
         <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
             <include name="${plugin-folder}/*.jar"/>
             <include name="${plugin-folder}/plugin.xml"/>
         </zip>
-        <xmlproperty file="${basedir}/plugin.xml"/>
         <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
     </target>
 </project>