bodewig 2002/10/31 06:21:52
Modified: src/main/org/apache/tools/ant/taskdefs/optional Tag:
ANT_15_BRANCH TraXLiaison.java
src/main/org/apache/tools/ant/util Tag: ANT_15_BRANCH
JAXPUtils.java
src/testcases/org/apache/tools/ant/taskdefs/optional Tag:
ANT_15_BRANCH TraXLiaisonTest.java
Log:
re-add protected method for backwards compatibility
Revision Changes Path
No revision
No revision
1.17.2.4 +9 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
Index: TraXLiaison.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -r1.17.2.3 -r1.17.2.4
--- TraXLiaison.java 30 Oct 2002 10:38:47 -0000 1.17.2.3
+++ TraXLiaison.java 31 Oct 2002 14:21:51 -0000 1.17.2.4
@@ -107,7 +107,7 @@
private Transformer transformer = null;
private XSLTLogger logger;
-
+
/** possible resolver for publicIds */
private EntityResolver entityResolver;
@@ -273,4 +273,12 @@
uriResolver = aResolver;
}
+ // kept for backwards compatibility
+ /**
+ * @deprecated use org.apache.tools.ant.util.JAXPUtils#getSystemId
instead
+ */
+ protected String getSystemId(File file) {
+ return JAXPUtils.getSystemId(file);
+ }
+
} //-- TraXLiaison
No revision
No revision
1.1.2.2 +0 -1
jakarta-ant/src/main/org/apache/tools/ant/util/JAXPUtils.java
Index: JAXPUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/JAXPUtils.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JAXPUtils.java 30 Oct 2002 10:38:46 -0000 1.1.2.1
+++ JAXPUtils.java 31 Oct 2002 14:21:51 -0000 1.1.2.2
@@ -208,5 +208,4 @@
}
}
-
}
No revision
No revision
1.9.2.2 +12 -0
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
Index: TraXLiaisonTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- TraXLiaisonTest.java 30 Oct 2002 10:38:47 -0000 1.9.2.1
+++ TraXLiaisonTest.java 31 Oct 2002 14:21:51 -0000 1.9.2.2
@@ -118,6 +118,18 @@
}
}
+ public void testSystemId(){
+ File file = null;
+ if ( File.separatorChar == '\\' ){
+ file = new File("d:\\jdk");
+ } else {
+ file = new File("/user/local/bin");
+ }
+ String systemid = ((TraXLiaison)liaison).getSystemId(file);
+ assertTrue("SystemIDs should start by file:///",
systemid.startsWith("file:///"));
+ assertTrue("SystemIDs should not start with file:////",
!systemid.startsWith("file:////"));
+ }
+
public void log(String message) {
throw new AssertionFailedError("Liaison sent message: "+message);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
