You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/13 19:14:01 UTC
cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant CactifyWarTask.java WebXmlMergeTask.java
cmlenz 2003/05/13 10:14:01
Modified: integration/ant/src/java/org/apache/cactus/integration/ant/webxml
WebXmlIo.java
integration/ant/src/java/org/apache/cactus/integration/ant
CactifyWarTask.java WebXmlMergeTask.java
Log:
Use more explicit method naming
Revision Changes Path
1.5 +3 -3 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/webxml/WebXmlIo.java
Index: WebXmlIo.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/webxml/WebXmlIo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebXmlIo.java 13 May 2003 16:59:18 -0000 1.4
+++ WebXmlIo.java 13 May 2003 17:14:01 -0000 1.5
@@ -224,8 +224,8 @@
* configured
* @throws IOException If an I/O error occurs
*/
- public static WebXml parseWebXml(File theFile,
- EntityResolver theEntityResolver)
+ public static WebXml parseWebXmlFromFile(File theFile,
+ EntityResolver theEntityResolver)
throws SAXException, ParserConfigurationException, IOException
{
InputStream in = null;
1.5 +2 -2 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java
Index: CactifyWarTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CactifyWarTask.java 13 May 2003 16:58:24 -0000 1.4
+++ CactifyWarTask.java 13 May 2003 17:14:01 -0000 1.5
@@ -448,7 +448,7 @@
try
{
WebXml parsedMergeWebXml =
- WebXmlIo.parseWebXml(this.mergeWebXml, this.xmlCatalog);
+ WebXmlIo.parseWebXmlFromFile(this.mergeWebXml, this.xmlCatalog);
merger = new WebXmlMerger(theWebXml);
merger.setLog(new AntLog(this));
merger.merge(parsedMergeWebXml);
1.14 +3 -3 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java
Index: WebXmlMergeTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebXmlMergeTask.java 12 May 2003 09:01:58 -0000 1.13
+++ WebXmlMergeTask.java 13 May 2003 17:14:01 -0000 1.14
@@ -151,9 +151,9 @@
|| (mergeFile.lastModified() > destFile.lastModified()))
{
WebXml srcWebXml =
- WebXmlIo.parseWebXml(this.srcFile, this.xmlCatalog);
+ WebXmlIo.parseWebXmlFromFile(this.srcFile, this.xmlCatalog);
WebXml mergeWebXml =
- WebXmlIo.parseWebXml(this.mergeFile, this.xmlCatalog);
+ WebXmlIo.parseWebXmlFromFile(this.mergeFile, this.xmlCatalog);
WebXmlMerger merger = new WebXmlMerger(srcWebXml);
merger.setLog(new AntLog(this));
merger.merge(mergeWebXml);
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org