[java-opensaml2 COMMIT] in /branches/REL_2: pom.xml src/test/java/org/opensaml/saml2/core/impl/EvidenceTest.java src/...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Feb 26 22:18:51 2012
New Revision: 1569

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1569&view=rev
Log:
fix a unit test
remove pom macros

Modified:
    branches/REL_2/pom.xml
    branches/REL_2/src/test/java/org/opensaml/saml2/core/impl/EvidenceTest.java
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/core/impl/EvidenceChildElements.xml

Modified: branches/REL_2/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/pom.xml?rev=1569&r1=1568&r2=1569&view=diff
==============================================================================
--- branches/REL_2/pom.xml (original)
+++ branches/REL_2/pom.xml Sun Feb 26 22:18:51 2012
@@ -23,7 +23,6 @@
     
     <properties>
         <svn.relative.location>java-opensaml2</svn.relative.location>
-        <openws.version>1.4.4</openws.version>
     </properties>
 
     <repositories>
@@ -48,7 +47,7 @@
         <dependency>
             <groupId>org.opensaml</groupId>
             <artifactId>openws</artifactId>
-            <version>${openws.version}</version>
+            <version>1.4.4</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -269,8 +268,8 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
                             <links>
-                                <link>https://shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/xmltooling/${xmltooling.version}/xmltooling-${xmltooling.version}-javadoc.jar/!/</link>
-                                <link>https://shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/openws/${openws.version}/openws-${openws.version}-javadoc.jar/!/</link>
+                                <link>https://shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/xmltooling/1.3.4/xmltooling-1.3.4-javadoc.jar/!/</link>
+                                <link>https://shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/openws/1.4.4/openws-1.4.4-javadoc.jar/!/</link>
                             </links>
                         </configuration>
                     </plugin>

Modified: branches/REL_2/src/test/java/org/opensaml/saml2/core/impl/EvidenceTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml2/core/impl/EvidenceTest.java?rev=1569&r1=1568&r2=1569&view=diff
==============================================================================
--- branches/REL_2/src/test/java/org/opensaml/saml2/core/impl/EvidenceTest.java (original)
+++ branches/REL_2/src/test/java/org/opensaml/saml2/core/impl/EvidenceTest.java Sun Feb 26 22:18:51 2012
@@ -104,8 +104,8 @@
             .add((EncryptedAssertion) buildXMLObject(EncryptedAssertion.DEFAULT_ELEMENT_NAME));
         evidence.getEncryptedAssertions()
             .add((EncryptedAssertion) buildXMLObject(EncryptedAssertion.DEFAULT_ELEMENT_NAME));
-        evidence.getAssertionURIReferences()
-            .add((AssertionURIRef) buildXMLObject(AssertionURIRef.DEFAULT_ELEMENT_NAME));
+        evidence.getAssertions()
+            .add((Assertion) buildXMLObject(Assertion.DEFAULT_ELEMENT_NAME));
         
         assertEquals(expectedChildElementsDOM, evidence);
     }

Modified: branches/REL_2/src/test/resources/data/org/opensaml/saml2/core/impl/EvidenceChildElements.xml
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/resources/data/org/opensaml/saml2/core/impl/EvidenceChildElements.xml?rev=1569&r1=1568&r2=1569&view=diff
==============================================================================
--- branches/REL_2/src/test/resources/data/org/opensaml/saml2/core/impl/EvidenceChildElements.xml (original)
+++ branches/REL_2/src/test/resources/data/org/opensaml/saml2/core/impl/EvidenceChildElements.xml Sun Feb 26 22:18:51 2012
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<saml:Evidence xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-    <saml:AssertionIDRef/>
-    <saml:AssertionIDRef/>
-    <saml:AssertionURIRef/>
-    <saml:AssertionIDRef/>
-    <saml:AssertionURIRef/>
-    <saml:AssertionURIRef/>
-    <saml:AssertionURIRef/>
-    <saml:Assertion Version="2.0"/>
-    <saml:EncryptedAssertion/>
-    <saml:EncryptedAssertion/>
-    <saml:Assertion Version="2.0"/>
-</saml:Evidence>
+<saml2:Evidence xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">
+    <saml2:AssertionIDRef/>
+    <saml2:AssertionIDRef/>
+    <saml2:AssertionURIRef/>
+    <saml2:AssertionIDRef/>
+    <saml2:AssertionURIRef/>
+    <saml2:AssertionURIRef/>
+    <saml2:AssertionURIRef/>
+    <saml2:Assertion Version="2.0"/>
+    <saml2:EncryptedAssertion/>
+    <saml2:EncryptedAssertion/>
+    <saml2:Assertion Version="2.0"/>
+</saml2:Evidence>