jefft 02/01/04 21:34:50 Modified: latka build.xml latka/src/java/org/apache/commons/latka/junit JUnitTestAdapter.java latka/src/java/org/apache/commons/latka/xml FindVariablesHandler.java XMLPreprocessor.java Log: - Minor source fixes so javadocs build cleanly - Rename and deprecate a misspelt class - Tab cleanups Revision Changes Path 1.12 +11 -11 jakarta-commons/latka/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/latka/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.xml 17 Oct 2001 15:35:45 -0000 1.11 +++ build.xml 5 Jan 2002 05:34:50 -0000 1.12 @@ -1,4 +1,4 @@ -<!-- $Id: build.xml,v 1.11 2001/10/17 15:35:45 morgand Exp $ --> +<!-- $Id: build.xml,v 1.12 2002/01/05 05:34:50 jefft Exp $ --> <project name="commons-latka" default="test" basedir="."> <!-- patternset describing files to be copied from the doc directory --> @@ -148,7 +148,7 @@ windowtitle="${Name-Long}" doctitle="${Name-Long}" bottom="<small>Copyright &copy; 2001 Apache Software Foundation. Documenation generated ${TODAY}</small>." - public="true" + protected="true" version="true" author="true" splitindex="false" @@ -195,16 +195,16 @@ <target name="test" depends="build-test" if="test.entry" description="runs (junit) unit tests"> <!-- <junit printsummary="yes" fork="on" haltonfailure="yes"> - <formatter type="plain" usefile="false"/> - <test name="${test.entry}"/> - <classpath> - <pathelement location="${dest.classes}" /> - <pathelement path="${classpath}" /> - <pathelement path="${java.class.path}" /> - </classpath> + <formatter type="plain" usefile="false"/> + <test name="${test.entry}"/> + <classpath> + <pathelement location="${dest.classes}" /> + <pathelement path="${classpath}" /> + <pathelement path="${java.class.path}" /> + </classpath> </junit> --> - + <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> <arg value="${test.entry}"/> <classpath> @@ -235,4 +235,4 @@ <!-- ######################################################### --> -</project> \ No newline at end of file +</project> 1.5 +2 -2 jakarta-commons/latka/src/java/org/apache/commons/latka/junit/JUnitTestAdapter.java Index: JUnitTestAdapter.java =================================================================== RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/junit/JUnitTestAdapter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JUnitTestAdapter.java 25 Oct 2001 20:31:00 -0000 1.4 +++ JUnitTestAdapter.java 5 Jan 2002 05:34:50 -0000 1.5 @@ -91,7 +91,7 @@ * A JUnit {@link junit.framework.Test Test} which is created by * wrapping a Latka {@link org.apache.commons.latka.Suite Suite} * @author Chuck Burdick - * @version $Id: JUnitTestAdapter.java,v 1.4 2001/10/25 20:31:00 morgand Exp $ + * @version $Id: JUnitTestAdapter.java,v 1.5 2002/01/05 05:34:50 jefft Exp $ */ public class JUnitTestAdapter implements Test { private static final int ERROR = 0; @@ -151,7 +151,7 @@ /** * Create a Test from a resource accessible via - * the {@link java.lang.Classloader#getResource(String) class loader} + * the {@link java.lang.ClassLoader#getResource(String) class loader} * @param resourceName A resource accessible by the class loader in Latka's XML format * @return a JUnit Test, ready to run */ 1.3 +2 -2 jakarta-commons/latka/src/java/org/apache/commons/latka/xml/FindVariablesHandler.java Index: FindVariablesHandler.java =================================================================== RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/FindVariablesHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FindVariablesHandler.java 19 Sep 2001 22:24:40 -0000 1.2 +++ FindVariablesHandler.java 5 Jan 2002 05:34:50 -0000 1.3 @@ -73,14 +73,14 @@ /** * This handler is used by the - * {@link XMLPreprocessr#findVariablesFro,URI(String)} + * {@link XMLPreprocessor#getVariablesFromEntities(InputSource)} * method to read the external entities of an XML * suite and find any variables referenced there. * The only purpose of the suite is to leverage * SAX's awareness of these entities' locations. * * @author Morgan Delagrange - * @see XMLPreprocessr#findVariablesFromURI(String) + * @see XMLPreprocessor#getVariablesFromEntities(InputSource) */ public class FindVariablesHandler extends DefaultHandler { 1.16 +10 -2 jakarta-commons/latka/src/java/org/apache/commons/latka/xml/XMLPreprocessor.java Index: XMLPreprocessor.java =================================================================== RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/XMLPreprocessor.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- XMLPreprocessor.java 18 Oct 2001 16:03:26 -0000 1.15 +++ XMLPreprocessor.java 5 Jan 2002 05:34:50 -0000 1.16 @@ -192,13 +192,21 @@ if (suite.getURL() != null) { source.setSystemId(suite.getURL().toString()); } - set.addAll(getVariablesFromEntites(source)); + set.addAll(getVariablesFromEntities(source)); return set; } /** + * @deprecated Spelling -- use {@link #getVariablesFromEntities} instead. + */ + protected Set getVariablesFromEntites(InputSource inputSource) + throws IOException { + return getVariablesFromEntities(inputSource); + } + + /** * This method uses a special SAX handler to recurse * through the entities of a Latka Suite, finding all * the variables that are referenced. @@ -209,7 +217,7 @@ * @exception IOException * if any errors occur during the XML processing */ - protected Set getVariablesFromEntites(InputSource inputSource) + protected Set getVariablesFromEntities(InputSource inputSource) throws IOException { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setNamespaceAware(true);
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>