svn commit: r1177255 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp: ./ src/test/java/org/apache/archiva/web/action/admin/appearance/ src/test/java/org/apache/archiva/web/validator/utils/

[olamy]

Author: olamy
Date: Thu Sep 29 10:28:13 2011
New Revision: 1177255

URL: http://svn.apache.org/viewvc?rev=1177255&view=rev
Log:
fix maven 2.2.1 build

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1177255&r1=1177254&r2=1177255&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Sep 29 
10:28:13 2011
@@ -68,6 +68,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-xml-tools</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-security</artifactId>
     </dependency>
     <dependency>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java?rev=1177255&r1=1177254&r2=1177255&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
 Thu Sep 29 10:28:13 2011
@@ -210,7 +210,6 @@ public class EditOrganizationInfoActionT
     @Override
     protected AbstractAppearanceAction getAction()
     {
-        //return (EditOrganisationInfoAction) lookup( Action.class.getName(), 
"editOrganisationInfo" );
         return (EditOrganisationInfoAction) getActionProxy( 
"/admin/editAppearance.action" ).getAction();
     }
 }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java?rev=1177255&r1=1177254&r2=1177255&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
 Thu Sep 29 10:28:13 2011
@@ -52,8 +52,9 @@ public class ValidatorUtil
                     // check the contents of error messages per field error
                     for ( int i = 0; i < expectedEntry.getValue().size(); i++ )
                     {
-                        Assert.assertEquals( expectedEntry.getValue().get( i ),
-                                             actualFieldErrors.get( 
expectedEntry.getKey() ).get( i ) );
+                        String expected = expectedEntry.getValue().get( i );
+                        String actual = actualFieldErrors.get( 
expectedEntry.getKey() ).get( i );
+                        Assert.assertEquals( expected, actual );
                     }
                 }
                 else