Author: oheger
Date: Wed Jan 9 11:34:44 2008
New Revision: 610522
URL: http://svn.apache.org/viewvc?rev=610522&view=rev
Log:
Moved test resources to the standard location of m2; however now lots of tests
are failing and need to be adapted.
Added:
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/PropertyList-1.0.dtd
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/PropertyList-1.0.dtd
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/config/
- copied from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/config/
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/dataset.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/dataset.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/digesterRules.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/digesterRules.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/include.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/include.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/jndi.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/jndi.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/properties.dtd
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/properties.dtd
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/resources.jar
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/resources.jar
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/test.plist
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/test.plist
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/test.plist.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/test.plist.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/test.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/test.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/test.properties.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/test.properties.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/test.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/test.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/test2.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/test2.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testClasspath.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testClasspath.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testComplexInitialization.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testComplexInitialization.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testConfigurationXMLDocument.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testConfigurationXMLDocument.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterBadXML.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterBadXML.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfiguration.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfiguration2.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfiguration2.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfiguration3.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfiguration3.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationBasePath.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationBasePath.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationInclude1.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationInclude1.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationInclude2.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationInclude2.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationNamespaceAware.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationNamespaceAware.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationOverwrite.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationOverwrite.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationReverseOrder.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationReverseOrder.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationSysProps.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationSysProps.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationWJNDI.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationWJNDI.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationWithProps.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationWithProps.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterCreateObject.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterCreateObject.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterOptionalConfiguration.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterOptionalConfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterOptionalConfigurationEx.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterOptionalConfigurationEx.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDtd.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testDtd.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testEncoding.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testEncoding.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testEqual.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testEqual.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testEqualDigester.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testEqualDigester.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFactoryPropertiesInclude.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testFactoryPropertiesInclude.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testHierarchicalXMLConfiguration.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testHierarchicalXMLConfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testHierarchicalXMLConfiguration2.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testHierarchicalXMLConfiguration2.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testSequence.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testSequence.properties
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testSequenceDigester.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testSequenceDigester.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testValidateInvalid.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testValidateInvalid.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testValidateValid.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testValidateValid.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testcombine1.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testcombine1.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testcombine2.xml
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testcombine2.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testdb.script
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/testdb.script
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/threesome.properties
- copied unchanged from r610517,
commons/proper/configuration/branches/configuration2_experimental/conf/threesome.properties
Removed:
commons/proper/configuration/branches/configuration2_experimental/conf/PropertyList-1.0.dtd
commons/proper/configuration/branches/configuration2_experimental/conf/config/
commons/proper/configuration/branches/configuration2_experimental/conf/dataset.xml
commons/proper/configuration/branches/configuration2_experimental/conf/digesterRules.xml
commons/proper/configuration/branches/configuration2_experimental/conf/include.properties
commons/proper/configuration/branches/configuration2_experimental/conf/jndi.properties
commons/proper/configuration/branches/configuration2_experimental/conf/properties.dtd
commons/proper/configuration/branches/configuration2_experimental/conf/resources.jar
commons/proper/configuration/branches/configuration2_experimental/conf/test.plist
commons/proper/configuration/branches/configuration2_experimental/conf/test.plist.xml
commons/proper/configuration/branches/configuration2_experimental/conf/test.properties
commons/proper/configuration/branches/configuration2_experimental/conf/test.properties.xml
commons/proper/configuration/branches/configuration2_experimental/conf/test.xml
commons/proper/configuration/branches/configuration2_experimental/conf/test2.properties
commons/proper/configuration/branches/configuration2_experimental/conf/testClasspath.properties
commons/proper/configuration/branches/configuration2_experimental/conf/testComplexInitialization.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testConfigurationXMLDocument.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterBadXML.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfiguration2.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfiguration3.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationBasePath.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationInclude1.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationInclude2.properties
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationNamespaceAware.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationOverwrite.properties
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationReverseOrder.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationSysProps.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationWJNDI.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterConfigurationWithProps.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterCreateObject.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterOptionalConfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDigesterOptionalConfigurationEx.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testDtd.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testEncoding.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testEqual.properties
commons/proper/configuration/branches/configuration2_experimental/conf/testEqualDigester.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testFactoryPropertiesInclude.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testHierarchicalXMLConfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testHierarchicalXMLConfiguration2.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testSequence.properties
commons/proper/configuration/branches/configuration2_experimental/conf/testSequenceDigester.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testValidateInvalid.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testValidateValid.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testcombine1.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testcombine2.xml
commons/proper/configuration/branches/configuration2_experimental/conf/testdb.script
commons/proper/configuration/branches/configuration2_experimental/conf/threesome.properties
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/pom.xml?rev=610522&r1=610521&r2=610522&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/pom.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/pom.xml
Wed Jan 9 11:34:44 2008
@@ -382,32 +382,6 @@
</includes>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>conf</directory>
- <includes>
- <include>*.xml</include>
- <include>testdb.script</include>
- <include>*.properties</include>
- <include>*.dtd</include>
- </includes>
- </testResource>
- <testResource>
- <directory>conf</directory>
- <targetPath>org/apache/commons/configuration</targetPath>
- <includes>
- <include>test.properties</include>
- <include>include.properties</include>
- </includes>
- </testResource>
- <testResource>
- <directory>conf/config</directory>
- <targetPath>config</targetPath>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
