commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From denn...@apache.org
Subject svn commit: r561583 - in /commons/proper/digester/trunk: ./ src/java/org/apache/commons/digester/ src/java/org/apache/commons/digester/xmlrules/ src/test/org/apache/commons/digester/ src/test/org/apache/commons/digester/plugins/ xdocs/dtds/
Date Tue, 31 Jul 2007 22:48:01 GMT
Author: dennisl
Date: Tue Jul 31 15:48:00 2007
New Revision: 561583

URL: http://svn.apache.org/viewvc?view=rev&rev=561583
Log:
Changes because of the TLP move.
This includes changes to test cases. 'maven test' runs successfully after the changes were
made.

Modified:
    commons/proper/digester/trunk/STATUS.html
    commons/proper/digester/trunk/src/java/org/apache/commons/digester/package.html
    commons/proper/digester/trunk/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test10.xml
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test11.xml
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test2.xml
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test3.xml
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test7.xml
    commons/proper/digester/trunk/xdocs/dtds/digester-rules.dtd

Modified: commons/proper/digester/trunk/STATUS.html
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/STATUS.html?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/STATUS.html (original)
+++ commons/proper/digester/trunk/STATUS.html Tue Jul 31 15:48:00 2007
@@ -34,7 +34,7 @@
 
  <p>
   The original source was donated by the
-  <a href="http://jakarta.apache.org/struts">Struts Framework</a> subproject.
+  <a href="http://struts.apache.org/">Struts Framework</a> subproject.
  </p>
 
 

Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/package.html
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/package.html?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/package.html (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/package.html Tue Jul
31 15:48:00 2007
@@ -1322,8 +1322,8 @@
 <p>
 We would consider donations of standard digester applications but it's unlikely that
 these would ever be shipped with the base digester distribution.
-If you want to discuss this, please post to <a href='http://jakarta.apache.org/site/mail.html'>
-common-dev mailing list</a>
+If you want to discuss this, please post to <a href='http://commons.apache.org/mail-lists.html'>
+commons dev mailing list</a>
 </p>
 </li>
 </ul>

Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd
(original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd
Tue Jul 31 15:48:00 2007
@@ -19,7 +19,7 @@
 --> 
 
 <!--
-        "Digester" component of the Jakarta Commons Subproject
+        "Digester" component of the Commons Subproject
         DTD for the definition of Digester rules in XML.
         $Id$
 
@@ -34,7 +34,7 @@
 
 <!-- This document type defines an XML format for defining Digester rules.
      Digester is a framework for pattern-matching-based parsing of XML into
-     Java objects. See http://jakarta.apache.org/commons/digester.html.  -->
+     Java objects. See http://commons.apache.org/digester/.  -->
 
 <!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule |
                    call-param-rule | object-param-rule | node-create-rule |

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java
(original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java
Tue Jul 31 15:48:00 2007
@@ -73,8 +73,8 @@
         Map nsmap = root.getNamespaces();
         assertEquals(3, nsmap.size());
         assertEquals("", nsmap.get(""));
-        assertEquals("http://jakarta.apache.org/digester/Foo", nsmap.get("foo"));
-        assertEquals("http://jakarta.apache.org/digester/Bar", nsmap.get("bar"));
+        assertEquals("http://commons.apache.org/digester/Foo", nsmap.get("foo"));
+        assertEquals("http://commons.apache.org/digester/Bar", nsmap.get("bar"));
 
         List children = root.getChildren();
         assertEquals(3, children.size());
@@ -83,25 +83,25 @@
         nsmap = child1.getNamespaces();
         assertEquals(3, nsmap.size());
         assertEquals("", nsmap.get(""));
-        assertEquals("http://jakarta.apache.org/digester/Foo1", nsmap.get("foo"));
-        assertEquals("http://jakarta.apache.org/digester/Bar1", nsmap.get("bar"));
+        assertEquals("http://commons.apache.org/digester/Foo1", nsmap.get("foo"));
+        assertEquals("http://commons.apache.org/digester/Bar1", nsmap.get("bar"));
 
         NamespacedBox child2 = (NamespacedBox) children.get(1);
         nsmap = child2.getNamespaces();
         assertEquals(5, nsmap.size());
         assertEquals("", nsmap.get(""));
-        assertEquals("http://jakarta.apache.org/digester/Foo", nsmap.get("foo"));
-        assertEquals("http://jakarta.apache.org/digester/Bar", nsmap.get("bar"));
-        assertEquals("http://jakarta.apache.org/digester/Alpha", nsmap.get("alpha"));
-        assertEquals("http://jakarta.apache.org/digester/Beta", nsmap.get("beta"));
+        assertEquals("http://commons.apache.org/digester/Foo", nsmap.get("foo"));
+        assertEquals("http://commons.apache.org/digester/Bar", nsmap.get("bar"));
+        assertEquals("http://commons.apache.org/digester/Alpha", nsmap.get("alpha"));
+        assertEquals("http://commons.apache.org/digester/Beta", nsmap.get("beta"));
 
         NamespacedBox child3 = (NamespacedBox) children.get(2);
         nsmap = child3.getNamespaces();
         assertEquals(4, nsmap.size());
         assertEquals("", nsmap.get(""));
-        assertEquals("http://jakarta.apache.org/digester/Foo3", nsmap.get("foo"));
-        assertEquals("http://jakarta.apache.org/digester/Alpha", nsmap.get("alpha"));
-        assertEquals("http://jakarta.apache.org/digester/Bar", nsmap.get("bar"));
+        assertEquals("http://commons.apache.org/digester/Foo3", nsmap.get("foo"));
+        assertEquals("http://commons.apache.org/digester/Alpha", nsmap.get("alpha"));
+        assertEquals("http://commons.apache.org/digester/Bar", nsmap.get("bar"));
 
     }
 

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
(original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
Tue Jul 31 15:48:00 2007
@@ -367,7 +367,7 @@
         assertEquals(Node.ELEMENT_NODE, fragment.getFirstChild().getNodeType());
         Element address1 = (Element)fragment.getFirstChild();
         assertEquals("address", address1.getNodeName());
-        assertEquals("http://jakarta.apache.org/digester/Bar",
+        assertEquals("http://commons.apache.org/digester/Bar",
                      address1.getNamespaceURI());
         assertEquals("address", address1.getLocalName());
         assertEquals(5, address1.getAttributes().getLength());
@@ -380,7 +380,7 @@
         assertEquals(Node.ELEMENT_NODE, fragment.getLastChild().getNodeType());
         Element address2 = (Element)fragment.getLastChild();
         assertEquals("address", address2.getNodeName());
-        assertEquals("http://jakarta.apache.org/digester/Bar",
+        assertEquals("http://commons.apache.org/digester/Bar",
                      address2.getNamespaceURI());
         assertEquals("address", address2.getLocalName());
         assertEquals(5, address2.getAttributes().getLength());
@@ -409,11 +409,11 @@
         assertTrue(result instanceof Element);
         Element element = (Element)result;
         
-        assertNotNull(element.getAttributeNodeNS("http://jakarta.apache.org/digester/Bar",
"test"));
-        assertEquals("MyTestAttribute", element.getAttributeNodeNS("http://jakarta.apache.org/digester/Bar",
"test").getNodeValue());
-        assertEquals("test", element.getAttributeNodeNS("http://jakarta.apache.org/digester/Bar",
"test").getLocalName());
-        assertEquals("bar", element.getAttributeNodeNS("http://jakarta.apache.org/digester/Bar",
"test").getPrefix());
-        assertEquals("bar:test", element.getAttributeNodeNS("http://jakarta.apache.org/digester/Bar",
"test").getName());
+        assertNotNull(element.getAttributeNodeNS("http://commons.apache.org/digester/Bar",
"test"));
+        assertEquals("MyTestAttribute", element.getAttributeNodeNS("http://commons.apache.org/digester/Bar",
"test").getNodeValue());
+        assertEquals("test", element.getAttributeNodeNS("http://commons.apache.org/digester/Bar",
"test").getLocalName());
+        assertEquals("bar", element.getAttributeNodeNS("http://commons.apache.org/digester/Bar",
"test").getPrefix());
+        assertEquals("bar:test", element.getAttributeNodeNS("http://commons.apache.org/digester/Bar",
"test").getName());
 
     }      
     

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java Tue
Jul 31 15:48:00 2007
@@ -345,7 +345,7 @@
         // Configure the digester as required
         digester.setNamespaceAware(true);
         RuleSet rs = new TestRuleSet(null,
-                "http://jakarta.apache.org/digester/Foo");
+                "http://commons.apache.org/digester/Foo");
         digester.addRuleSet(rs);
 
         // Parse our test input.
@@ -380,7 +380,7 @@
         // Configure the digester as required
         digester.setNamespaceAware(true);
         RuleSet rs = new TestRuleSet(null,
-                "http://jakarta.apache.org/digester/Foo");
+                "http://commons.apache.org/digester/Foo");
         digester.addRuleSet(rs);
 
         // Parse our test input.

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test10.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test10.xml?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test10.xml (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test10.xml Tue Jul
31 15:48:00 2007
@@ -18,5 +18,5 @@
 -->
 
 <foo:employee firstName="First Name" lastName="Last Name"
-   xmlns:foo="http://jakarta.apache.org/digester/Foo"
-   xmlns:bar="http://jakarta.apache.org/digester/Bar" bar:test="MyTestAttribute"/>
+   xmlns:foo="http://commons.apache.org/digester/Foo"
+   xmlns:bar="http://commons.apache.org/digester/Bar" bar:test="MyTestAttribute"/>

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test11.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test11.xml?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test11.xml (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test11.xml Tue Jul
31 15:48:00 2007
@@ -22,20 +22,20 @@
 -->
 
 <box id="root" xmlns=""
-     xmlns:foo="http://jakarta.apache.org/digester/Foo"
-     xmlns:bar="http://jakarta.apache.org/digester/Bar">
+     xmlns:foo="http://commons.apache.org/digester/Foo"
+     xmlns:bar="http://commons.apache.org/digester/Bar">
 
  <subBox id="child1"
-     xmlns:foo="http://jakarta.apache.org/digester/Foo1"
-     xmlns:bar="http://jakarta.apache.org/digester/Bar1"/>
+     xmlns:foo="http://commons.apache.org/digester/Foo1"
+     xmlns:bar="http://commons.apache.org/digester/Bar1"/>
 
  <subBox id="child2"
-     xmlns:alpha="http://jakarta.apache.org/digester/Alpha"
-     xmlns:beta="http://jakarta.apache.org/digester/Beta"/>
+     xmlns:alpha="http://commons.apache.org/digester/Alpha"
+     xmlns:beta="http://commons.apache.org/digester/Beta"/>
 
  <subBox id="child3"
-     xmlns:foo="http://jakarta.apache.org/digester/Foo3"
-     xmlns:alpha="http://jakarta.apache.org/digester/Alpha"/>
+     xmlns:foo="http://commons.apache.org/digester/Foo3"
+     xmlns:alpha="http://commons.apache.org/digester/Alpha"/>
 
 </box>
 

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test2.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test2.xml?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test2.xml (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test2.xml Tue Jul 31
15:48:00 2007
@@ -18,7 +18,7 @@
 -->
 
 <test:employee firstName="First Name" lastName="Last Name"
-   xmlns:test="http://jakarta.apache.org/digester/Foo">
+   xmlns:test="http://commons.apache.org/digester/Foo">
   <test:address type="home" street="Home Street" city="Home City"
                              state="HS" zipCode="HmZip"/>
   <test:address type="office" street="Office Street" city="Office City"

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test3.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test3.xml?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test3.xml (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/Test3.xml Tue Jul 31
15:48:00 2007
@@ -18,8 +18,8 @@
 -->
 
 <foo:employee firstName="First Name" lastName="Last Name"
-   xmlns:foo="http://jakarta.apache.org/digester/Foo"
-   xmlns:bar="http://jakarta.apache.org/digester/Bar">
+   xmlns:foo="http://commons.apache.org/digester/Foo"
+   xmlns:bar="http://commons.apache.org/digester/Bar">
   <bar:address type="home" street="Home Street" city="Home City"
                             state="HS" zipCode="HmZip"/>
   <bar:address type="office" street="Office Street" city="Office City"

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
(original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
Tue Jul 31 15:48:00 2007
@@ -180,9 +180,9 @@
         // "plugin-id" and "plugin-class".
         PluginCreateRule widgetPluginRule = new PluginCreateRule(Widget.class);
         widgetPluginRule.setPluginIdAttribute(
-            "http://jakarta.apache.org/digester/plugins", "id");
+            "http://commons.apache.org/digester/plugins", "id");
         widgetPluginRule.setPluginClassAttribute(
-            "http://jakarta.apache.org/digester/plugins", "class");
+            "http://commons.apache.org/digester/plugins", "class");
         digester.addRule("root/widget", widgetPluginRule);
         digester.addSetNext("root/widget", "addWidget");
 

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test7.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test7.xml?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test7.xml (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/test7.xml Tue
Jul 31 15:48:00 2007
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<root xmlns:plugin="http://jakarta.apache.org/digester/plugins">
+<root xmlns:plugin="http://commons.apache.org/digester/plugins">
   <plugin id="label" class="org.apache.commons.digester.plugins.TextLabel"/>
   <plugin id="slider" class="org.apache.commons.digester.plugins.Slider"/>
   <plugin id="label2" class="org.apache.commons.digester.plugins.TextLabel2"/>

Modified: commons/proper/digester/trunk/xdocs/dtds/digester-rules.dtd
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/xdocs/dtds/digester-rules.dtd?view=diff&rev=561583&r1=561582&r2=561583
==============================================================================
--- commons/proper/digester/trunk/xdocs/dtds/digester-rules.dtd (original)
+++ commons/proper/digester/trunk/xdocs/dtds/digester-rules.dtd Tue Jul 31 15:48:00 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-        "Digester" component of the Jakarta Commons Subproject
+        "Digester" component of the Commons Subproject
         DTD for the definition of Digester rules in XML.
         $Id$
 -->



Mime
View raw message