svn commit: r463410 - in /incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid: ack/RecoverTest.java basic/SessionStartTest.java forwardall/Combined.java framing/FieldTableTest.java

[rg...@apache.org]

Author: rgreig
Date: Thu Oct 12 13:18:03 2006
New Revision: 463410

URL: http://svn.apache.org/viewvc?view=rev&rev=463410
Log:
Moved AMQVMBrokerCreationException into correct package.

Modified:
    incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/ack/RecoverTest.java
    incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java
    incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java
    incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java

Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/ack/RecoverTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/ack/RecoverTest.java?view=diff&rev=463410&r1=463409&r2=463410
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/ack/RecoverTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/ack/RecoverTest.java Thu Oct 12 13:18:03 2006
@@ -22,7 +22,7 @@
 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;

Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java?view=diff&rev=463410&r1=463409&r2=463410
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/basic/SessionStartTest.java Thu Oct 12 13:18:03 2006
@@ -23,7 +23,7 @@
 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;

Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java?view=diff&rev=463410&r1=463409&r2=463410
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java Thu Oct 12 13:18:03 2006
@@ -23,7 +23,7 @@
 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

Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java?view=diff&rev=463410&r1=463409&r2=463410
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/framing/FieldTableTest.java Thu Oct 12 13:18:03 2006
@@ -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 @@
 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 @@
         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);