cvs commit: jakarta-commons/configuration project.xml
oheger 2004/11/14 11:06:32 Modified:configuration/xdocs changes.xml configuration/src/test/org/apache/commons/configuration TestConfigurationFactory.java configuration/src/java/org/apache/commons/configuration ConfigurationFactory.java configuration project.xml Added: configuration/conf testDigesterOptionalConfiguration.xml Log: Added support for optional configurations in configuration definition files for ConfigurationFactory. Revision ChangesPath 1.69 +9 -0 jakarta-commons/configuration/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- changes.xml 21 Oct 2004 18:36:14 - 1.68 +++ changes.xml 14 Nov 2004 19:06:32 - 1.69 @@ -71,6 +71,15 @@ AppletConfiguration, ServletConfiguration, ServletContextConfiguration, ServletRequestConfiguration, ServletFilterConfiguration. /action + action dev=oheger type=fix issue=32236 + Fixed NPE that where caused in the constructors of file based + configurations if an invalid file name was specified. + /action + action dev=oheger type=add issue=31797 + Added support for optional configuration sources in definition files for + ConfigurationFactory. A new required attribute allows to specify whether a + configuration source is mandatory or optional. + /action /release release version=1.0.1-dev date=in CVS 1.17 +12 -1 jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationFactory.java Index: TestConfigurationFactory.java === RCS file: /home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationFactory.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- TestConfigurationFactory.java 18 Oct 2004 12:50:41 - 1.16 +++ TestConfigurationFactory.java 14 Nov 2004 19:06:32 - 1.17 @@ -44,6 +44,8 @@ new File(conf/testDigesterConfiguration2.xml); private File testDigesterFileComplete = new File(conf/testDigesterConfiguration3.xml); +private File testDigesterFileOptional = +new File(conf/testDigesterOptionalConfiguration.xml); private File testDigesterBadXML = new File(conf/testDigesterBadXML.xml); @@ -237,6 +239,15 @@ // test SystemConfiguration assertNotNull(config.getProperty(java.version)); assertEquals(System.getProperty(java.version), config.getString(java.version)); +} + +// Checks if optional configurations work +public void testOptionalConfigurations() throws Exception +{ +factory.setConfigurationURL(testDigesterFileOptional.toURL()); +Configuration config = factory.getConfiguration(); +assertTrue(config.getBoolean(test.boolean)); +assertEquals(value, config.getProperty(element)); } private void checkUnionConfig() throws Exception 1.1 jakarta-commons/configuration/conf/testDigesterOptionalConfiguration.xml Index: testDigesterOptionalConfiguration.xml === ?xml version=1.0 encoding=ISO-8859-1 ? !-- Configuration test file that demonstrates optional configurations -- configuration properties fileName=test.properties/ xml fileName=test.xml required=true/ hierarchicalXml fileName=nonExistingHierarchicalXML1.xml required=false/ properties fileName=nonExistingProperties1.properties required=no/ xml fileName=nonExistingXML1.xml required=false/ additional properties fileName=nonExistingProperties2.properties required=no/ hierarchicalXml fileName=nonExistingHierarchicalXML2.xml required=false/ xml fileName=nonExistingXML2.xml required=false/ /additional /configuration 1.18 +28 -7 jakarta-commons/configuration/src/java/org/apache/commons/configuration/ConfigurationFactory.java Index: ConfigurationFactory.java === RCS file: /home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/ConfigurationFactory.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ConfigurationFactory.java 18 Oct 2004 12:50:41 - 1.17 +++ ConfigurationFactory.java 14 Nov 2004 19:06:32 - 1.18 @@ -57,9 +57,12 @@
cvs commit: jakarta-commons/configuration project.xml
ebourg 2004/10/12 05:23:22 Modified:configuration project.xml Log: Removed 1.0 tasks Revision ChangesPath 1.37 +8 -3 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- project.xml 12 Oct 2004 00:33:06 - 1.36 +++ project.xml 12 Oct 2004 12:23:22 - 1.37 @@ -187,7 +187,7 @@ dependency groupIdcommons-collections/groupId artifactIdcommons-collections/artifactId - version3.0/version + version3.1/version properties war.bundletrue/war.bundle /properties @@ -264,6 +264,11 @@ /properties /dependency +dependency + idjniregistry/id + version3.1.3/version +/dependency + !-- Needed for testing -- dependency @@ -343,7 +348,7 @@ !-- Unit test classes -- unitTest includes -include**/*Test*.java/include +include**/*TestWin*.java/include /includes excludes exclude**/TestBasePropertiesConfiguration.java/exclude - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
ebourg 2004/10/12 05:29:08 Modified:configuration project.xml Log: Oops :) wrong file commited Revision ChangesPath 1.38 +2 -7 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- project.xml 12 Oct 2004 12:23:22 - 1.37 +++ project.xml 12 Oct 2004 12:29:08 - 1.38 @@ -187,7 +187,7 @@ dependency groupIdcommons-collections/groupId artifactIdcommons-collections/artifactId - version3.1/version + version3.0/version properties war.bundletrue/war.bundle /properties @@ -264,11 +264,6 @@ /properties /dependency -dependency - idjniregistry/id - version3.1.3/version -/dependency - !-- Needed for testing -- dependency @@ -348,7 +343,7 @@ !-- Unit test classes -- unitTest includes -include**/*TestWin*.java/include +include**/*Test*.java/include /includes excludes exclude**/TestBasePropertiesConfiguration.java/exclude - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
henning 2004/10/11 02:53:51 Modified:configuration project.xml Log: Missing junit Dependency. Call it 1.0 Revision ChangesPath 1.33 +16 -4 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- project.xml 24 Sep 2004 20:52:57 - 1.32 +++ project.xml 11 Oct 2004 09:53:51 - 1.33 @@ -25,7 +25,7 @@ pomVersion3/pomVersion idcommons-configuration/id - currentVersion1.0-SNAPSHOT/currentVersion + currentVersion1.0/currentVersion inceptionYear2001/inceptionYear nameCommons Configuration/name shortDescriptionCommon Configuration/shortDescription @@ -56,7 +56,8 @@ issueTrackingUrlhttp://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEWamp;bug_status=ASSIGNEDamp;bug_status=REOPENEDamp;product=Commonsamp;component=Configuration/issueTrackingUrl siteAddressjakarta.apache.org/siteAddress siteDirectory/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}//siteDirectory - distributionDirectory/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}//distributionDirectory + distributionSitejava.intermeta.de/distributionSite + distributionDirectory/webserver/java.intermeta.de/html/maven/distributionDirectory repository connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}/connection @@ -73,6 +74,11 @@ name1.0-rc2/name tagCONFIGURATION_1_0_RC2/tag /version +version + id1.0/id + name1.0/name + tagCONFIGURATION_1_0/tag +/version /versions mailingLists mailingList @@ -287,7 +293,13 @@ dependency groupIddbunit/groupId artifactIddbunit/artifactId - version2.0/version + version2.1/version +/dependency + +dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + version3.8.1/version /dependency dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
henning 2004/10/11 17:03:16 Modified:configuration project.xml Log: Move on to 1.0.1-dev Revision ChangesPath 1.34 +2 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- project.xml 11 Oct 2004 09:53:51 - 1.33 +++ project.xml 12 Oct 2004 00:03:16 - 1.34 @@ -25,7 +25,7 @@ pomVersion3/pomVersion idcommons-configuration/id - currentVersion1.0/currentVersion + currentVersion1.0.1-dev/currentVersion inceptionYear2001/inceptionYear nameCommons Configuration/name shortDescriptionCommon Configuration/shortDescription - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
henning 2004/10/11 17:05:06 Modified:configuration project.xml Log: Main branch will be 1.1 next. Revision ChangesPath 1.35 +2 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- project.xml 12 Oct 2004 00:03:16 - 1.34 +++ project.xml 12 Oct 2004 00:05:05 - 1.35 @@ -25,7 +25,7 @@ pomVersion3/pomVersion idcommons-configuration/id - currentVersion1.0.1-dev/currentVersion + currentVersion1.1-dev/currentVersion inceptionYear2001/inceptionYear nameCommons Configuration/name shortDescriptionCommon Configuration/shortDescription - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/09/24 11:01:12 Modified:configuration/xdocs changes.xml configuration project.xml Log: Prep for rc2 Revision ChangesPath 1.47 +1 -1 jakarta-commons/configuration/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- changes.xml 22 Sep 2004 17:17:31 - 1.46 +++ changes.xml 24 Sep 2004 18:01:12 - 1.47 @@ -6,7 +6,7 @@ /properties body -release version=1.0-rc2 date=in CVS +release version=1.0-rc2 date=2004-09-24 action dev=ebourg type=update Unified the mechanisms for loading and saving file based configurations. PropertiesConfiguration, XMLConfiguration and HierarchicalXMLConfiguration 1.31 +14 -3 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- project.xml 23 Sep 2004 12:05:07 - 1.30 +++ project.xml 24 Sep 2004 18:01:12 - 1.31 @@ -25,7 +25,7 @@ pomVersion3/pomVersion idcommons-configuration/id - currentVersion1.0-SNAPSHOT/currentVersion + currentVersion1.0-rc2/currentVersion inceptionYear2001/inceptionYear nameCommons Configuration/name shortDescriptionCommon Configuration/shortDescription @@ -62,7 +62,18 @@ connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}/connection urlhttp://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}//url /repository - + versions +version + id1.0-rc1/id + name1.0-rc1/name + tagCONFIGURATION_1_0_RC1/tag +/version +version + id1.0-rc2/id + name1.0-rc2/name + tagCONFIGURATION_1_0_RC2/tag +/version + /versions mailingLists mailingList nameCommons Dev List/name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
ebourg 2004/09/23 05:05:07 Modified:configuration project.xml Log: Updated the hsqldb dependency to the version 1.7.2 Revision ChangesPath 1.30 +2 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- project.xml 22 Sep 2004 17:17:30 - 1.29 +++ project.xml 23 Sep 2004 12:05:07 - 1.30 @@ -270,7 +270,7 @@ dependency groupIdhsqldb/groupId artifactIdhsqldb/artifactId - version1.7.1/version + version1.7.2.2/version /dependency dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
ebourg 2004/09/03 08:22:17 Modified:configuration project.xml Log: Updated the dependencies on commons-logging and commons-beanutils Removed simple-jndi Moved myself to the developper list email update Revision ChangesPath 1.27 +74 -76jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- project.xml 16 Aug 2004 22:16:30 - 1.26 +++ project.xml 3 Sep 2004 15:22:17 - 1.27 @@ -34,7 +34,7 @@ various formats /description logo/images/logo.png/logo - + urlhttp://jakarta.apache.org/commons/${pom.artifactId.substring(8)}//url packageorg.apache.commons.${pom.artifactId.substring(8)}/package @@ -43,7 +43,7 @@ urlhttp://jakarta.apache.org/url logohttp://jakarta.apache.org/images/original-jakarta-logo.gif/logo /organization - + licenses license nameThe Apache Software License, Version 2.0/name @@ -51,18 +51,18 @@ distributionrepo/distribution /license /licenses - + gumpRepositoryIdjakarta/gumpRepositoryId issueTrackingUrlhttp://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEWamp;bug_status=ASSIGNEDamp;bug_status=REOPENEDamp;product=Commonsamp;component=Configuration/issueTrackingUrl siteAddressjakarta.apache.org/siteAddress siteDirectory/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}//siteDirectory distributionDirectory/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}//distributionDirectory - + repository connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}/connection urlhttp://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}//url /repository - + mailingLists mailingList nameCommons Dev List/name @@ -80,7 +80,7 @@ branches /branches - + developers developer @@ -132,168 +132,166 @@ email[EMAIL PROTECTED]/email organizationdunbarconsulting.org/organization /developer - /developers - - contributors -contributor + +developer nameEmmanuel Bourg/name idebourg/id - email[EMAIL PROTECTED]/email -/contributor + email[EMAIL PROTECTED]/email +/developer + + /developers + + contributors + contributor nameOliver Heger/name idoheger/id email[EMAIL PROTECTED]/email -/contributor +/contributor + contributor nameJouml;rg Schaible/name idjschaible/id email[EMAIL PROTECTED]/email organizationElsag-Solutions AG/organization timezone+1/timezone -/contributor +/contributor + contributor nameKonstantin Shaposhnikov/name idkshaposhnikov/id email[EMAIL PROTECTED]/email organizationscand.com/organization /contributor + /contributors - + dependencies dependency groupIdcommons-collections/groupId - artifactIdcommons-collections/artifactId + artifactIdcommons-collections/artifactId version3.0/version - properties + properties war.bundletrue/war.bundle - /properties + /properties /dependency dependency groupIdcommons-lang/groupId - artifactIdcommons-lang/artifactId + artifactIdcommons-lang/artifactId version2.0/version - properties + properties war.bundletrue/war.bundle - /properties + /properties /dependency dependency - groupIdcommons-logging/groupId - artifactIdcommons-logging/artifactId - version1.0.3/version - properties -war.bundletrue/war.bundle - /properties + groupIddom4j/groupId + artifactIddom4j/artifactId + version1.4/version /dependency dependency - groupIddom4j/groupId - artifactIddom4j/artifactId - version1.4/version - properties + groupIdcommons-logging/groupId + artifactIdcommons-logging/artifactId + version1.0.4/version + properties war.bundletrue/war.bundle - /properties + /properties /dependency dependency groupIdcommons-digester/groupId - artifactIdcommons-digester/artifactId + artifactIdcommons-digester/artifactId version1.5/version - properties + properties
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/08/14 05:22:51 Modified:configuration project.xml Log: Bump version now that 1.0-RC1 is released Revision ChangesPath 1.25 +2 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- project.xml 13 Aug 2004 12:36:47 - 1.24 +++ project.xml 14 Aug 2004 12:22:50 - 1.25 @@ -25,7 +25,7 @@ pomVersion3/pomVersion idcommons-configuration/id - currentVersion1.0-rc1/currentVersion + currentVersion1.0-SNAPSHOT/currentVersion inceptionYear2001/inceptionYear nameCommons Configuration/name shortDescriptionCommon Configuration/shortDescription - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/08/13 05:36:47 Modified:configuration project.xml Log: fix plugin groups. bump version of findbugs. Revision ChangesPath 1.24 +4 -4 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- project.xml 24 Jul 2004 15:21:51 - 1.23 +++ project.xml 13 Aug 2004 12:36:47 - 1.24 @@ -280,16 +280,16 @@ dependency - groupIdmaven/groupId + groupIdmaven-plugins/groupId artifactIdmaven-tasks-plugin/artifactId version1.1.0/version urlhttp://maven-plugins.sourceforge.net/maven-tasks-plugin//url typeplugin/type /dependency dependency - groupIdmaven/groupId + groupIdmaven-plugins/groupId artifactIdmaven-findbugs-plugin/artifactId - version0.7.2/version + version0.8.4/version urlhttp://maven-plugins.sourceforge.net/maven-findbugs-plugin//url typeplugin/type /dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
ebourg 2004/07/08 08:22:51 Modified:configuration project.xml Log: Enabled TestJNDIConfiguration Revision ChangesPath 1.22 +1 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- project.xml 2 Jun 2004 17:04:51 - 1.21 +++ project.xml 8 Jul 2004 15:22:51 - 1.22 @@ -312,7 +312,6 @@ excludes exclude**/TestBasePropertiesConfiguration.java/exclude exclude**/NonStringTestHolder.java/exclude -exclude**/TestJNDIConfiguration.java/exclude /excludes resources resource - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/05/13 05:16:47 Modified:configuration project.xml Log: Update project dependencies to use groupId/artifactId Revision ChangesPath 1.19 +35 -20jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- project.xml 4 May 2004 22:15:26 - 1.18 +++ project.xml 13 May 2004 12:16:47 - 1.19 @@ -161,7 +161,8 @@ dependencies dependency - idcommons-collections/id + groupIdcommons-collections/groupId + artifactIdcommons-collections/artifactId version2.1/version properties war.bundletrue/war.bundle @@ -169,7 +170,8 @@ /dependency dependency - idcommons-lang/id + groupIdcommons-lang/groupId + artifactIdcommons-lang/artifactId version2.0/version properties war.bundletrue/war.bundle @@ -177,7 +179,8 @@ /dependency dependency - idcommons-logging/id + groupIdcommons-logging/groupId + artifactIdcommons-logging/artifactId version1.0.3/version properties war.bundletrue/war.bundle @@ -185,7 +188,8 @@ /dependency dependency - iddom4j/id + groupIddom4j/groupId + artifactIddom4j/artifactId version1.4/version properties war.bundletrue/war.bundle @@ -193,7 +197,8 @@ /dependency dependency - idcommons-digester/id + groupIdcommons-digester/groupId + artifactIdcommons-digester/artifactId version1.5/version properties war.bundletrue/war.bundle @@ -201,7 +206,8 @@ /dependency dependency - idcommons-beanutils/id + groupIdcommons-beanutils/groupId + artifactIdcommons-beanutils/artifactId version1.7-dev/version properties war.bundletrue/war.bundle @@ -209,7 +215,8 @@ /dependency dependency - idxerces/id + groupIdxerces/groupId + artifactIdxerces/artifactId version2.2.1/version urlhttp://xml.apache.org/xerces2-j//url properties @@ -218,7 +225,8 @@ /dependency dependency - idxml-apis/id + groupIdxml-apis/groupId + artifactIdxml-apis/artifactId version2.0.2/version urlhttp://xml.apache.org/commons//url properties @@ -227,11 +235,6 @@ /dependency !-- Needed for testing -- -dependency - idjunit/id - version3.8.1/version - urlhttp://www.junit.org/url -/dependency !--dependency idsimple-jndi/id @@ -246,30 +249,42 @@ /dependency dependency - idcommons-dbcp/id + groupIdcommons-dbcp/groupId + artifactIdcommons-dbcp/artifactId version1.1/version /dependency dependency - idcommons-pool/id + groupIdcommons-pool/groupId + artifactIdcommons-pool/artifactId version1.1/version /dependency dependency - idhsqldb/id + groupIdhsqldb/groupId + artifactIdhsqldb/artifactId version1.7.1/version /dependency dependency - iddbunit/id + groupIddbunit/groupId + artifactIddbunit/artifactId version1.5.5/version /dependency dependency - idexml/id + groupIdexml/groupId + artifactIdexml/artifactId versiondbunit1.5.1/version /dependency +dependency + groupIdjunit-addons/groupId + artifactIdjunit-addons/artifactId + version1.4/version +/dependency + + dependency groupIdmaven/groupId artifactIdmaven-tasks-plugin/artifactId @@ -280,7 +295,7 @@ dependency groupIdmaven/groupId artifactIdmaven-findbugs-plugin/artifactId - version0.7.1/version + version0.7.2/version urlhttp://maven-plugins.sourceforge.net/maven-findbugs-plugin//url typeplugin/type /dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/04/01 10:26:15 Modified:configuration project.xml Log: Oops, it seems like the o with .. over it causes Maven to fail. Revision ChangesPath 1.15 +2 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- project.xml 1 Apr 2004 18:21:46 - 1.14 +++ project.xml 1 Apr 2004 18:26:15 - 1.15 @@ -119,7 +119,7 @@ email[EMAIL PROTECTED]/email /contributor contributor - nameJörg Schaible/name + nameJorg Schaible/name idjschaible/id email[EMAIL PROTECTED]/email /contributor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/04/01 10:43:04 Modified:configuration/src/test/org/apache/commons/configuration TestCompositeConfiguration.java configuration/xdocs changes.xml configuration/src/java/org/apache/commons/configuration SubsetConfiguration.java PropertiesConfiguration.java CompositeConfiguration.java configuration project.xml Added: configuration/src/test/org/apache/commons/configuration TestDOMConfiguration.java TestHierarchicalDOMConfiguration.java configuration/src/java/org/apache/commons/configuration DOMConfiguration.java HierarchicalDOMConfiguration.java Log: Bugzilla Bug 27498 DOM based XMLConfiguration Revision ChangesPath 1.7 +16 -1 jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestCompositeConfiguration.java Index: TestCompositeConfiguration.java === RCS file: /home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestCompositeConfiguration.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TestCompositeConfiguration.java 9 Mar 2004 10:31:31 - 1.6 +++ TestCompositeConfiguration.java 1 Apr 2004 18:43:03 - 1.7 @@ -229,6 +229,21 @@ } /** + * Tests subsets and still can resolve elements + */ +public void testSubsetCanResolve() throws Exception +{ +cc = new CompositeConfiguration(); +final BaseConfiguration config = new BaseConfiguration(); +config.addProperty(subset.tempfile, ${java.io.tmpdir}/file.tmp); +cc.addConfiguration(config); + cc.addConfiguration(ConfigurationConverter.getConfiguration(System.getProperties())); + +Configuration subset = cc.subset(subset); +assertEquals(System.getProperty(java.io.tmpdir) + /file.tmp, subset.getString(tempfile)); +} + +/** * Tests codeList/code parsing. */ public void testList() throws Exception 1.1 jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDOMConfiguration.java Index: TestDOMConfiguration.java === package org.apache.commons.configuration; /* * Copyright 2001-2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License) * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ import java.io.File; import junit.framework.TestCase; /** * test for loading and saving xml properties files * * @version $Id: TestDOMConfiguration.java,v 1.1 2004/04/01 18:43:03 epugh Exp $ */ public class TestDOMConfiguration extends TestCase { /** The File that we test with */ private String testProperties = new File(conf/test.xml).getAbsolutePath(); private String testBasePath = new File(conf).getAbsolutePath(); private DOMConfiguration conf; protected void setUp() throws Exception { conf = new DOMConfiguration(new File(testProperties)); } public void testGetProperty() throws Exception { assertEquals(value, conf.getProperty(element)); } public void testGetComplexProperty() throws Exception { assertEquals(I'm complex!, conf.getProperty(element2.subelement.subsubelement)); } public void testSettingFileNames() throws Exception { conf = new DOMConfiguration(); conf.setFileName(testProperties); assertEquals(testProperties.toString(), conf.getFileName()); conf.setBasePath(testBasePath); conf.setFileName(hello.xml); assertEquals(hello.xml, conf.getFileName()); assertEquals(testBasePath.toString(), conf.getBasePath()); assertEquals(new File(testBasePath, hello.xml), conf.getFile()); conf.setBasePath(testBasePath); conf.setFileName(/subdir/hello.xml); assertEquals(/subdir/hello.xml, conf.getFileName()); assertEquals(testBasePath.toString(), conf.getBasePath()); assertEquals(new File(testBasePath, /subdir/hello.xml), conf.getFile()); }
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/03/28 06:44:18 Modified:configuration project.xml Log: Exclude TestJNDIConfiguration until we get a better mock JNDI provider. Revision ChangesPath 1.12 +2 -1 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 13 Mar 2004 17:22:48 - 1.11 +++ project.xml 28 Mar 2004 14:44:18 - 1.12 @@ -264,6 +264,7 @@ excludes exclude**/TestBasePropertiesConfiguration.java/exclude exclude**/NonStringTestHolder.java/exclude +exclude**/TestJNDIConfiguration.java/exclude /excludes resources resource - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/03/28 08:02:10 Modified:configuration project.xml Log: bump version to rc 1 Revision ChangesPath 1.13 +2 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- project.xml 28 Mar 2004 14:44:18 - 1.12 +++ project.xml 28 Mar 2004 16:02:10 - 1.13 @@ -10,7 +10,7 @@ pomVersion3/pomVersion namecommons-configuration/name idcommons-configuration/id - currentVersion1.0-dev-3/currentVersion + currentVersion1.0-rc1/currentVersion organization nameApache Software Foundation/name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/03/13 09:22:48 Modified:configuration project.xml Log: Integrate findbugs and tasks plugins. Revision ChangesPath 1.11 +19 -2 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- project.xml 15 Feb 2004 11:58:37 - 1.10 +++ project.xml 13 Mar 2004 17:22:48 - 1.11 @@ -231,6 +231,21 @@ versiondbunit1.5.1/version /dependency + dependency + groupIdmaven/groupId + artifactIdmaven-tasks-plugin/artifactId + version1.1.0/version + urlhttp://maven-plugins.sourceforge.net/maven-tasks-plugin//url + typeplugin/type +/dependency +dependency + groupIdmaven/groupId + artifactIdmaven-findbugs-plugin/artifactId + version0.7.1/version + urlhttp://maven-plugins.sourceforge.net/maven-findbugs-plugin//url + typeplugin/type +/dependency + /dependencies build @@ -314,6 +329,8 @@ reportmaven-pmd-plugin/report reportmaven-simian-plugin/report reportmaven-faq-plugin/report -reportmaven-jcoverage-plugin/report +reportmaven-jcoverage-plugin/report +reportmaven-tasks-plugin/report +reportmaven-findbugs-plugin/report /reports /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/01/22 03:41:23 Modified:configuration/src/test/org/apache/commons/configuration TestDatabaseConfiguration.java configuration project.xml Log: Fix tests so that testdb.script not regenerated constantly. fixs cvs wanting to chck testdb.script in always. Revision ChangesPath 1.3 +8 -2 jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDatabaseConfiguration.java Index: TestDatabaseConfiguration.java === RCS file: /home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDatabaseConfiguration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestDatabaseConfiguration.java18 Jan 2004 16:18:56 - 1.2 +++ TestDatabaseConfiguration.java22 Jan 2004 11:41:23 - 1.3 @@ -55,6 +55,7 @@ package org.apache.commons.configuration; import java.io.FileInputStream; +import java.sql.SQLException; import java.util.Iterator; import javax.sql.DataSource; @@ -82,11 +83,12 @@ // set up the datasource BasicDataSource datasource = new BasicDataSource(); datasource.setDriverClassName(org.hsqldb.jdbcDriver); -datasource.setUrl(jdbc:hsqldb:conf/testdb); +datasource.setUrl(jdbc:hsqldb:target/test-classes/testdb); datasource.setUsername(sa); datasource.setPassword(); this.datasource = datasource; + // prepare the database IDatabaseConnection connection = new DatabaseConnection(datasource.getConnection()); @@ -100,6 +102,10 @@ { connection.close(); } +} + +protected void tearDown() throws SQLException{ +datasource.getConnection().close(); } public void testAddPropertyDirectSingle() 1.8 +2 -1 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- project.xml 18 Jan 2004 16:19:04 - 1.7 +++ project.xml 22 Jan 2004 11:41:23 - 1.8 @@ -255,6 +255,7 @@ directoryconf/directory includes includetestClasspath.properties/include +includetestdb.script/include /includes /resource /resources - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration project.xml
epugh 2004/01/16 09:32:37 Modified:configuration project.xml Added: configuration/src/test/org/apache/commons/configuration TestJNDIConfiguration.java TestJNDIEnvironmentValues.java configuration/conf/config/deep test.properties configuration/conf/config test.properties configuration/conf jndi.properties Removed: configuration/src/test-cactus/org/apache/commons/configuration TestJNDIEnvironmentValues.java TestJNDIConfiguration.java Log: Add Junit based unit tests for JNDI versus using Cactus. Revision ChangesPath 1.1 jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestJNDIConfiguration.java Index: TestJNDIConfiguration.java === package org.apache.commons.configuration; /* * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. The end-user documentation included with the redistribution, if *any, must include the following acknowledgement: * This product includes software developed by the *Apache Software Foundation (http://www.apache.org/). *Alternately, this acknowledgement may appear in the software itself, *if and wherever such third-party acknowledgements normally appear. * * 4. The names The Jakarta Project, Commons, and Apache Software *Foundation must not be used to endorse or promote products derived *from this software without prior written permission. For written *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * http://www.apache.org/. */ import javax.naming.InitialContext; import junit.framework.TestCase; /** * test if non-string properties are handled correctly * * @author a href=mailto:[EMAIL PROTECTED]Henning P. Schmiedehausen/a * @version $Id: TestJNDIConfiguration.java,v 1.1 2004/01/16 17:32:36 epugh Exp $ */ public class TestJNDIConfiguration extends TestCase { private Configuration conf; private NonStringTestHolder nonStringTestHolder; public void setUp() throws Exception { InitialContext context = new InitialContext(); JNDIConfiguration jndiConfiguration = new JNDIConfiguration(); jndiConfiguration.setPrefix(); conf = jndiConfiguration; nonStringTestHolder = new NonStringTestHolder(); nonStringTestHolder.setConfiguration(conf); } public void testBoolean() throws Exception { nonStringTestHolder.testBoolean(); } public void testBooleanDefaultValue() throws Exception { nonStringTestHolder.testBooleanDefaultValue(); } public void testByte() throws Exception {
cvs commit: jakarta-commons/configuration project.xml gump.xml
epugh 2003/12/23 07:56:46 Modified:configuration project.xml gump.xml Log: Remove references to sandbox Revision ChangesPath 1.2 +6 -6 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.xml 23 Dec 2003 15:09:05 - 1.1 +++ project.xml 23 Dec 2003 15:56:46 - 1.2 @@ -29,15 +29,15 @@ various formats /description - urlhttp://jakarta.apache.org/commons/sandbox/configuration//url + urlhttp://jakarta.apache.org/commons/configuration//url issueTrackingUrlhttp://nagoya.apache.org/scarab/servlet/scarab//issueTrackingUrl siteAddressjakarta.apache.org/siteAddress - siteDirectory/www/jakarta.apache.org/commons/sandbox/configuration//siteDirectory - distributionDirectory/www/jakarta.apache.org/builds/jakarta-commons-sandbox//distributionDirectory + siteDirectory/www/jakarta.apache.org/commons/configuration//siteDirectory + distributionDirectory/www/jakarta.apache.org/builds/jakarta-commons//distributionDirectory repository -connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/connection -urlhttp://cvs.apache.org/viewcvs/jakarta-commons-sandbox/configuration//url +connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons/connection +urlhttp://cvs.apache.org/viewcvs/jakarta-commons/configuration//url /repository branches 1.2 +3 -3 jakarta-commons/configuration/gump.xml Index: gump.xml === RCS file: /home/cvs/jakarta-commons/configuration/gump.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gump.xml 23 Dec 2003 15:09:05 - 1.1 +++ gump.xml 23 Dec 2003 15:56:46 - 1.2 @@ -2,9 +2,9 @@ module name=commons-configuration descriptionCommon ConfigurationTools/description - url href=http://jakarta.apache.org/commons/sandbox/configuration/; + url href=http://jakarta.apache.org/commons/configuration/; /url - cvs module=jakarta-commons-sandbox repository=jakarta + cvs module=jakarta-commons repository=jakarta /cvs project name=commons-configuration ant buildfile=build.xml target=dist @@ -40,7 +40,7 @@ /home jar name=commons-configuration-@@DATE@@.jar /jar -javadoc module=jakarta-commons-sandbox nested=target/docs/apidocs +javadoc module=jakarta-commons nested=target/docs/apidocs /javadoc nag to=[EMAIL PROTECTED] from=commons-configuration development lt;[EMAIL PROTECTED]gt; /nag - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]