* 改进pom，在开发时使用较高版本的java，发布时使用保守的Java 1.5。

* 除去eclipse警告
webx · Nov 26, 2011 · a642b5c · a642b5c
1 parent 2248723
commit a642b5c
Show file tree

Hide file tree

Showing 6 changed files with 789 additions and 779 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -228,3 +228,5 @@
 
 * 添加方法：navigator.redirectTo(name).withParameter(..).end(); 通过end()方法可以明确结束语句，并发出重定向请求。
 * 所有源码改用UTF-8，符合多数开发环境的默认配置。
+* 改进pom，在开发时使用较高版本的java，发布时使用保守的Java 1.5。
+
diff --git a/common/util/src/main/java/com/alibaba/citrus/util/templatelite/Template.java b/common/util/src/main/java/com/alibaba/citrus/util/templatelite/Template.java
@@ -1766,7 +1766,7 @@ InputSource getRelative(String relativePath) throws Exception {
                 String sourceURI = null;
 
                 if (source instanceof File) {
-                    sourceURI = ((File) source).toURL().toExternalForm();
+                    sourceURI = ((File) source).toURI().toString();
                 } else if (source instanceof URL) {
                     sourceURI = ((URL) source).toExternalForm();
                 }

diff --git a/common/util/src/test/java/com/alibaba/citrus/util/templatelite/AbstractTemplateTests.java b/common/util/src/test/java/com/alibaba/citrus/util/templatelite/AbstractTemplateTests.java
@@ -104,7 +104,7 @@ protected URL copyFile(String src, String dest) throws IOException {
 
         io(new FileInputStream(new File(srcdir, src)), new FileOutputStream(destfile), true, true);
 
-        return destfile.toURL();
+        return destfile.toURI().toURL();
     }
 
     protected URL copyFilesToJar(String destJar, String... srcdest) throws IOException {
@@ -124,7 +124,7 @@ protected URL copyFilesToJar(String destJar, String... srcdest) throws IOExcepti
 
         jos.close();
 
-        return destJarFile.toURL();
+        return destJarFile.toURI().toURL();
     }
 
     protected void acceptFailure(Object visitor) {

diff --git a/common/util/src/test/java/com/alibaba/citrus/util/templatelite/TemplateInputSourceTests.java b/common/util/src/test/java/com/alibaba/citrus/util/templatelite/TemplateInputSourceTests.java
@@ -82,7 +82,7 @@ public void charsetDetection() throws IOException {
 
         // -----------------
         content = repeat("#", 1024 * 4) + "\n";
-        content += " #@charset GB18030\n"; // 超过了readlimit 
+        content += " #@charset GB18030\n"; // 超过了readlimit
 
         assertEquals("default", detectCharset(content));
     }
@@ -100,10 +100,10 @@ public void getRelative_File() throws Exception {
         assertNull(parentSource.getRelative("  "));
 
         inputSource = parentSource.getRelative(" b.txt ");
-        assertEquals(new File("/aa/bb/b.txt").toURL().toExternalForm(), inputSource.systemId);
+        assertEquals(new File("/aa/bb/b.txt").toURI().toURL().toExternalForm(), inputSource.systemId);
 
         inputSource = parentSource.getRelative(" /b.txt ");
-        assertEquals(new File("/aa/bb/b.txt").toURL().toExternalForm(), inputSource.systemId);
+        assertEquals(new File("/aa/bb/b.txt").toURI().toURL().toExternalForm(), inputSource.systemId);
 
         inputSource = parentSource.getRelative(" ../b.txt ");
         assertEquals(new File("/aa/b.txt").toURI().normalize().toURL().toExternalForm(), inputSource.systemId);
@@ -171,8 +171,8 @@ public void getReader() throws IOException {
         assertReader("GBK", f, f.toURI().toString());
 
         // file: url as input source
-        inputSource = new InputSource(f.toURL());
-        assertReader("GBK", f, f.toURL().toExternalForm());
+        inputSource = new InputSource(f.toURI().toURL());
+        assertReader("GBK", f, f.toURI().toURL().toExternalForm());
 
         // url as input source
         URL jarurl = copyFilesToJar("test.jar", "test05_param_gbk.txt", "gbk.txt");

diff --git a/common/util/src/test/java/com/alibaba/citrus/util/templatelite/TemplateParserTests.java b/common/util/src/test/java/com/alibaba/citrus/util/templatelite/TemplateParserTests.java
@@ -939,7 +939,7 @@ public void test08_import_notfound() {
 
     @Test
     public void test08_import_invalid() throws Exception {
-        String importedFile = repeat("../", countMatches(srcdir.toURL().toExternalForm(), "/")) + "../def.htm";
+        String importedFile = repeat("../", countMatches(srcdir.toURI().toURL().toExternalForm(), "/")) + "../def.htm";
         String s = "#@trimming on\n";
         s += "${abc: #abc}\n";
         s += "#abc(" + importedFile + ") ## xxxx";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -228,3 +228,5 @@

		* 添加方法：navigator.redirectTo(name).withParameter(..).end(); 通过end()方法可以明确结束语句，并发出重定向请求。
		* 所有源码改用UTF-8，符合多数开发环境的默认配置。
		* 改进pom，在开发时使用较高版本的java，发布时使用保守的Java 1.5。