commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r991817 - in /commons/proper/digester/trunk: ./ src/test/java/ src/test/java/org/ src/test/java/org/apache/commons/digester/ src/test/java/org/apache/commons/digester/annotations/addressbook/ src/test/java/org/apache/commons/digester/annota...
Date Thu, 02 Sep 2010 05:42:07 GMT
Author: simonetripodi
Date: Thu Sep  2 05:42:04 2010
New Revision: 991817

URL: http://svn.apache.org/viewvc?rev=991817&view=rev
Log:
test dir moved to default maven archetype dir structure

Added:
    commons/proper/digester/trunk/src/test/java/
    commons/proper/digester/trunk/src/test/java/org/
      - copied from r991745, commons/proper/digester/trunk/src/test/org/
    commons/proper/digester/trunk/src/test/resources/
    commons/proper/digester/trunk/src/test/resources/org/
    commons/proper/digester/trunk/src/test/resources/org/apache/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test1.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test1.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test10.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test10.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test11.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test11.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12-01.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test12-01.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12-02.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test12-02.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12.xml
      - copied, changed from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test12.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test13-01.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test13-01.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test13-02.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test13-02.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test13.xsd
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test13.xsd
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test2.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test2.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test3.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test3.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test4.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test4.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test5.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test5.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test6.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test6.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test7.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test7.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test8.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test8.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test9.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test9.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/addressbook/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/addressbook/AddressBook.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/addressbook/AddressBook.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/catalog/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/catalog/Catalog.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/catalog/Catalog.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/employee/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/employee/Employee.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/employee/Employee.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/person/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/person/Person.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/person/Person.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/rss/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/rss/Channel.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/rss/Channel.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/servletbean/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/annotations/servletbean/ServletBean.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/servletbean/ServletBean.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/document-with-relative-dtd.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/document-with-relative-dtd.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/ObjectTestImplRuleInfo.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/ObjectTestImplRuleInfo.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test1.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test1.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test2.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test2.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test3.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test3.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test4a.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test4a.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test4b.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test4b.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test5a.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test5a.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test5b.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test5b.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test5c.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test5c.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test6.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test6.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/test7.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test7.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/xmlrules1.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/xmlrules1.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/plugins/xmlrules2.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/xmlrules2.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/simple.dtd
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/simple.dtd
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/test-call-param-rules.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/test-call-param-rules.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/test-node-create-rules-input.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/test-node-create-rules-input.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/test-node-create-rules.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/test-node-create-rules.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/test.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/test.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testCircularRules.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testCircularRules.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testPropertyAliasRules.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testPropertyAliasRules.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testfactory.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testfactory.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testfactoryignore.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testfactoryignore.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testfactorynoignore.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testfactorynoignore.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testrules.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testrules.xml
    commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/xmlrules/testrulesinclude.xml
      - copied unchanged from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/testrulesinclude.xml
Removed:
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test1.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test10.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test11.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test12-01.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test12-02.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test12.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test13-01.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test13-02.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test13.xsd
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test2.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test3.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test4.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test5.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test6.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test7.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test8.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/Test9.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/annotations/addressbook/AddressBook.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/annotations/catalog/Catalog.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/annotations/employee/Employee.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/annotations/person/Person.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/annotations/rss/Channel.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/annotations/servletbean/ServletBean.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/document-with-relative-dtd.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/ObjectTestImplRuleInfo.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test1.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test2.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test3.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test4a.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test4b.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test5a.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test5b.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test5c.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test6.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/test7.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/xmlrules1.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/xmlrules2.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/simple.dtd
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/test-call-param-rules.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/test-node-create-rules-input.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/test-node-create-rules.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/test.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testCircularRules.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testPropertyAliasRules.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testfactory.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testfactoryignore.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testfactorynoignore.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testrules.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/xmlrules/testrulesinclude.xml
    commons/proper/digester/trunk/src/test/org/
Modified:
    commons/proper/digester/trunk/pom.xml
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java
    commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/TestXmlRuleInfo.java

Modified: commons/proper/digester/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=991817&r1=991816&r2=991817&view=diff
==============================================================================
--- commons/proper/digester/trunk/pom.xml (original)
+++ commons/proper/digester/trunk/pom.xml Thu Sep  2 05:42:04 2010
@@ -175,8 +175,6 @@
   </properties> 
 
   <build>
-    <testSourceDirectory>src/test</testSourceDirectory>
-
     <resources>
       <resource>
         <directory>.</directory>
@@ -197,7 +195,7 @@
 
     <testResources>
       <testResource>
-        <directory>src/test</directory>
+        <directory>src/test/resources</directory>
         <filtering>false</filtering>
         <includes>
           <include>**/*.xml</include>

Modified: commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java?rev=991817&r1=991745&r2=991817&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java
(original)
+++ commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java
Thu Sep  2 05:42:04 2010
@@ -42,7 +42,7 @@ public class TestEntityResolution {
         SAXParser parser = factory.newSAXParser();
         
         parser.parse(
-                    new File("src/test/org/apache/commons/digester/document-with-relative-dtd.xml"),

+                    new File("src/test/resources/org/apache/commons/digester/document-with-relative-dtd.xml"),

                     new DefaultHandler());
     }
 
@@ -51,6 +51,6 @@ public class TestEntityResolution {
         Digester digester = new Digester();
         digester.setValidating(true);
         digester.parse(
-                    new File("src/test/org/apache/commons/digester/document-with-relative-dtd.xml"));
+                    new File("src/test/resources/org/apache/commons/digester/document-with-relative-dtd.xml"));
     }
 }

Modified: commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/TestXmlRuleInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/TestXmlRuleInfo.java?rev=991817&r1=991745&r2=991817&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/TestXmlRuleInfo.java
(original)
+++ commons/proper/digester/trunk/src/test/java/org/apache/commons/digester/plugins/TestXmlRuleInfo.java
Thu Sep  2 05:42:04 2010
@@ -44,7 +44,7 @@ public class TestXmlRuleInfo {
         input.append(" <plugin");
         input.append("  id='testobject'"); 
         input.append("  class='org.apache.commons.digester.plugins.ObjectTestImpl'");
-        input.append("  file='src/test/org/apache/commons/digester/plugins/xmlrules1.xml'");
+        input.append("  file='src/test/resources/org/apache/commons/digester/plugins/xmlrules1.xml'");
         input.append("  />");
         input.append("  <object plugin-id='testobject'/>");
         input.append("</root>");

Copied: commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12.xml
(from r991745, commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test12.xml)
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12.xml?p2=commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12.xml&p1=commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test12.xml&r1=991745&r2=991817&rev=991817&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test12.xml (original)
+++ commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester/Test12.xml
Thu Sep  2 05:42:04 2010
@@ -17,7 +17,7 @@
  limitations under the License.
 -->
 
-<employee xml:base="src/test/org/apache/commons/digester/"
+<employee xml:base="src/test/resources/org/apache/commons/digester/"
           xmlns:xi="http://www.w3.org/2001/XInclude">
   <firstName>First Name</firstName>
   <lastName>Last Name</lastName>



Mime
View raw message