diff options
4 files changed, 7 insertions, 6 deletions
diff --git a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java b/java/client/test/src/org/apache/qpid/ack/RecoverTest.java index 22b7b41140..0feecb5a79 100644 --- a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java +++ b/java/client/test/src/org/apache/qpid/ack/RecoverTest.java @@ -22,7 +22,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.apache.log4j.Logger; import org.apache.log4j.xml.DOMConfigurator; import org.junit.Assert; diff --git a/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java b/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java index a5f7679ffd..f201f23681 100644 --- a/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java +++ b/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java @@ -23,7 +23,7 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.junit.Before; import org.junit.Test; diff --git a/java/client/test/src/org/apache/qpid/forwardall/Combined.java b/java/client/test/src/org/apache/qpid/forwardall/Combined.java index f8879dcb0c..ea5216dd2d 100644 --- a/java/client/test/src/org/apache/qpid/forwardall/Combined.java +++ b/java/client/test/src/org/apache/qpid/forwardall/Combined.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Assert; import org.junit.After; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; /** * Runs the Service's and Client parts of the test in the same process diff --git a/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java b/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java index dc92a1a97b..c76596ac5c 100644 --- a/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java +++ b/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java @@ -17,9 +17,10 @@ */ package org.apache.qpid.framing; -import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; import junit.framework.JUnit4TestAdapter; import org.apache.mina.common.ByteBuffer; +import org.apache.xml.security.utils.Base64; +import org.apache.xml.security.exceptions.Base64DecodingException; import static org.junit.Assert.assertEquals; import org.junit.Test; @@ -33,7 +34,7 @@ import java.util.Properties; public class FieldTableTest { @Test - public void dataDump() throws IOException, AMQFrameDecodingException + public void dataDump() throws IOException, AMQFrameDecodingException, Base64DecodingException { byte[] data = readBase64("content.txt"); System.out.println("Got " + data.length + " bytes of data"); @@ -100,7 +101,7 @@ public class FieldTableTest return ((BasicContentHeaderProperties) header.properties).getHeaders(); } - byte[] readBase64(String name) throws IOException + byte[] readBase64(String name) throws IOException, Base64DecodingException { String content = read(new InputStreamReader(getClass().getResourceAsStream(name))); return Base64.decode(content); |