[java-metadata-aggregator COMMIT] in /trunk: aggregator-pipeline/pom.xml aggregator-pipeline/src/test/java/net/shibbo...

[noreply at shibboleth.net]

Author: dfisher
Date: Wed Mar 12 15:58:05 2014
New Revision: 359

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=359&view=rev
Log:
Replace vt-crypt dependency with cryptacular.
Update bouncycastle version to 1.50.

Modified:
    trunk/aggregator-pipeline/pom.xml
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
    trunk/aggregator-web-service/pom.xml
    trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java

Modified: trunk/aggregator-pipeline/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/pom.xml?rev=359&r1=358&r2=359&view=diff
==============================================================================
--- trunk/aggregator-pipeline/pom.xml (original)
+++ trunk/aggregator-pipeline/pom.xml Wed Mar 12 15:58:05 2014
@@ -22,8 +22,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>edu.vt.middleware</groupId>
-            <artifactId>vt-crypt</artifactId>
+            <groupId>org.cryptacular</groupId>
+            <artifactId>cryptacular</artifactId>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -49,7 +49,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15</artifactId>
+            <artifactId>bcprov-jdk15on</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,4 +87,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java?rev=359&r1=358&r2=359&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java Wed Mar 12 15:58:05 2014
@@ -26,11 +26,11 @@
 import net.shibboleth.metadata.Item;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
+import org.cryptacular.util.CertUtil;
+import org.cryptacular.util.KeyPairUtil;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
-
-import edu.vt.middleware.crypt.util.CryptReader;
 
 /** {@link XMLSignatureSigningStage} unit test. */
 public class XMLSignatureSigningStageTest extends BaseDOMTest {
@@ -48,9 +48,9 @@
         final List<Item<Element>> mdCol = new ArrayList<>();
         mdCol.add(new DOMElementItem(testInput));
 
-        PrivateKey signingKey = CryptReader.readPrivateKey(XMLSignatureSigningStageTest.class
+        PrivateKey signingKey = KeyPairUtil.readPrivateKey(XMLSignatureSigningStageTest.class
                 .getResourceAsStream(classRelativeResource("signingKey.pem")));
-        X509Certificate signingCert = (X509Certificate) CryptReader.readCertificate(XMLSignatureSigningStageTest.class
+        X509Certificate signingCert = (X509Certificate) CertUtil.readCertificate(XMLSignatureSigningStageTest.class
                 .getResourceAsStream(classRelativeResource("signingCert.pem")));
         final List<X509Certificate> certs = new ArrayList<>();
         certs.add(signingCert);

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java?rev=359&r1=358&r2=359&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java Wed Mar 12 15:58:05 2014
@@ -30,22 +30,20 @@
 import net.shibboleth.metadata.WarningStatus;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
+import org.cryptacular.util.CertUtil;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
-import edu.vt.middleware.crypt.CryptException;
-import edu.vt.middleware.crypt.util.CryptReader;
-
 /** Unit test for {@link XMLSchemaValidationStage}. */
 public class XMLSignatureValidationStageTest extends BaseDOMTest {
     
     private final Certificate signingCert;
     
     /** Constructor sets class under test. */
-    public XMLSignatureValidationStageTest() throws CryptException, IOException {
+    public XMLSignatureValidationStageTest() throws IOException {

[... 67 lines stripped ...]