Moved the Reflection Wrapping code used by the system tests to the system test. If they are left in common then we must include the common directory when using the systest-testing frameworks no matter the version of Qpid being tested. Whilst this is probably not a problem as long as the classpath is carefully set up it does introduce another potential uncertainty to any test failure.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@677629 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 5 insertions, 5 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
index 9eba36e1e9..642c690376 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
@@ -27,8 +27,8 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import org.apache.qpid.test.framework.TestUtils;
 import org.apache.qpid.test.framework.clocksynch.ClockSynchThread;
 import org.apache.qpid.test.framework.clocksynch.UDPClockSynchronizer;
-import org.apache.qpid.util.ReflectionUtils;
-import org.apache.qpid.util.ReflectionUtilsException;
+import org.apache.qpid.test.utils.ReflectionUtils;
+import org.apache.qpid.test.utils.ReflectionUtilsException;
 
 import org.apache.qpid.junit.extensions.SleepThrottle;
 import org.apache.qpid.junit.extensions.util.ParsedProperties;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
index f1a9a5d309..bc68320224 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.test.utils;
 
 import org.apache.log4j.Logger;
-import org.apache.qpid.util.ReflectionUtils;
+import org.apache.qpid.test.utils.ReflectionUtils;
 
 import javax.jms.*;
 
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/ReflectionUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
index 28fb2e0c8a..7946c6a6d1 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/ReflectionUtils.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.test.utils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/ReflectionUtilsException.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
index c2862a755b..838828598b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/ReflectionUtilsException.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.test.utils;
 
 /**
  * Wraps a checked exception that occurs when {@link ReflectionUtils} encounters checked exceptions using standard