hlship 2003/06/10 14:29:25 Modified: hivemind project.xml .classpath hivemind/src/test/hivemind/test/config Create.xml Factory.xml TestConfiguration.java hivemind/src/java/org/apache/commons/hivemind/parse DescriptorParser.java hivemind/src/test/hivemind/test/ant TestManifestClassPath.java Log: Fixes to compile and work under JDK 1.3. Synchronize .classpath and project.xml dependencies. Revision Changes Path 1.7 +5 -5 jakarta-commons-sandbox/hivemind/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 10 Jun 2003 17:58:20 -0000 1.6 +++ project.xml 10 Jun 2003 21:29:25 -0000 1.7 @@ -81,7 +81,7 @@ <dependency> <id>xerces</id> - <version>2.3.0</version> + <version>2.2.1</version> <url>http://xml.apache.org/xerces/</url> </dependency> @@ -93,7 +93,7 @@ <dependency> <id>ognl</id> - <version>2.5.1</version> + <version>2.4.1</version> <url>http://www.ognl.org/</url> </dependency> @@ -113,7 +113,7 @@ <dependency> <id>commons-logging</id> - <version>1.0.2</version> + <version>1.0.1</version> <url>http://jakarta.apache.org/jakarta-commons/logging.html</url> </dependency> @@ -144,7 +144,7 @@ <dependency> <id>log4j</id> - <version>1.2.6</version> + <version>1.2.7</version> <url>http://jakarta.apache.org/log4j/</url> </dependency> </dependencies> 1.4 +1 -1 jakarta-commons-sandbox/hivemind/.classpath Index: .classpath =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .classpath 10 Jun 2003 17:58:20 -0000 1.3 +++ .classpath 10 Jun 2003 21:29:25 -0000 1.4 @@ -17,7 +17,7 @@ <classpathentry kind="var" path="MAVEN_REPOS_DIR/xerces/jars/xerces-2.2.1.jar"/> <classpathentry kind="var" path="MAVEN_REPOS_DIR/servletapi/jars/servletapi-2.3.jar"/> <classpathentry kind="var" path="MAVEN_REPOS_DIR/xml-apis/jars/xml-apis-1.0.b2.jar"/> - <classpathentry kind="var" path="MAVEN_REPOS_DIR/jakarta-tapestry/jars/tapestry-3.0-beta-1a.jar"/> <classpathentry kind="var" path="MAVEN_REPOS_DIR/ant/jars/ant-1.5.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPOS_DIR/tapestry/jars/tapestry-3.0-beta-1a.jar"/> <classpathentry kind="output" path="bin"/> </classpath> 1.2 +2 -2 jakarta-commons-sandbox/hivemind/src/test/hivemind/test/config/Create.xml Index: Create.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/src/test/hivemind/test/config/Create.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Create.xml 30 May 2003 20:52:02 -0000 1.1 +++ Create.xml 10 Jun 2003 21:29:25 -0000 1.2 @@ -9,7 +9,7 @@ <create-instance class="hivemind.test.config.ConfigElement"> <set property="title" value="this is a test"/> <set property="order" value="97"/> - <set-expression property="locale" expression='new java.util.Locale("en")'/> + <set-expression property="locale" expression="@[EMAIL PROTECTED]"/> </create-instance> </configuration> </module> 1.2 +2 -2 jakarta-commons-sandbox/hivemind/src/test/hivemind/test/config/Factory.xml Index: Factory.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/src/test/hivemind/test/config/Factory.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Factory.xml 30 May 2003 20:52:02 -0000 1.1 +++ Factory.xml 10 Jun 2003 21:29:25 -0000 1.2 @@ -9,7 +9,7 @@ <factory service-id="hivemind.test.config.ConfigElementFactory"> <set property="title" value="built by factory"/> <set property="order" value="21"/> - <set-expression property="locale" expression='new java.util.Locale("fr")'/> + <set-expression property="locale" expression="@[EMAIL PROTECTED]"/> </factory> </configuration> 1.7 +3 -3 jakarta-commons-sandbox/hivemind/src/test/hivemind/test/config/TestConfiguration.java Index: TestConfiguration.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/src/test/hivemind/test/config/TestConfiguration.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TestConfiguration.java 9 Jun 2003 22:23:08 -0000 1.6 +++ TestConfiguration.java 10 Jun 2003 21:29:25 -0000 1.7 @@ -221,7 +221,7 @@ { checkException( ex, - "Unable to convert zaphod to type java.lang.Integer: For input string: \"zaphod\""); + "Unable to convert zaphod to type java.lang.Integer"); } } @@ -244,7 +244,7 @@ assertEquals("this is a test", e.getTitle()); assertEquals(97, e.getOrder()); - assertEquals(new Locale("en"), e.getLocale()); + assertEquals(Locale.ENGLISH, e.getLocale()); } public void testFactory() throws Exception @@ -257,7 +257,7 @@ assertEquals("built by factory", e.getTitle()); assertEquals(21, e.getOrder()); - assertEquals(new Locale("fr"), e.getLocale()); + assertEquals(Locale.FRENCH, e.getLocale()); } public void testContributeService() throws Exception 1.6 +3 -3 jakarta-commons-sandbox/hivemind/src/java/org/apache/commons/hivemind/parse/DescriptorParser.java Index: DescriptorParser.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/src/java/org/apache/commons/hivemind/parse/DescriptorParser.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DescriptorParser.java 9 Jun 2003 22:23:08 -0000 1.5 +++ DescriptorParser.java 10 Jun 2003 21:29:25 -0000 1.6 @@ -111,7 +111,7 @@ _digester.setResourceLocation(location); - ModuleDescriptor result = (ModuleDescriptor) _digester.parse(source); + ModuleDescriptor result = (ModuleDescriptor)_digester.parse(source); if (LOG.isDebugEnabled()) LOG.debug("Result: " + result); @@ -406,7 +406,7 @@ HiveMind.format( "DescriptorParser.unable-to-set-feature", feature, - Boolean.toString(setting), + setting ? "true" : "false", ex.getMessage()), ex); } 1.2 +2 -3 jakarta-commons-sandbox/hivemind/src/test/hivemind/test/ant/TestManifestClassPath.java Index: TestManifestClassPath.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/src/test/hivemind/test/ant/TestManifestClassPath.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestManifestClassPath.java 10 Jun 2003 17:58:19 -0000 1.1 +++ TestManifestClassPath.java 10 Jun 2003 21:29:25 -0000 1.2 @@ -57,15 +57,14 @@ package hivemind.test.ant; -import java.io.File; - import hivemind.test.HiveMindTestCase; +import java.io.File; + import org.apache.commons.hivemind.ant.ManifestClassPath; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Target; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; public class TestManifestClassPath extends HiveMindTestCase
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]