Merge branch 'master' into release-2.6.0

class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Constant.java

@@ -103,11 +103,6 @@ public interface Constant {
      */
     String POM_XML_ROOT = "META-INF/maven";
     
-    /**
-     * war包下，存放class-winter代码的位置
-     */
-    String CLASS_WINTER_SOURCE_WAR_DIR = "WEB-INF/classes";
-    
     /**
      * 汇总记录项目中那些本身就已经被class-winter混淆了的lib的checklist
      */

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AllTest.java

@@ -18,8 +18,8 @@ import winter.com.ideaaedi.classwinter.util.PathUtil;
 public class AllTest {
     
     public static void main(String[] args) {
-//        xmlTest();
-        otherTest();
+        xmlTest();
+//        otherTest();
     }
     
     /**