Author: markt
Date: Mon Mar 22 14:23:26 2010
New Revision: 926101
URL: http://svn.apache.org/viewvc?rev=926101&view=rev
Log:
Make method names consistent with the names the digester looks for
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=926101&r1=926100&r2=926101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Mon Mar 22
14:23:26 2010
@@ -84,30 +84,30 @@ public class WebXml {
// web-fragment.xml only elements
// Relative ordering
private Set<String> after = new LinkedHashSet<String>();
- public void addAfterOrder(String fragmentName) {
+ public void addAfterOrdering(String fragmentName) {
after.add(fragmentName);
}
- public void addAfterOrderOthers() {
+ public void addAfterOrderingOthers() {
if (before.contains(ORDER_OTHERS)) {
throw new IllegalArgumentException(sm.getString(
"webXml.multipleOther"));
}
after.add(ORDER_OTHERS);
}
- public Set<String> getAfterOrder() { return after; }
+ public Set<String> getAfterOrdering() { return after; }
private Set<String> before = new LinkedHashSet<String>();
- public void addBeforeOrder(String fragmentName) {
+ public void addBeforeOrdering(String fragmentName) {
before.add(fragmentName);
}
- public void addBeforeOrderOthers() {
+ public void addBeforeOrderingOthers() {
if (after.contains(ORDER_OTHERS)) {
throw new IllegalArgumentException(sm.getString(
"webXml.multipleOther"));
}
before.add(ORDER_OTHERS);
}
- public Set<String> getBeforeOrder() { return before; }
+ public Set<String> getBeforeOrdering() { return before; }
// Common elements and attributes
@@ -2080,11 +2080,11 @@ public class WebXml {
// they specify others
for (WebXml fragment : fragments.values()) {
String name = fragment.getName();
- if (fragment.getBeforeOrder().contains(WebXml.ORDER_OTHERS)) {
+ if
(fragment.getBeforeOrdering().contains(WebXml.ORDER_OTHERS)) {
// Move to beginning
order.remove(name);
order.add(0, name);
- } else if
(fragment.getAfterOrder().contains(WebXml.ORDER_OTHERS)) {
+ } else if
(fragment.getAfterOrdering().contains(WebXml.ORDER_OTHERS)) {
// Move to end
order.remove(name);
order.add(name);
@@ -2094,7 +2094,7 @@ public class WebXml {
// Now apply remaining ordering
for (WebXml fragment : fragments.values()) {
String name = fragment.getName();
- for (String before : fragment.getBeforeOrder()) {
+ for (String before : fragment.getBeforeOrdering()) {
if (!before.equals(WebXml.ORDER_OTHERS) &&
order.contains(before) &&
order.indexOf(before) < order.indexOf(name)) {
@@ -2102,7 +2102,7 @@ public class WebXml {
order.add(order.indexOf(before), name);
}
}
- for (String after : fragment.getAfterOrder()) {
+ for (String after : fragment.getAfterOrdering()) {
if (!after.equals(WebXml.ORDER_OTHERS) &&
order.contains(after) &&
order.indexOf(after) > order.indexOf(name)) {
@@ -2116,14 +2116,14 @@ public class WebXml {
// errors then that indicates circular references
for (WebXml fragment : fragments.values()) {
String name = fragment.getName();
- for (String before : fragment.getBeforeOrder()) {
+ for (String before : fragment.getBeforeOrdering()) {
if (!before.equals(WebXml.ORDER_OTHERS) &&
order.contains(before) &&
order.indexOf(before) < order.indexOf(name)) {
throw new IllegalArgumentException(sm.getString(""));
}
}
- for (String after : fragment.getAfterOrder()) {
+ for (String after : fragment.getAfterOrdering()) {
if (!after.equals(WebXml.ORDER_OTHERS) &&
order.contains(after) &&
order.indexOf(after) > order.indexOf(name)) {
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java?rev=926101&r1=926100&r2=926101&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Mon
Mar 22 14:23:26 2010
@@ -171,12 +171,12 @@ public class TestWebXmlOrdering extends
public void testOrderWebFragmentsRelative1() {
// First example from servlet spec
- a.addAfterOrderOthers();
- a.addAfterOrder("c");
- b.addBeforeOrderOthers();
- c.addAfterOrderOthers();
- f.addBeforeOrderOthers();
- f.addBeforeOrder("b");
+ a.addAfterOrderingOthers();
+ a.addAfterOrdering("c");
+ b.addBeforeOrderingOthers();
+ c.addAfterOrderingOthers();
+ f.addBeforeOrderingOthers();
+ f.addBeforeOrdering("b");
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments);
@@ -191,11 +191,11 @@ public class TestWebXmlOrdering extends
public void testOrderWebFragmentsRelative2() {
// Second example - use fragment a for no-id fragment
- a.addAfterOrderOthers();
- a.addBeforeOrder("c");
- b.addBeforeOrderOthers();
- d.addAfterOrderOthers();
- e.addBeforeOrderOthers();
+ a.addAfterOrderingOthers();
+ a.addBeforeOrdering("c");
+ b.addBeforeOrderingOthers();
+ d.addAfterOrderingOthers();
+ e.addBeforeOrderingOthers();
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments);
@@ -213,8 +213,8 @@ public class TestWebXmlOrdering extends
public void testOrderWebFragmentsRelative3() {
// Third example from spec
- a.addAfterOrder("b");
- c.addBeforeOrderOthers();
+ a.addAfterOrdering("b");
+ c.addBeforeOrderingOthers();
fragments.remove("e");
fragments.remove("f");
@@ -231,9 +231,9 @@ public class TestWebXmlOrdering extends
}
public void testOrderWebFragmentsrelativeCircular() {
- a.addBeforeOrder("b");
- b.addBeforeOrder("a");
-
+ a.addBeforeOrdering("b");
+ b.addBeforeOrdering("a");
+
Exception exception = null;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
